Novalnet - Version 10.1.0

Version Notes

- Direct Debit SEPA overlay and Credit Card type removed.
- Compatibility has been checked for magento_v_1.4.x-1.9.x along with the magento security patch 6788.

Download this release

Release Info

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


Code changes from version 10.0.0 to 10.1.0

Files changed (142) hide show
  1. app/code/community/Novalnet/Payment/Block/Adminhtml/Configuration/Wizard/Config/Form.php +1 -1
  2. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/Grid.php +5 -8
  3. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/Invoice/View.php +2 -2
  4. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View.php +1 -1
  5. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View/Tab/TransactionStatus.php +3 -3
  6. app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction/Grid.php +2 -2
  7. app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction/View.php +1 -1
  8. app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview/Grid.php +1 -1
  9. app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview/View.php +1 -1
  10. app/code/community/Novalnet/Payment/Block/Cart/Item/Renderer.php +0 -39
  11. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Banktransfer.php +1 -1
  12. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Cc.php +9 -3
  13. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Eps.php +1 -1
  14. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Ideal.php +1 -1
  15. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Invoice.php +2 -2
  16. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Paypal.php +1 -1
  17. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Prepayment.php +2 -2
  18. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Sepa.php +2 -2
  19. app/code/community/Novalnet/Payment/Block/Payment/Method/NovalnetRedirect.php +1 -1
  20. app/code/community/Novalnet/Payment/Helper/AssignData.php +80 -54
  21. app/code/community/Novalnet/Payment/Helper/Data.php +8 -21
  22. app/code/community/Novalnet/Payment/Model/Callbackscript.php +411 -516
  23. app/code/community/Novalnet/Payment/Model/Config.php +0 -2
  24. app/code/community/Novalnet/Payment/Model/Factory.php +35 -35
  25. app/code/community/Novalnet/Payment/Model/Novalnet/Source/Cctype.php +24 -3
  26. app/code/community/Novalnet/Payment/Model/Observer.php +23 -3
  27. app/code/community/Novalnet/Payment/Model/Payment/Method/Abstract.php +345 -334
  28. app/code/community/Novalnet/Payment/Model/Recurring.php +39 -62
  29. app/code/community/Novalnet/Payment/Model/Sales/Creditmemo/Tax.php +0 -93
  30. app/code/community/Novalnet/Payment/Model/Sales/Creditmemo/Total.php +0 -93
  31. app/code/community/Novalnet/Payment/Model/Sales/Order/Creditmemo/Total/Grand.php +68 -0
  32. app/code/community/Novalnet/Payment/Model/Sales/Order/Invoice.php +2 -2
  33. app/code/community/Novalnet/Payment/Model/Sales/Order/Payment.php +2 -2
  34. app/code/community/Novalnet/Payment/Model/Sales/Order/Pdf/Creditmemo.php +1 -1
  35. app/code/community/Novalnet/Payment/Model/System/Config/Activemethods.php +11 -13
  36. app/code/community/Novalnet/Payment/controllers/Adminhtml/{Configuration → Novalnetpayment/Configuration}/Wizard/PageController.php +1 -1
  37. app/code/community/Novalnet/Payment/controllers/Adminhtml/{Information → Novalnetpayment/Information}/ModuleController.php +1 -1
  38. app/code/community/Novalnet/Payment/controllers/Adminhtml/{Information → Novalnetpayment/Information}/NovalnetmerchantadminController.php +1 -1
  39. app/code/community/Novalnet/Payment/controllers/Adminhtml/{Sales → Novalnetpayment/Sales}/OrderController.php +23 -22
  40. app/code/community/Novalnet/Payment/controllers/Adminhtml/{Sales → Novalnetpayment/Sales}/Recurring/ProfileController.php +1 -1
  41. app/code/community/Novalnet/Payment/controllers/Adminhtml/{TransactionController.php → Novalnetpayment/TransactionController.php} +1 -1
  42. app/code/community/Novalnet/Payment/controllers/Adminhtml/{TransactionoverviewController.php → Novalnetpayment/TransactionoverviewController.php} +1 -1
  43. app/code/community/Novalnet/Payment/controllers/Checkout/OnepageController.php +118 -0
  44. app/code/community/Novalnet/Payment/controllers/GatewayController.php +14 -19
  45. app/code/community/Novalnet/Payment/etc/adminhtml.xml +8 -8
  46. app/code/community/Novalnet/Payment/etc/config.xml +28 -30
  47. app/code/community/Novalnet/Payment/etc/system.xml +112 -41
  48. app/code/community/Novalnet/Payment/sql/novalnet_setup/{mysql4-install-10.0.0.php → mysql4-install-10.1.0.php} +0 -0
  49. app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-5.0.2-10.0.0.php +0 -134
  50. app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-5.0.3-10.0.0.php +0 -128
  51. app/design/adminhtml/default/default/layout/novalnet/configuration.xml +25 -26
  52. app/design/adminhtml/default/default/template/novalnet/information/novalnetmerchantadmin.phtml +1 -0
  53. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Cc.phtml +7 -18
  54. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Invoice.phtml +1 -1
  55. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Prepayment.phtml +1 -1
  56. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Sepa.phtml +13 -174
  57. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Banktransfer.phtml +14 -17
  58. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Cc.phtml +21 -20
  59. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Eps.phtml +14 -17
  60. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Ideal.phtml +14 -17
  61. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Invoice.phtml +59 -59
  62. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Paypal.phtml +14 -17
  63. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Prepayment.phtml +59 -59
  64. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Sepa.phtml +17 -22
  65. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Banktransfer.phtml +16 -16
  66. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Cc.phtml +26 -25
  67. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Eps.phtml +16 -16
  68. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Ideal.phtml +16 -16
  69. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Invoice.phtml +61 -55
  70. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Paypal.phtml +16 -16
  71. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Prepayment.phtml +60 -54
  72. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Sepa.phtml +15 -26
  73. app/design/adminhtml/default/default/template/novalnet/sales/order/view/info.phtml +10 -4
  74. app/design/adminhtml/default/default/template/novalnet/sales/order/view/tab/info.phtml +25 -9
  75. app/design/adminhtml/default/default/template/novalnet/transaction/overview/view/form.phtml +1 -1
  76. app/design/frontend/base/default/template/novalnet/payment/method/form/Banktransfer.phtml +21 -20
  77. app/design/frontend/base/default/template/novalnet/payment/method/form/Cc.phtml +118 -139
  78. app/design/frontend/base/default/template/novalnet/payment/method/form/Eps.phtml +21 -21
  79. app/design/frontend/base/default/template/novalnet/payment/method/form/Ideal.phtml +21 -21
  80. app/design/frontend/base/default/template/novalnet/payment/method/form/Invoice.phtml +64 -56
  81. app/design/frontend/base/default/template/novalnet/payment/method/form/Paypal.phtml +22 -21
  82. app/design/frontend/base/default/template/novalnet/payment/method/form/Prepayment.phtml +17 -19
  83. app/design/frontend/base/default/template/novalnet/payment/method/form/Sepa.phtml +120 -287
  84. app/design/frontend/base/default/template/novalnet/payment/method/info/Banktransfer.phtml +14 -17
  85. app/design/frontend/base/default/template/novalnet/payment/method/info/Cc.phtml +21 -20
  86. app/design/frontend/base/default/template/novalnet/payment/method/info/Eps.phtml +14 -17
  87. app/design/frontend/base/default/template/novalnet/payment/method/info/Ideal.phtml +14 -17
  88. app/design/frontend/base/default/template/novalnet/payment/method/info/Invoice.phtml +60 -59
  89. app/design/frontend/base/default/template/novalnet/payment/method/info/Paypal.phtml +14 -17
  90. app/design/frontend/base/default/template/novalnet/payment/method/info/Prepayment.phtml +60 -59
  91. app/design/frontend/base/default/template/novalnet/payment/method/info/Sepa.phtml +17 -22
  92. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Banktransfer.phtml +16 -16
  93. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Cc.phtml +26 -25
  94. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Eps.phtml +16 -16
  95. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Ideal.phtml +16 -16
  96. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Invoice.phtml +62 -55
  97. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Paypal.phtml +16 -16
  98. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Prepayment.phtml +61 -54
  99. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Sepa.phtml +15 -26
  100. app/design/frontend/default/default/template/novalnet/payment/method/form/Banktransfer.phtml +21 -20
  101. app/design/frontend/default/default/template/novalnet/payment/method/form/Cc.phtml +118 -139
  102. app/design/frontend/default/default/template/novalnet/payment/method/form/Eps.phtml +21 -21
  103. app/design/frontend/default/default/template/novalnet/payment/method/form/Ideal.phtml +21 -21
  104. app/design/frontend/default/default/template/novalnet/payment/method/form/Invoice.phtml +64 -56
  105. app/design/frontend/default/default/template/novalnet/payment/method/form/Paypal.phtml +22 -21
  106. app/design/frontend/default/default/template/novalnet/payment/method/form/Prepayment.phtml +17 -19
  107. app/design/frontend/default/default/template/novalnet/payment/method/form/Sepa.phtml +120 -287
  108. app/design/frontend/default/default/template/novalnet/payment/method/info/Banktransfer.phtml +14 -17
  109. app/design/frontend/default/default/template/novalnet/payment/method/info/Cc.phtml +21 -20
  110. app/design/frontend/default/default/template/novalnet/payment/method/info/Eps.phtml +14 -17
  111. app/design/frontend/default/default/template/novalnet/payment/method/info/Ideal.phtml +14 -17
  112. app/design/frontend/default/default/template/novalnet/payment/method/info/Invoice.phtml +60 -59
  113. app/design/frontend/default/default/template/novalnet/payment/method/info/Paypal.phtml +14 -17
  114. app/design/frontend/default/default/template/novalnet/payment/method/info/Prepayment.phtml +60 -59
  115. app/design/frontend/default/default/template/novalnet/payment/method/info/Sepa.phtml +17 -22
  116. app/design/frontend/default/default/template/novalnet/sales/recurring/profile/view.phtml +0 -149
  117. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Banktransfer.phtml +21 -20
  118. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Cc.phtml +119 -139
  119. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Eps.phtml +21 -20
  120. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Ideal.phtml +21 -20
  121. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Invoice.phtml +65 -56
  122. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Paypal.phtml +22 -20
  123. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Prepayment.phtml +17 -19
  124. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Sepa.phtml +121 -287
  125. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Banktransfer.phtml +14 -17
  126. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Cc.phtml +21 -20
  127. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Eps.phtml +14 -17
  128. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Ideal.phtml +14 -17
  129. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Invoice.phtml +60 -59
  130. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Paypal.phtml +14 -17
  131. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Prepayment.phtml +60 -59
  132. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Sepa.phtml +17 -22
  133. app/design/frontend/rwd/default/template/novalnet/sales/recurring/profile/view.phtml +0 -149
  134. app/locale/de_DE/Novalnet_Payment.csv +27 -25
  135. app/locale/en_US/Novalnet_Payment.csv +21 -23
  136. js/novalnet/novalnetcc.js +12 -6
  137. js/novalnet/novalnetsepa.js +24 -96
  138. package.xml +6 -22
  139. skin/frontend/base/default/images/novalnet/T.png +0 -0
  140. skin/frontend/base/default/images/novalnet/TO.png +0 -0
  141. skin/frontend/base/default/images/novalnet/creditcard_cvc.jpg +0 -0
  142. skin/frontend/base/default/images/novalnet/creditcard_cvc.png +0 -0
app/code/community/Novalnet/Payment/Block/Adminhtml/Configuration/Wizard/Config/Form.php CHANGED
@@ -55,7 +55,7 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
55
 
56
  if (!$getWebsiteCode && !$getStoreCode) {
57
  $session->setNnStoreConfig('Standard');
58
- } else if ($getWebsiteCode != '' && !$getStoreCode) {
59
  $storeConfig = Mage::getModel('core/website')->load($getWebsiteCode)->getName();
60
  Mage::register('webConfig', Mage::getModel('core/website')->load($getWebsiteCode)->getId());
61
  $session->setNnStoreConfig($storeConfig);
55
 
56
  if (!$getWebsiteCode && !$getStoreCode) {
57
  $session->setNnStoreConfig('Standard');
58
+ } elseif ($getWebsiteCode && !$getStoreCode) {
59
  $storeConfig = Mage::getModel('core/website')->load($getWebsiteCode)->getName();
60
  Mage::register('webConfig', Mage::getModel('core/website')->load($getWebsiteCode)->getId());
61
  $session->setNnStoreConfig($storeConfig);
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/Grid.php CHANGED
@@ -38,14 +38,11 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_B
38
  $this->setSaveParametersInSession(true);
39
 
40
  /* Novalnet */
41
- $payments = Mage::getSingleton('payment/config')->getAllMethods();
42
- if (!$this->novalnetPayments) {
43
- foreach ($payments as $paymentCode => $paymentModel) {
44
- $paymentTitle = Mage::getStoreConfig('payment/' . $paymentCode . '/title');
45
- if (preg_match('/novalnet/i', $paymentCode)) {
46
- $this->novalnetPayments[$paymentCode] = $paymentTitle;
47
- }
48
- }
49
  }
50
  /* Novalnet */
51
  }
38
  $this->setSaveParametersInSession(true);
39
 
40
  /* Novalnet */
41
+ $novalPaymentMethods = array_keys(Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('novalnetPaymentKey'));
42
+
43
+ foreach($novalPaymentMethods as $paymentCode) {
44
+ $paymentTitle = Mage::getStoreConfig('payment/' . $paymentCode . '/title');
45
+ $this->novalnetPayments[$paymentCode] = $paymentTitle;
 
 
 
46
  }
47
  /* Novalnet */
48
  }
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/Invoice/View.php CHANGED
@@ -43,8 +43,8 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_Invoice_View extends Mage_Adm
43
 
44
  $amount = $helper->getAmountCollection($sorderId, 1, NULL);
45
  $callbackTrans = $helper->loadCallbackValue($orderId);
46
- $callbackValue = $callbackTrans && $callbackTrans->getCallbackAmount()
47
- != NULL ? $callbackTrans->getCallbackAmount() : '';
48
  if (($payment->getAmountRefunded() < $amount) || ($nominalItem && $payment->getAmountRefunded() < $totalPaid)) {
49
  $this->_removeButton('print');
50
  $this->_removeButton('capture');
43
 
44
  $amount = $helper->getAmountCollection($sorderId, 1, NULL);
45
  $callbackTrans = $helper->loadCallbackValue($orderId);
46
+ $callbackValue = ($callbackTrans && $callbackTrans->getCallbackAmount())
47
+ ? $callbackTrans->getCallbackAmount() : '';
48
  if (($payment->getAmountRefunded() < $amount) || ($nominalItem && $payment->getAmountRefunded() < $totalPaid)) {
49
  $this->_removeButton('print');
50
  $this->_removeButton('capture');
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View.php CHANGED
@@ -61,7 +61,7 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View extends Mage_Adminhtml_B
61
  $this->_removeButton('order_invoice');
62
  $this->_addButton('novalnet_confirm', array(
63
  'label' => Mage::helper('novalnet_payment')->__('Novalnet Capture'),
64
- 'onclick' => 'setLocation(\'' . $this->getUrl('*/*/novalnetconfirm') . '\')',
65
  ), 0);
66
  }
67
  }
61
  $this->_removeButton('order_invoice');
62
  $this->_addButton('novalnet_confirm', array(
63
  'label' => Mage::helper('novalnet_payment')->__('Novalnet Capture'),
64
+ 'onclick' => 'setLocation(\'' . $this->getUrl('*/novalnetpayment_sales_order/novalnetconfirm') . '\')',
65
  ), 0);
66
  }
67
  }
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View/Tab/TransactionStatus.php CHANGED
@@ -111,7 +111,7 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus ex
111
  */
112
  public function getTabUrl()
113
  {
114
- return $this->getUrl('novalnet_payment/adminhtml_sales_order/transactionStatusGrid', array(
115
  '_current' => true
116
  )
117
  );
@@ -124,7 +124,7 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus ex
124
  */
125
  public function getGridUrl()
126
  {
127
- return $this->getUrl('novalnet_payment/adminhtml_sales_order/transactionStatusGrid', array(
128
  '_current' => true
129
  )
130
  );
@@ -137,7 +137,7 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus ex
137
  */
138
  public function getRowUrl($row)
139
  {
140
- return $this->getUrl('novalnet_payment/adminhtml_transaction/view', array(
141
  'nntxn_id' => $row->getId()
142
  )
143
  );
111
  */
112
  public function getTabUrl()
113
  {
114
+ return $this->getUrl('adminhtml/novalnetpayment_sales_order/transactionStatusGrid', array(
115
  '_current' => true
116
  )
117
  );
124
  */
125
  public function getGridUrl()
126
  {
127
+ return $this->getUrl('adminhtml/novalnetpayment_sales_order/transactionStatusGrid', array(
128
  '_current' => true
129
  )
130
  );
137
  */
138
  public function getRowUrl($row)
139
  {
140
+ return $this->getUrl('adminhtml/novalnetpayment_transaction/view', array(
141
  'nntxn_id' => $row->getId()
142
  )
143
  );
app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction/Grid.php CHANGED
@@ -55,7 +55,7 @@ class Novalnet_Payment_Block_Adminhtml_Transaction_Grid extends Mage_Adminhtml_B
55
  *
56
  * @return Novalnet_Payment_Block_Adminhtml_Transaction_Grid
57
  */
58
- public function _prepareColumns()
59
  {
60
  $this->addColumn('order_id', array(
61
  'header' => Mage::helper('sales')->__('Order no #'),
@@ -98,7 +98,7 @@ class Novalnet_Payment_Block_Adminhtml_Transaction_Grid extends Mage_Adminhtml_B
98
  */
99
  public function getRowUrl($row)
100
  {
101
- return $this->getUrl('novalnet_payment/adminhtml_transaction/view', array(
102
  'nntxn_id' => $row->getId()
103
  )
104
  );
55
  *
56
  * @return Novalnet_Payment_Block_Adminhtml_Transaction_Grid
57
  */
58
+ protected function _prepareColumns()
59
  {
60
  $this->addColumn('order_id', array(
61
  'header' => Mage::helper('sales')->__('Order no #'),
98
  */
99
  public function getRowUrl($row)
100
  {
101
+ return $this->getUrl('adminhtml/novalnetpayment_transaction/view', array(
102
  'nntxn_id' => $row->getId()
103
  )
104
  );
app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction/View.php CHANGED
@@ -83,7 +83,7 @@ class Novalnet_Payment_Block_Adminhtml_Transaction_View extends Mage_Adminhtml_B
83
  {
84
  $transactionStatus = $this->getNovalnetTransactionStatus();
85
  $title = Mage::helper("novalnet_payment")->getModel(
86
- $transactionStatus->getPaymentName())->_getConfigData('title');
87
  return $title;
88
  }
89
 
83
  {
84
  $transactionStatus = $this->getNovalnetTransactionStatus();
85
  $title = Mage::helper("novalnet_payment")->getModel(
86
+ $transactionStatus->getPaymentName())->getNovalnetConfig('title');
87
  return $title;
88
  }
89
 
app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview/Grid.php CHANGED
@@ -95,7 +95,7 @@ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_Grid extends Mage_Adm
95
  */
96
  public function getRowUrl($row)
97
  {
98
- return $this->getUrl('novalnet_payment/adminhtml_transactionoverview/view', array(
99
  'nnlog_id' => $row->getId()
100
  )
101
  );
95
  */
96
  public function getRowUrl($row)
97
  {
98
+ return $this->getUrl('adminhtml/novalnetpayment_transactionoverview/view', array(
99
  'nnlog_id' => $row->getId()
100
  )
101
  );
app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview/View.php CHANGED
@@ -68,7 +68,7 @@ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_View extends Mage_Adm
68
  trim($this->getNovalnetTransactionOverview()->getOrderId()));
69
  if ($order->getPayment()) {
70
  $paymentMethod = $order->getPayment()->getMethod();
71
- $title = Mage::helper("novalnet_payment")->getModel($paymentMethod)->_getConfigData('title');
72
  } else {
73
  $title = '';
74
  }
68
  trim($this->getNovalnetTransactionOverview()->getOrderId()));
69
  if ($order->getPayment()) {
70
  $paymentMethod = $order->getPayment()->getMethod();
71
+ $title = Mage::helper("novalnet_payment")->getModel($paymentMethod)->getNovalnetConfig('title');
72
  } else {
73
  $title = '';
74
  }
app/code/community/Novalnet/Payment/Block/Cart/Item/Renderer.php DELETED
@@ -1,39 +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
- class Novalnet_Payment_Block_Cart_Item_Renderer extends Mage_Checkout_Block_Cart_Item_Renderer
27
- {
28
- /**
29
- * Get list of all otions for product
30
- *
31
- * @return array
32
- */
33
- public function getOptionList()
34
- {
35
- Mage::getSingleton('checkout/session')->setOptionprofile($this->getProductOptions());
36
- return $this->getProductOptions();
37
- }
38
-
39
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Banktransfer.php CHANGED
@@ -43,7 +43,7 @@ class Novalnet_Payment_Block_Payment_Method_Form_Banktransfer extends Mage_Payme
43
  */
44
  public function getUserInfo()
45
  {
46
- return $this->getMethod()->getConfigData('booking_reference');
47
  }
48
 
49
  }
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/Cc.php CHANGED
@@ -52,7 +52,7 @@ class Novalnet_Payment_Block_Payment_Method_Form_Cc extends Mage_Payment_Block_F
52
  */
53
  public function getCallbackConfigData()
54
  {
55
- return $this->getMethod()->_getConfigData('callback');
56
  }
57
 
58
  /**
@@ -62,7 +62,13 @@ class Novalnet_Payment_Block_Payment_Method_Form_Cc extends Mage_Payment_Block_F
62
  */
63
  public function getCcAvailableTypes()
64
  {
65
- $types = $this->_getConfig()->getCcTypes();
 
 
 
 
 
 
66
  $method = $this->getMethod();
67
  if ($method) {
68
  $availableTypes = $method->getConfigData('cctypes');
@@ -149,7 +155,7 @@ class Novalnet_Payment_Block_Payment_Method_Form_Cc extends Mage_Payment_Block_F
149
  */
150
  public function getUserInfo()
151
  {
152
- return $this->getMethod()->getConfigData('booking_reference');
153
  }
154
 
155
  }
52
  */
53
  public function getCallbackConfigData()
54
  {
55
+ return $this->getMethod()->getNovalnetConfig('callback');
56
  }
57
 
58
  /**
62
  */
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) {
74
  $availableTypes = $method->getConfigData('cctypes');
155
  */
156
  public function getUserInfo()
157
  {
158
+ return trim(strip_tags(trim($this->getMethod()->getConfigData('booking_reference'))));
159
  }
160
 
161
  }
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Eps.php CHANGED
@@ -43,7 +43,7 @@ class Novalnet_Payment_Block_Payment_Method_Form_Eps extends Mage_Payment_Block_
43
  */
44
  public function getUserInfo()
45
  {
46
- return $this->getMethod()->getConfigData('booking_reference');
47
  }
48
 
49
  }
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/Ideal.php CHANGED
@@ -43,7 +43,7 @@ class Novalnet_Payment_Block_Payment_Method_Form_Ideal extends Mage_Payment_Bloc
43
  */
44
  public function getUserInfo()
45
  {
46
- return $this->getMethod()->getConfigData('booking_reference');
47
  }
48
 
49
  }
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/Invoice.php CHANGED
@@ -53,7 +53,7 @@ class Novalnet_Payment_Block_Payment_Method_Form_Invoice extends Mage_Payment_Bl
53
  */
54
  public function getCallbackConfigData()
55
  {
56
- return $this->getMethod()->_getConfigData('callback');
57
  }
58
 
59
  /**
@@ -63,7 +63,7 @@ class Novalnet_Payment_Block_Payment_Method_Form_Invoice extends Mage_Payment_Bl
63
  */
64
  public function getUserInfo()
65
  {
66
- return $this->getMethod()->getConfigData('booking_reference');
67
  }
68
 
69
  }
53
  */
54
  public function getCallbackConfigData()
55
  {
56
+ return $this->getMethod()->getNovalnetConfig('callback');
57
  }
58
 
59
  /**
63
  */
64
  public function getUserInfo()
65
  {
66
+ return trim(strip_tags(trim($this->getMethod()->getConfigData('booking_reference'))));
67
  }
68
 
69
  }
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Paypal.php CHANGED
@@ -43,7 +43,7 @@ class Novalnet_Payment_Block_Payment_Method_Form_Paypal extends Mage_Payment_Blo
43
  */
44
  public function getUserInfo()
45
  {
46
- return $this->getMethod()->getConfigData('booking_reference');
47
  }
48
 
49
  }
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/Prepayment.php CHANGED
@@ -43,7 +43,7 @@ class Novalnet_Payment_Block_Payment_Method_Form_Prepayment extends Mage_Payment
43
  */
44
  public function getUserInfo()
45
  {
46
- return $this->getMethod()->getConfigData('booking_reference');
47
  }
48
 
49
  /**
@@ -53,7 +53,7 @@ class Novalnet_Payment_Block_Payment_Method_Form_Prepayment extends Mage_Payment
53
  */
54
  public function getLiveMode()
55
  {
56
- return $this->getMethod()->_getConfigData('live_mode');
57
  }
58
 
59
  }
43
  */
44
  public function getUserInfo()
45
  {
46
+ return trim(strip_tags(trim($this->getMethod()->getConfigData('booking_reference'))));
47
  }
48
 
49
  /**
53
  */
54
  public function getLiveMode()
55
  {
56
+ return $this->getMethod()->getNovalnetConfig('live_mode');
57
  }
58
 
59
  }
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Sepa.php CHANGED
@@ -52,7 +52,7 @@ class Novalnet_Payment_Block_Payment_Method_Form_Sepa extends Mage_Payment_Block
52
  */
53
  public function getCallbackConfigData()
54
  {
55
- return $this->getMethod()->_getConfigData('callback');
56
  }
57
 
58
  /**
@@ -62,7 +62,7 @@ class Novalnet_Payment_Block_Payment_Method_Form_Sepa extends Mage_Payment_Block
62
  */
63
  public function getUserInfo()
64
  {
65
- return $this->getMethod()->getConfigData('booking_reference');
66
  }
67
 
68
  }
52
  */
53
  public function getCallbackConfigData()
54
  {
55
+ return $this->getMethod()->getNovalnetConfig('callback');
56
  }
57
 
58
  /**
62
  */
63
  public function getUserInfo()
64
  {
65
+ return trim(strip_tags(trim($this->getMethod()->getConfigData('booking_reference'))));
66
  }
67
 
68
  }
app/code/community/Novalnet/Payment/Block/Payment/Method/NovalnetRedirect.php CHANGED
@@ -62,7 +62,7 @@ class Novalnet_Payment_Block_Payment_Method_NovalnetRedirect extends Mage_Core_B
62
  'key' => $logFormData['key'],
63
  'authorize_key' => $authorizeKey
64
  );
65
- if ($paymentCode == Novalnet_Payment_Model_Config::NN_CC && $paymentObj->_getConfigData('active_cc3d')) {
66
  $data['ActiveCc3d'] = 1;
67
  }
68
  $payment->setAdditionalData(serialize($data))
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))
app/code/community/Novalnet/Payment/Helper/AssignData.php CHANGED
@@ -83,7 +83,7 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
83
  ->setNnCallbackPinNovalnetCc(trim($data->getCallbackPin()))
84
  ->setNnNewCallbackPinNovalnetCc($data->getNewCallbackPin())
85
  ->setNnCallbackEmailNovalnetCc($data->getCallbackEmail());
86
- if ($this->getModel($paymentCode)->_getConfigData('callback')
87
  != 3) {
88
  $infoInstance->setCallbackPinValidationFlag(true);
89
  }
@@ -98,9 +98,9 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
98
  ->setNnCallbackPinNovalnetSepa(trim($data->getCallbackPin()))
99
  ->setNnNewCallbackPinNovalnetSepa($data->getNewCallbackPin())
100
  ->setNnCallbackEmailNovalnetSepa($data->getCallbackEmail())
101
- ->setSepaDuedate($this->getModel($paymentCode)->_getConfigData('sepa_due_date'));
102
 
103
- if ($this->getModel($paymentCode)->_getConfigData('callback')
104
  != 3) {
105
  $infoInstance->setCallbackPinValidationFlag(true);
106
  }
@@ -114,7 +114,7 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
114
  ->setNnCallbackPinNovalnetInvoice(trim($data->getCallbackPin()))
115
  ->setNnNewCallbackPinNovalnetInvoice($data->getNewCallbackPin())
116
  ->setNnCallbackEmailNovalnetInvoice($data->getCallbackEmail());
117
- if ($this->getModel($paymentCode)->_getConfigData('callback')
118
  != 3) {
119
  $infoInstance->setCallbackPinValidationFlag(true);
120
  }
@@ -136,8 +136,8 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
136
  switch ($paymentCode) {
137
  case Novalnet_Payment_Model_Config::NN_CC:
138
  $accessKey = $this->getModel($paymentCode)->loadAffAccDetail();
139
- $creditCardSecure = $this->getModel($paymentCode)->_getConfigData('active_cc3d');
140
- $callbackVal = $this->getModel($paymentCode)->_getConfigData('callback');
141
 
142
  if (!$this->checkIsAdmin() && $creditCardSecure && !$accessKey) {
143
  Mage::throwException($this->__('Basic parameter not valid') . '!');
@@ -161,7 +161,7 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
161
  $paymentInfo = $this->novalnetCardDetails('payment');
162
  $sepaHolder = $paymentInfo['account_holder'];
163
  $sepaDueDate = $infoInstance->getSepaDuedate();
164
- $callbackVal = $this->getModel($paymentCode)->_getConfigData('callback');
165
 
166
  if (strlen($sepaDueDate) > 0 && ($sepaDueDate < 7 || !$this->checkIsNumeric($sepaDueDate))) {
167
  Mage::throwException($this->__('SEPA Due date is not valid') . '!');
@@ -185,6 +185,16 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
185
  Mage::throwException($this->__('Your E-mail address is invalid') . '!');
186
  }
187
  break;
 
 
 
 
 
 
 
 
 
 
188
  case Novalnet_Payment_Model_Config::NN_IDEAL:
189
  case Novalnet_Payment_Model_Config::NN_PAYPAL:
190
  case Novalnet_Payment_Model_Config::NN_SOFORT:
@@ -266,11 +276,30 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
266
  *
267
  * @param varien_object $requestData
268
  * @param string $requestUrl
 
269
  * @return Mage_Payment_Model_Abstract Object
270
  */
271
- public function setRawCallRequest($requestData, $requestUrl)
272
  {
273
  $httpClientConfig = array('maxredirects' => 0);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
274
  $client = new Varien_Http_Client($requestUrl, $httpClientConfig);
275
  $client->setRawData($requestData)->setMethod(Varien_Http_Client::POST);
276
  $response = $client->request();
@@ -306,34 +335,20 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
306
  if ($paymentCode) {
307
  switch ($paymentCode) {
308
  case Novalnet_Payment_Model_Config::NN_CC:
309
- if ($this->getModel($paymentCode)->_getConfigData('active_cc3d')
310
  == 1) {
311
- unset($request['cc_holder'], $request['cc_exp_month'], $request['cc_exp_year'], $request['cc_cvc2'], $request['pan_hash']);
312
  } else {
313
- $request->unsCcHolder()
314
- ->unsCcExpMonth()
315
- ->unsCcExpYear()
316
- ->unsCcCvc2()
317
- ->unsPanHash();
318
  }
319
  break;
320
  case Novalnet_Payment_Model_Config::NN_SEPA:
321
- if ($request != NULL) {
322
  $request->unsBankAccountHolder()
323
- ->unsBankAccount()
324
- ->unsBankCode()
325
- ->unsBic()
326
- ->unsIban()
327
- ->unsSepaHash();
328
- }
329
- break;
330
- case Novalnet_Payment_Model_Config::NN_PREPAYMENT: // refund request sepa Iban and bic are remove senitive data
331
- case Novalnet_Payment_Model_Config::NN_INVOICE:
332
- case Novalnet_Payment_Model_Config::NN_SOFORT:
333
- case Novalnet_Payment_Model_Config::NN_IDEAL:
334
- if ($request != NULL && isset($request['iban']) && isset($request['bic'])) {
335
- $request->unsIban()
336
- ->unsBic();
337
  }
338
  break;
339
  }
@@ -341,23 +356,6 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
341
  return $request;
342
  }
343
 
344
- /**
345
- * validate Credit Card expiry date and month
346
- *
347
- * @param int $expYear
348
- * @param int $expMonth
349
- * @return bool
350
- */
351
- protected function _validateExpDate($expYear, $expMonth)
352
- {
353
- $date = Mage::app()->getLocale()->date();
354
- if (!$expYear || !$expMonth || ($date->compareYear($expYear) == 1) || ($date->compareYear($expYear)
355
- == 0 && ($date->compareMonth($expMonth) == 1))) {
356
- return false;
357
- }
358
- return true;
359
- }
360
-
361
  /**
362
  * Set Novalnet payment note for Invoice & Prepayment
363
  *
@@ -378,9 +376,9 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
378
  */
379
  public function getDueDate($result = NULL, $invoiceDuedate = NULL)
380
  {
381
- if ($result != NULL) {
382
  $dueDate = $result->getDueDate();
383
- } else if($invoiceDuedate != NULL) {
384
  $dueDate = $invoiceDuedate;
385
  }
386
 
@@ -424,16 +422,44 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
424
  *
425
  * @param int $tid
426
  * @param array $data
 
427
  * @return string
428
  */
429
- public function getReferenceDetails($tid,$data)
430
  {
 
 
431
  $productId = $data['product'] ? $data['product'] : '';
432
  $orderNo = $data['orderNo'] ? $data['orderNo'] : '';
433
- $note = "NN_Reference1:<b>BNR-$productId-$orderNo</b>";
434
- $note .= "|NN_Reference2:<b>TID $tid</b>";
435
- $note .= "|NN_Reference3:NN Order No&$orderNo";
 
436
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
437
  return $note;
438
  }
439
 
@@ -448,7 +474,7 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
448
  {
449
  $grandTotal = $this->getCheckoutSession()->getQuote()->getBaseGrandTotal();
450
  $grandTotal = $this->getFormatedAmount($grandTotal);
451
- $callBackMinimum = (int) $this->getModel($paymentCode)->_getConfigData('callback_minimum_amount');
452
 
453
  return ($callBackMinimum ? $grandTotal >= $callBackMinimum : true);
454
  }
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
  }
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
  }
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
  }
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') . '!');
161
  $paymentInfo = $this->novalnetCardDetails('payment');
162
  $sepaHolder = $paymentInfo['account_holder'];
163
  $sepaDueDate = $infoInstance->getSepaDuedate();
164
+ $callbackVal = $this->getModel($paymentCode)->getNovalnetConfig('callback');
165
 
166
  if (strlen($sepaDueDate) > 0 && ($sepaDueDate < 7 || !$this->checkIsNumeric($sepaDueDate))) {
167
  Mage::throwException($this->__('SEPA Due date is not valid') . '!');
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:
190
+ $paymentRefOne = $this->getModel($paymentCode)->getNovalnetConfig('payment_ref_one');
191
+ $paymentRefTwo = $this->getModel($paymentCode)->getNovalnetConfig('payment_ref_two');
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:
276
  *
277
  * @param varien_object $requestData
278
  * @param string $requestUrl
279
+ * @param varien_object $paymentObj
280
  * @return Mage_Payment_Model_Abstract Object
281
  */
282
+ public function setRawCallRequest($requestData, $requestUrl, $paymentObj)
283
  {
284
  $httpClientConfig = array('maxredirects' => 0);
285
+
286
+ if ($paymentObj->getNovalnetConfig('use_proxy',true)) {
287
+ $proxyHost = $paymentObj->getNovalnetConfig('proxy_host',true);
288
+ $proxyPort = $paymentObj->getNovalnetConfig('proxy_port',true);
289
+ if ($proxyHost && $proxyPort) {
290
+ $httpClientConfig['proxy'] = $proxyHost. ':' . $proxyPort;
291
+ $httpClientConfig['httpproxytunnel'] = true;
292
+ $httpClientConfig['proxytype'] = CURLPROXY_HTTP;
293
+ $httpClientConfig['SSL_VERIFYHOST'] = false;
294
+ $httpClientConfig['SSL_VERIFYPEER'] = false;
295
+ }
296
+ }
297
+
298
+ $gatewayTimeout = (int) $paymentObj->getNovalnetConfig('gateway_timeout',true);
299
+ if ($gatewayTimeout > 0) {
300
+ $httpClientConfig['timeout'] = $gatewayTimeout;
301
+ }
302
+
303
  $client = new Varien_Http_Client($requestUrl, $httpClientConfig);
304
  $client->setRawData($requestData)->setMethod(Varien_Http_Client::POST);
305
  $response = $client->request();
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
  }
356
  return $request;
357
  }
358
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
359
  /**
360
  * Set Novalnet payment note for Invoice & Prepayment
361
  *
376
  */
377
  public function getDueDate($result = NULL, $invoiceDuedate = NULL)
378
  {
379
+ if ($result) {
380
  $dueDate = $result->getDueDate();
381
+ } else if($invoiceDuedate) {
382
  $dueDate = $invoiceDuedate;
383
  }
384
 
422
  *
423
  * @param int $tid
424
  * @param array $data
425
+ * @param string $paymentCode
426
  * @return string
427
  */
428
+ public function getReferenceDetails($tid, $data, $paymentCode)
429
  {
430
+ $paymentReference = array();
431
+ $note = NULL;
432
  $productId = $data['product'] ? $data['product'] : '';
433
  $orderNo = $data['orderNo'] ? $data['orderNo'] : '';
434
+ $paymentRefOne = $this->getModel($paymentCode)->getNovalnetConfig('payment_ref_one');
435
+ $paymentRefTwo = $this->getModel($paymentCode)->getNovalnetConfig('payment_ref_two');
436
+ $paymentRefThree = $this->getModel($paymentCode)->getNovalnetConfig('payment_ref_three');
437
+ $paymentRefConfig = array($paymentRefOne, $paymentRefTwo, $paymentRefThree);
438
 
439
+ foreach ($paymentRefConfig as $key => $value) {
440
+ if ($value == 1) {
441
+ $paymentReference[] .= $value;
442
+ }
443
+ }
444
+
445
+ $refCount = count($paymentReference);
446
+ $note .= ($refCount > 1) ? "NN_Reference_desc1:" : "NN_Reference_desc2:";
447
+
448
+ $i = 0;
449
+ if (!empty($paymentRefOne)) {
450
+ $i = ($refCount == 1) ? '' : $i + 1;
451
+ $note .= "|NN_Reference$i:<b>BNR-$productId-$orderNo</b>";
452
+ }
453
+
454
+ if (!empty($paymentRefTwo)) {
455
+ $i = ($refCount == 1) ? '' : $i + 1;
456
+ $note .= "|NN_Reference$i:<b>TID $tid</b>";
457
+ }
458
+
459
+ if (!empty($paymentRefThree)) {
460
+ $i = ($refCount == 1) ? '' : $i + 1;
461
+ $note .= "|NN_Reference$i:Order No&$orderNo";
462
+ }
463
  return $note;
464
  }
465
 
474
  {
475
  $grandTotal = $this->getCheckoutSession()->getQuote()->getBaseGrandTotal();
476
  $grandTotal = $this->getFormatedAmount($grandTotal);
477
+ $callBackMinimum = (int) $this->getModel($paymentCode)->getNovalnetConfig('callback_minimum_amount');
478
 
479
  return ($callBackMinimum ? $grandTotal >= $callBackMinimum : true);
480
  }
app/code/community/Novalnet/Payment/Helper/Data.php CHANGED
@@ -174,7 +174,7 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
174
  if ($nextPage && array_key_exists('url', $nextPage)) {
175
  $url = $nextPage['url'];
176
  } else {
177
- $url = '*/adminhtml_configuration_wizard_page/' . $nextPageName;
178
  }
179
  return $url;
180
  }
@@ -358,7 +358,7 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
358
  $customerNo = $visitorData['customer_id']; // Used Only customer id is not assigned in mage session
359
  }
360
  //Log customer Order details
361
- if ($customerNo == "") {
362
  Mage::log($getCustomerSession->getCustomer(), NULL, "Customerid_Missing_" . $getCoreData . ".log");
363
  Mage::log("Below are Order Details : ", NULL, "Customerid_Missing_" . $getCoreData . ".log");
364
  Mage::log($orderDetails, NULL, "Customerid_Missing_" . $getCoreData . ".log");
@@ -503,7 +503,9 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
503
  public function getEncodedParam($data, $key)
504
  {
505
  $data = trim($data);
506
- if ($data == '') return'Error: no data';
 
 
507
  if (!function_exists('base64_decode') or ! function_exists('pack') or ! function_exists('crc32')) {
508
  return'Error: func n/a';
509
  }
@@ -530,7 +532,7 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
530
  if (!function_exists('base64_encode') || !function_exists('pack') || !function_exists('crc32')) {
531
  return false;
532
  }
533
- $toBeEncoded = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('novalnetEncodeParams');
534
  foreach ($toBeEncoded as $_value) {
535
  $data = $fields->$_value;
536
  if ($this->isEmptyString($data)) {
@@ -559,7 +561,7 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
559
  public function getDecodedParam($data, $key)
560
  {
561
  $data = trim($data);
562
- if ($data == '') {
563
  return'Error: no data';
564
  }
565
  if (!function_exists('base64_decode') || !function_exists('pack') || !function_exists('crc32')) {
@@ -984,21 +986,6 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
984
  return $nominalItem;
985
  }
986
 
987
- /**
988
- * Get profile information's
989
- *
990
- * @return mixed
991
- */
992
- public function getProfileInfodata()
993
- {
994
- $profile = Mage::getSingleton('checkout/session')->getOptionprofile();
995
- $getBillingPeriod = array_pop($profile);
996
- $getCycleInfo = next($getBillingPeriod);
997
- $getCycles = array_shift($getCycleInfo);
998
- $value = explode(' ', $getCycles);
999
- return $value;
1000
- }
1001
-
1002
  /**
1003
  * Get the respective payport url
1004
  *
@@ -1033,7 +1020,7 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
1033
  {
1034
  $_order = new Mage_Sales_Model_Order();
1035
  $orderId = Mage::app()->getRequest()->getParam('order_id');
1036
- if ($orderId == '') {
1037
  $request = Mage::app()->getRequest();
1038
  $invoiceId = $request->getParam('invoice_id');
1039
  $shipmentId = $request->getParam('shipment_id');
174
  if ($nextPage && array_key_exists('url', $nextPage)) {
175
  $url = $nextPage['url'];
176
  } else {
177
+ $url = '*/novalnetpayment_configuration_wizard_page/' . $nextPageName;
178
  }
179
  return $url;
180
  }
358
  $customerNo = $visitorData['customer_id']; // Used Only customer id is not assigned in mage session
359
  }
360
  //Log customer Order details
361
+ if (!$customerNo) {
362
  Mage::log($getCustomerSession->getCustomer(), NULL, "Customerid_Missing_" . $getCoreData . ".log");
363
  Mage::log("Below are Order Details : ", NULL, "Customerid_Missing_" . $getCoreData . ".log");
364
  Mage::log($orderDetails, NULL, "Customerid_Missing_" . $getCoreData . ".log");
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
  }
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)) {
561
  public function getDecodedParam($data, $key)
562
  {
563
  $data = trim($data);
564
+ if (!$data) {
565
  return'Error: no data';
566
  }
567
  if (!function_exists('base64_decode') || !function_exists('pack') || !function_exists('crc32')) {
986
  return $nominalItem;
987
  }
988
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
989
  /**
990
  * Get the respective payport url
991
  *
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');
app/code/community/Novalnet/Payment/Model/Callbackscript.php CHANGED
@@ -1,4 +1,5 @@
1
  <?php
 
2
  /**
3
  * Magento
4
  *
@@ -25,23 +26,21 @@
25
  */
26
  class Novalnet_Payment_Model_Callbackscript
27
  {
28
- var $log = false; //false|true; adapt
29
- var $createInvoice = true; //false|true; adapt for your need
30
  var $useZendEmail = true; //false|true; adapt for your need
31
- var $addSubsequentTidToDb = true; //whether to add the new tid to db; adapt if necessary
32
 
33
  public function Callback()
34
  {
35
  //Security Setting; only this IP is allowed for call back script
36
- $this->ipAllowed = array('195.143.189.210', '195.143.189.214');//Novalnet IP, is a fixed value, DO NOT CHANGE!!!!!
37
- $this->debug = Mage::getStoreConfig('payment/novalnetcallback/enabledebugmode');
38
- $this->test = Mage::getStoreConfig('payment/novalnetcallback/enabletestmode');
39
 
40
  $this->callback = false;
41
  $this->recurring = false;
42
  $this->request = $this->getParam();
43
- $this->currenttime = Mage::getModel('core/date')->date('Y-m-d H:i:s');
44
- $this->emailSendOption = Mage::getStoreConfig('payment/novalnetcallback/emailsendoption');
45
 
46
  $this->allowedPayment = array(
47
  'novalnetcc' => array('CREDITCARD', 'CREDITCARD_BOOKBACK', 'CREDITCARD_CHARGEBACK',
@@ -70,12 +69,6 @@ class Novalnet_Payment_Model_Callbackscript
70
  'DEBT_COLLECTION_CREDITCARD');
71
  $this->arySubscription = array('SUBSCRIPTION_STOP');
72
 
73
- if (isset($this->request['debug_mode']) && $this->request['debug_mode'] == 1) {
74
- $this->debug = true;
75
- $this->test = true;
76
- $this->emailSendOption = true;
77
- }
78
-
79
  $httpHost = Mage::helper('core/http')->getHttpHost();
80
  $this->lineBreak = empty($httpHost) ? PHP_EOL : '<br />';
81
 
@@ -91,15 +84,15 @@ class Novalnet_Payment_Model_Callbackscript
91
 
92
  $this->level = $this->getPaymentTypeLevel();
93
 
94
- if (in_array($this->request['payment_type'], $this->recurringAllowed) && (!empty($this->request['signup_tid'])
95
- || !empty($this->request['subs_billing']))) {
96
  $this->recurring = true;
97
  } else {
98
  $this->callback = true;
99
  }
100
 
101
  //Parameter Settings
102
- $this->hParamsRequired = array(
103
  'vendor_id' => '',
104
  'tid' => '',
105
  'payment_type' => '',
@@ -110,17 +103,17 @@ class Novalnet_Payment_Model_Callbackscript
110
  );
111
 
112
  if ($this->callback) {
113
- unset($this->hParamsRequired['signup_tid']);
114
- $invChargeback = array_merge($this->invoiceAllowed, $this->chargebacks);
115
- if ((!in_array($this->request['payment_type'], $invChargeback))) {
116
- unset($this->hParamsRequired['tid_payment']);
117
  }
118
  } else {
119
- unset($this->hParamsRequired['tid_payment']);
120
- unset($this->hParamsRequired['order_no']);
121
  }
122
 
123
- ksort($this->hParamsRequired);
124
 
125
  // ################### Main Prog. ##########################
126
  try {
@@ -136,16 +129,17 @@ class Novalnet_Payment_Model_Callbackscript
136
  $this->orderNo = $orderNo;
137
  } else {
138
  $this->orderNo = isset($response['order_no']) && $response['order_no'] ? $response['order_no'] : '';
139
- if ($this->orderNo == '') {
140
  $this->orderNo = $this->getOrderIdByTransId();
141
  }
142
  }
143
 
144
  if (empty($response['payment_type'])) {
145
- echo "Required param (payment_type) missing!";
146
  } elseif (empty($this->orderNo)) {
147
- echo "Required (Transaction ID) not Found!" . $this->lineBreak;
148
- } elseif (!empty($response['payment_type']) && in_array(strtoupper($response['payment_type']), array_merge($this->paymentTypes, $this->chargebacks, $this->aryCollection, $this->arySubscription))) {
 
149
  //Complete the order incase response failure from novalnet server
150
  $order = $this->getOrderByIncrementId($this->orderNo);
151
  $storeId = $order->getStoreId();
@@ -155,20 +149,15 @@ class Novalnet_Payment_Model_Callbackscript
155
  $payment = $order->getPayment();
156
  $paymentObj = $payment->getMethodInstance();
157
  $this->paymentCode = $paymentObj->getCode();
158
- $additionalData = $getresponseData = unserialize($payment->getAdditionalData());
159
- $paymentObj->_vendorId = ($getresponseData['vendor']) ? $getresponseData['vendor']
160
- : $paymentObj->_getConfigData('merchant_id', true, $storeId);
161
- $paymentObj->_authCode = ($getresponseData['auth_code'])
162
- ? $getresponseData['auth_code'] : $paymentObj->_getConfigData('auth_code', true, $storeId);
163
- $paymentObj->_productId = ($getresponseData['product']) ? $getresponseData['product']
164
- : $paymentObj->_getConfigData('product_id', true, $storeId);
165
  // Get Admin Transaction status via API
166
  if ($this->recurring) {
167
  $paymentTid = $response['signup_tid'];
168
  } else {
169
- $paymentTid = (in_array($response['payment_type'], $this->chargebacks))
170
- ? $response['tid_payment'] : (in_array($response['payment_type'], $this->invoiceAllowed))
171
- ? $response['tid_payment'] : $response['tid'];
172
  }
173
  $this->getAdminTransaction = $paymentObj->doNovalnetStatusCall($paymentTid, $payment);
174
  $checkTidExist = $payment->getLastTransId();
@@ -181,10 +170,9 @@ class Novalnet_Payment_Model_Callbackscript
181
  }
182
 
183
  $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
184
- $serverResponse = $response['test_mode'];
185
- $shopMode = $paymentObj->_getConfigData('live_mode', '', $storeId);
186
- $testMode = ((isset($serverResponse) && $serverResponse == 1) || (isset($shopMode) && $shopMode == 0))
187
- ? 1 : 0;
188
  $data = array('NnTestOrder' => $testMode);
189
  $data = $additionalData ? array_merge($additionalData, $data) : $data;
190
  $txnId = $response['tid'];
@@ -196,10 +184,8 @@ class Novalnet_Payment_Model_Callbackscript
196
  $dataObj = new Varien_Object($response);
197
  $this->doTransactionStatusSave($dataObj); // Save the Transaction status
198
  // Payment process based on response status
199
- if ($payment->getAdditionalInformation($paymentObj->getCode() . '_successAction')
200
- != 1) {
201
- if ($order->canInvoice() && $this->getAdminTransaction->getStatus()
202
- == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
203
  $payment->setTransactionId($txnId) // Add capture text to make the new transaction
204
  ->setParentTransactionId(null)
205
  ->setIsTransactionClosed(true)
@@ -218,21 +204,22 @@ class Novalnet_Payment_Model_Callbackscript
218
  $orderStatus = $this->getOrderStatus($order);
219
  $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $orderStatus, $helper->__('Customer successfully returned from Novalnet'), true
220
  )->save();
221
- } else {
222
  $paymentObj->saveCancelledOrder($dataObj, $payment);
223
- }
224
  }
225
 
226
  $this->callBackExecuted = true;
227
  $this->doTransactionOrderLog($response);
228
  //sendNewOrderEmail
229
- if (!$order->getEmailSent() && $order->getId() && in_array($this->getAdminTransaction->getStatus(), $onHoldStatus)) {
 
230
  try {
231
  $order->sendNewOrderEmail()
232
  ->setEmailSent(true)
233
  ->save();
234
  } catch (Exception $e) {
235
- Mage::throwException($helper->__('Cannot send new order email.'));
236
  }
237
  }
238
  $order->save();
@@ -246,25 +233,18 @@ class Novalnet_Payment_Model_Callbackscript
246
  if ($response['payment_type'] != 'INVOICE_CREDIT' || ($response['payment_type'] == 'INVOICE_CREDIT' && $this->getAdminTransaction->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED)) {
247
  $this->setOrderStatus(); //and send error mails if any
248
  } else {
249
- echo isset($this->getAdminTransaction['transaction_status']['status_message'])
250
- ? ($this->getAdminTransaction['transaction_status']['status_message'])
251
- : 'Error in processing the transactions status';
252
- exit;
253
  }
254
  }
255
  }
256
  } else {
257
- echo "Order no [" . $this->orderNo . "] is not valid! $this->lineBreak";
258
  }
259
  } else {
260
- echo "Payment type [" . $response['payment_type'] . "] is mismatched! $this->lineBreak";
261
  }
262
  }
263
 
264
- if ($this->log) {
265
- $logFile = 'novalnet_callback_script_' . date('Y-m-d') . '.log';
266
- Mage::log('Ein Haendlerskript-Aufruf fand statt mit StoreId ' . $storeId . " und Parametern:$this->lineBreak" . print_r($this->request, true), NULL, $logFile);
267
- }
268
  } catch (Exception $e) {
269
  $this->emailBody .= "Exception catched: $this->lineBreak\$e:" . $e->getMessage() . $this->lineBreak;
270
  }
@@ -281,15 +261,13 @@ class Novalnet_Payment_Model_Callbackscript
281
  {
282
  if (isset($this->emailBody) && $this->emailBody && $this->emailFromAddr && $this->emailToAddr) {
283
  if (!$this->sendMail($this->emailBody)) {
284
- if ($this->debug) {
285
- echo "Mailing failed!" . $this->lineBreak;
286
- echo "This mail text should be sent: " . $this->lineBreak;
287
- }
288
  }
289
  }
290
 
291
- if ($this->debug && isset($this->emailBody)) {
292
- echo $this->emailBody;
293
  }
294
  }
295
 
@@ -354,15 +332,11 @@ class Novalnet_Payment_Model_Callbackscript
354
  $mail->setSubject($this->emailSubject);
355
 
356
  try {
357
- if ($this->debug) {
358
- echo __FUNCTION__ . ': Sending Email suceeded!' . $this->lineBreak;
359
- }
360
  $emailTemplate->send($this->emailToAddr, $this->emailToName, $emailTemplateVariables);
361
  } catch (Exception $e) {
362
  Mage::getSingleton('core/session')->addError($this->_getNovalnetHelper()->__('Unable to send email'));
363
- if ($this->debug) {
364
- echo 'Email sending failed: ' . $e->getMessage();
365
- }
366
  return false;
367
  }
368
  return true;
@@ -387,13 +361,9 @@ class Novalnet_Payment_Model_Callbackscript
387
 
388
  try {
389
  $mail->send();
390
- if ($this->debug) {
391
- echo __FUNCTION__ . ': Sending Email suceeded!' . $this->lineBreak;
392
- }
393
  } catch (Exception $e) {
394
- if ($this->debug) {
395
- echo 'Email sending failed: ' . $e->getMessage();
396
- }
397
  return false;
398
  }
399
  return true;
@@ -409,7 +379,6 @@ class Novalnet_Payment_Model_Callbackscript
409
  */
410
  public function emailSeparate($emailaddr, $mail, $addr)
411
  {
412
-
413
  $email = explode(',', $emailaddr);
414
  $validatorEmail = $this->validatorEmail;
415
 
@@ -430,39 +399,41 @@ class Novalnet_Payment_Model_Callbackscript
430
  public function checkParams($request)
431
  {
432
  if (!$request) {
433
- echo 'Novalnet callback received. No params passed over!' . $this->lineBreak;
434
- die;
 
 
 
435
  }
436
 
437
- foreach ($this->hParamsRequired as $k => $v) {
438
- if (!isset($request[$k]) || empty($request[$k])) {
439
- echo 'Required param (' . $k . ') missing!' . $this->lineBreak;
440
- die;
441
- }
 
 
 
442
  }
443
 
444
  if ($this->recurring && !preg_match('/^\d{17}$/', $request['signup_tid'])) {
445
- echo 'Novalnet callback received. Invalid TID [' . $request['signup_tid'] . '] for Order.';
446
- die;
447
  } else if ((in_array($request['payment_type'], $this->invoiceAllowed)) || (in_array($request['payment_type'], $this->chargebacks))) {
448
  if (!$this->recurring && !preg_match('/^\d{17}$/', $request['tid_payment'])) {
449
- echo 'Novalnet callback received. Invalid TID [' . $request['tid_payment'] . '] for Order:' . $this->orderNo . ' ' . $this->lineBreak;
450
- die;
451
  }
452
  }
453
 
454
  if (!preg_match('/^\d{17}$/', $request['tid'])) {
455
  if ((in_array($request['payment_type'], $this->invoiceAllowed)) || (in_array($request['payment_type'], $this->chargebacks))) {
456
- echo 'Novalnet callback received. New TID is not valid.' . $this->lineBreak;
457
  } else {
458
- echo 'Novalnet callback received. Invalid TID [' . $request['tid'] . '] for Order:' . $this->orderNo . ' ' . $this->lineBreak;
459
  }
460
- die;
461
  }
462
 
463
  if ($request['payment_type'] == 'INVOICE_CREDIT' && !empty($request['status']) && 100 != $request['status']) {
464
- echo 'Novalnet callback received. Callback Script executed already. Refer Order :' . $this->orderNo . $this->lineBreak;
465
- die;
466
  }
467
 
468
  return true;
@@ -486,16 +457,10 @@ class Novalnet_Payment_Model_Callbackscript
486
  }
487
 
488
  if ($order->getIncrementId() == $orderNo && !empty($orderNo)) {
489
- //check amount
490
- $amount = $request['amount'];
491
- if (!$amount || intval($amount) < 0) {
492
- echo "Novalnet callback received. The requested amount ($amount) must be greater than zero." . $this->lineBreak;
493
- die;
494
- }
495
-
496
  $orderPaymentName = strtolower($this->paymentCode);
 
497
  if ($request['subs_billing'] == 1) {
498
- $orgTid = $request['signup_tid'];
499
  } else if ((in_array($request['payment_type'], $this->chargebacks)) || $request['payment_type'] == 'INVOICE_CREDIT') {
500
  $orgTid = $request['tid_payment'];
501
  } else {
@@ -504,30 +469,24 @@ class Novalnet_Payment_Model_Callbackscript
504
 
505
  $paymentType = $this->allowedPayment[$orderPaymentName];
506
  if (!in_array($request['payment_type'], $paymentType)) {
507
- echo "Novalnet callback received. Payment type (" . $request['payment_type'] . ") is not matched with $orderPaymentName!" . $this->lineBreak;
508
- die;
509
  }
510
 
511
  $payment = $order->getPayment();
512
  $additionalData = unserialize($payment->getAdditionalData());
513
- $orderTid = ((in_array($request['payment_type'], $this->chargebacks)) && $additionalData['NnTid'])
514
- ? $additionalData['NnTid'] : $order->getPayment()->getLastTransId();
515
 
516
- if (!preg_match('/^' . $orgTid . '/i', $orderTid)
517
- && !$this->recurring) {
518
- echo 'Novalnet callback received. Order no is not valid' . $this->lineBreak;
519
- die;
520
  }
521
 
522
  if ($this->recurring && $request['subs_billing'] && $activeState == 'canceled') {
523
- echo 'Subscription already Cancelled. Refer Order : ' . $orderNo . $this->lineBreak;
524
- die;
525
  }
526
 
527
  return true;
528
  } else {
529
- echo 'Novalnet callback received. Order no is not valid' . $this->lineBreak;
530
- die;
531
  }
532
  }
533
 
@@ -552,11 +511,16 @@ class Novalnet_Payment_Model_Callbackscript
552
  $data = unserialize($payment->getAdditionalData());
553
  $currency = $this->getAdminTransaction->getCurrency();
554
  if ($this->level == 1) { //level 1 payments - Type of Chargebacks
555
- // Update callback comments for Chargebacks
556
  if (in_array($this->request['payment_type'], $this->chargebacks)) {
 
557
  $tId = !$this->recurring ? $request['tid_payment'] : $request['signup_tid'];
558
- $script = 'Novalnet Callback script received. Charge back was executed sucessfully for the TID ' . $tId . ' amount ' . ($request['amount'])
559
- / 100 . ' ' . $currency . " on " . $this->currenttime;
 
 
 
 
560
  $this->emailBody = $script;
561
  $this->saveAdditionalInfo($payment, $data, $script, $order);
562
  return true;
@@ -565,11 +529,15 @@ class Novalnet_Payment_Model_Callbackscript
565
 
566
  if ($request['payment_type'] == 'SUBSCRIPTION_STOP') { ### Cancellation of a Subscription
567
  ### UPDATE THE STATUS OF THE USER SUBSCRIPTION ###
568
- $script = 'Novalnet Callback script received. Subscription has been stopped for the TID:' . $request['signup_tid'] . " on " . $this->currenttime;
569
  $script .= '<br>Reason for Cancellation: ' . $request['termination_reason'];
570
  $this->emailBody = $script;
571
- $this->saveAdditionalInfo($payment, $data, $script, $order);
572
  $recurringProfileId = $this->getProfileInformation($request);
 
 
 
 
 
573
  $recurringProfileId->setState('canceled');
574
  $recurringProfileId->save();
575
  return true;
@@ -579,44 +547,41 @@ class Novalnet_Payment_Model_Callbackscript
579
  $paid = $invoice->getState();
580
  if ($this->level == 0 || $this->level == 2) {
581
  $subsPaymentType = array('CREDITCARD', 'DIRECT_DEBIT_SEPA', 'INVOICE_START');
582
- if ($this->recurring && in_array($this->request['payment_type'], $subsPaymentType) && !empty($this->request['signup_tid'])
583
- && $this->request['subs_billing'] == 1) {
584
  $recurringProfileId = $this->getProfileInformation($request);
585
  $periodMaxCycles = $recurringProfileId->getPeriodMaxCycles();
586
  $profileId = $recurringProfileId->getId();
587
  $helper = $this->_getNovalnetHelper();
588
- if ($this->getAdminTransaction->getNextSubsCycle() == '') {
589
- echo "Novalnet callback received. Subscription Suspended. Refer Order :" . $this->orderNo . $this->lineBreak;
590
- die;
591
  }
592
- $script = 'Novalnet Callback script received. Recurring was executed sucessfully for the TID ' . $request['signup_tid'] . ' with amount ' . ($request['amount']) / 100 . ' ' . $currency . ' ' . " on " . $this->currenttime.'.';
593
 
594
  $callbackCycle = $this->getRecurringCallbackSave($request, $periodMaxCycles, $helper, $profileId);
595
  $this->getEndTime($request, $recurringProfileId, $callbackCycle);
596
  $paidAmount = ($request['amount'] / 100);
597
  $loadTransaction = $helper->loadTransactionStatus($request['signup_tid'])
598
- ->setAmount($paidAmount)
599
- ->save();
600
- $this->createOrder($order,$script,$data,$payment,$profileId);
601
  return true;
602
  }
603
 
604
- if ($this->createInvoice) {
605
- $saveinvoice = $this->saveInvoice($order,$nominalItem,$paid);
606
- }
 
 
 
 
 
 
 
 
 
 
607
 
608
- if ($invoice) {
609
- if ($saveinvoice) {
610
- $order->setState($state, true, 'Novalnet callback set state ' . $state . ' for Order-ID = ' . $this->orderNo); //processing: ok; complete: not ok -> would cause the error msg: 'Der Bestellzustand "complete" darf nicht manuell gesetzt werden'
611
- $order->addStatusToHistory($status, 'Novalnet callback added order status ' . $status); // this line must be located after $order->setState()
612
- $this->emailBody .= 'Novalnet callback set state to ' . $state . $this->lineBreak;
613
- $this->emailBody .= 'Novalnet callback set status to ' . $status . ' ... ' . $this->lineBreak;
614
- $order->save();
615
-
616
- //Add subsequent TID to DB column last_trans_id
617
- if ($this->addSubsequentTidToDb) {
618
- $transMode = (version_compare($helper->getMagentoVersion(), '1.6', '<'))
619
- ? false : true;
620
  if (in_array($request['payment_type'], $this->invoiceAllowed)) {
621
  if ($nominalItem) {
622
  $tidPayment = isset($request['signup_tid']) && $request['signup_tid'] && $request['subs_billing'] ? trim($request['signup_tid']) : trim($request['tid_payment']);
@@ -627,31 +592,29 @@ class Novalnet_Payment_Model_Callbackscript
627
  ->setIsTransactionClosed($transMode);
628
  $transaction = $payment->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE, null, false);
629
  $transaction->setParentTxnId(null)
630
- ->save();
631
  $amount = $this->_getNovalnetHelper()->getFormatedAmount($request['amount'], 'RAW');
632
  $currency = $this->getAdminTransaction->getCurrency();
633
- $script = 'Novalnet Callback Script executed successfully. The subsequent TID: ' . $request['tid'] . ' on ' . $this->currenttime . ' for the amount : ' . $amount . ' ' . $currency;
634
  } else {
635
- $script = 'Novalnet Callback Script executed successfully on ' . $this->currenttime;
636
  }
637
  $this->saveAdditionalInfo($payment, $data, $script, $order);
638
- }
639
 
640
- $changeAmount = $helper->getAmountCollection($order->getId(), 1, NULL);
641
- if ($changeAmount != '') {
642
- $loadTransStatus = $helper->loadTransactionStatus($request['tid_payment']);
643
- $loadTransStatus->setAmount($changeAmount)
644
- ->save();
 
 
645
  }
 
 
646
  }
647
- } else {
648
- echo "Novalnet Callback: No invoice for order (" . $order->getId() . ") found";
649
- die;
650
  }
651
- }
652
  } else {
653
- echo "Novalnet Callback: No order for Increment-ID $this->orderNo found.";
654
- die;
655
  }
656
  return true;
657
  }
@@ -664,7 +627,7 @@ class Novalnet_Payment_Model_Callbackscript
664
  * @param int $paid
665
  * @return boolean
666
  */
667
- public function saveInvoice(Mage_Sales_Model_Order $order,$nominalItem,$paid)
668
  {
669
  if (!$this->callBackExecuted) {
670
  $request = $this->request;
@@ -674,26 +637,25 @@ class Novalnet_Payment_Model_Callbackscript
674
  $paymentObj = $payment->getMethodInstance();
675
  $data = unserialize($payment->getAdditionalData());
676
 
677
- $modNovalCallback = Mage::getModel('novalnet_payment/callback')->loadLogByOrderId($orderNo);
678
- $sum = sprintf( ($request['amount'] + $modNovalCallback->getCallbackAmount()) , 0.2);
679
- $amountvalue = $this->getRecurringTotal($request, $order,$nominalItem);
680
- $grandTotal = sprintf( ($amountvalue * 100) , 0.2);
681
  if (!$this->recurring) {
682
- $tidpayment = $request['tid_payment'];
683
  } else {
684
- $tidpayment = $request['signup_tid'];
685
  }
686
 
687
- if (in_array($request['payment_type'], $this->invoiceAllowed) && $sum
688
- < $grandTotal) {
689
- $this->doNovalnetCallbackLog($modNovalCallback, $request, $sum);
690
  $amount = $helper->getFormatedAmount($request['amount'], 'RAW');
691
- $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";
692
- $script = "Novalnet Callback Script executed successfully. Payment for order id :" . $orderNo . '. New TID: ' . $request['tid'] . ' on ' . $this->currenttime . ' for the amount : ' . $amount . ' ' . $this->getAdminTransaction->getCurrency() . $this->lineBreak;
693
  $this->saveAdditionalInfo($payment, $data, $script, $order);
694
  return false;
695
  } else {
696
- $this->doNovalnetCallbackLog($modNovalCallback, $request, $sum);
697
  $amount = $helper->getFormatedAmount($request['amount'], 'RAW');
698
  if ($order->canInvoice()) {
699
  $tid = $this->requestTid($request);
@@ -708,39 +670,40 @@ class Novalnet_Payment_Model_Callbackscript
708
  ->save();
709
  if ($this->recurring || $nominalItem) {
710
  $profileInfo = $this->getProfileInformation($request);
711
- $profileInfo->setState('active');
712
- $profileInfo->save();
 
 
713
  }
714
 
715
  $amount = $helper->getFormatedAmount($request['amount'], 'RAW');
716
  if (in_array($request['payment_type'], $this->invoiceAllowed)) {
717
- $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";
718
 
719
- $this->emailBody = ($sum > $grandTotal) ? $emailText . "Your paid amount is greater than the order total amount. $this->lineBreak"
720
- : $emailText;
721
  } else {
722
- $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";
723
  }
724
  } else {
725
  if ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_INVOICE && $paid == 1) {
726
  $currency = $this->getAdminTransaction->getCurrency();
727
- $script = 'Novalnet Callback Script executed successfully. The subsequent TID: ' . $this->request['tid'] . ' on ' . $this->currenttime . ' for the amount : ' . $currency . ' ' . $amount;
 
728
  $this->emailBody = $script;
729
- $this->saveAdditionalInfo($payment, $data, $script, $order);
730
- $this->saveOrderStatus($order,$nominalItem);
731
  $this->sendCallbackMail();
732
  die;
733
  }
734
 
735
  $invoicePayments = array(Novalnet_Payment_Model_Config::NN_PREPAYMENT, Novalnet_Payment_Model_Config::NN_INVOICE);
736
  if (in_array($paymentObj->getCode(), $invoicePayments)) {
737
- echo "Novalnet callback received. Callback Script executed already. Refer Order :" . $this->orderNo . $this->lineBreak;
738
  } elseif ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_PAYPAL) {
739
- echo "Novalnet callback received. Order already paid." . $this->lineBreak;
740
  } else {
741
- echo "Novalnet Callbackscript received. Payment type ( " . $request['payment_type'] . " ) is not applicable for this process!" . $this->lineBreak;
742
  }
743
- exit;
744
  }
745
  }
746
  }
@@ -753,26 +716,26 @@ class Novalnet_Payment_Model_Callbackscript
753
  * @param varien_object $order
754
  * @param varien_object $nominalItem
755
  */
756
- private function saveOrderStatus($order,$nominalItem)
757
  {
758
  $payment = $order->getPayment();
759
  $originalTid = trim($payment->getLastTransId());
760
  if (!$this->recurring && !$nominalItem) {
761
  $transaction = Mage::getModel('sales/order_payment')->getCollection()
762
- ->addFieldToFilter('last_trans_id', $originalTid)
763
- ->addFieldToSelect('entity_id');
764
  foreach ($transaction as $transactionId) {
765
- $entitiyId = $transactionId->getEntityId();
766
  }
767
  Mage::getModel('sales/order_payment')->load($entitiyId)
768
- ->setLastTransId(trim($this->request['tid']))
769
- ->save();
770
  }
771
 
772
  $orderStatus = $this->getOrderStatus($order);
773
- $orderState = Mage_Sales_Model_Order::STATE_PROCESSING; //processing: ok; complete: not ok -> would cause the error msg: 'Der Bestellzustand "complete" darf nicht manuell gesetzt werden'
774
  $order->setState($orderState, true, 'Novalnet callback set state ' . $orderState . ' for Order-ID = ' . $this->orderNo);
775
- $order->addStatusToHistory($orderStatus, 'Novalnet callback added order status ' . $orderStatus); // this line must be located after $order->setState()
776
  $order->save();
777
 
778
  $invoice = $order->getInvoiceCollection()->getFirstItem();
@@ -781,8 +744,10 @@ class Novalnet_Payment_Model_Callbackscript
781
 
782
  if ($this->recurring || $nominalItem) {
783
  $profileInfo = $this->getProfileInformation($this->request);
784
- $profileInfo->setState('active');
785
- $profileInfo->save();
 
 
786
  }
787
  }
788
 
@@ -807,8 +772,7 @@ class Novalnet_Payment_Model_Callbackscript
807
  $callerIp = $this->_getNovalnetHelper()->getRealIpAddr();
808
 
809
  if (!in_array($callerIp, $this->ipAllowed) && !$this->test) {
810
- echo 'Novalnet callback received. Unauthorised access from the IP [' . $callerIp . ']' . $this->lineBreak . $this->lineBreak;
811
- die;
812
  }
813
 
814
  return true;
@@ -830,11 +794,11 @@ class Novalnet_Payment_Model_Callbackscript
830
  $payment = $order->getPayment();
831
  $paymentObj = $payment->getMethodInstance();
832
  $storeId = $order->getStoreId();
833
- $modNovalTransactionStatus = Mage::getModel('novalnet_payment/transactionstatus');
834
- $modNovalTransactionStatus->setTransactionNo($response['tid'])
835
  ->setOrderId($this->orderNo)
836
- ->setTransactionStatus($status) //Novalnet Admin transaction status
837
- ->setNcNo($ncNo) //nc number
838
  ->setCustomerId($response['customer_no'])
839
  ->setPaymentName($this->paymentCode)
840
  ->setAmount($helper->getFormatedAmount($amount, 'RAW'))
@@ -855,11 +819,11 @@ class Novalnet_Payment_Model_Callbackscript
855
  $order = $this->getOrderByIncrementId($this->orderNo);
856
  $helper = $this->_getNovalnetHelper();
857
  $storeId = $order->getStoreId();
858
- $modNovalTransactionOverview = $helper->getModelTransactionOverview()->loadByAttribute('order_id', $this->orderNo);
859
- $modNovalTransactionOverview->setTransactionId($response['tid'])
860
  ->setResponseData(base64_encode(serialize($response)))
861
  ->setCustomerId($response['customer_no'])
862
- ->setStatus($response['status']) //transaction status code
863
  ->setStoreId($storeId)
864
  ->setShopUrl($helper->getCurrentSiteUrl())
865
  ->save();
@@ -868,19 +832,19 @@ class Novalnet_Payment_Model_Callbackscript
868
  /**
869
  * Log partial callback data
870
  *
871
- * @param Novalnet_Payment_Model_Callback $modNovalCallback
872
  * @param array $response
873
  * @param int $sum
874
  */
875
- public function doNovalnetCallbackLog($modNovalCallback, $response, $sum)
876
  {
877
  $orgTid = $this->requestTid($response);
878
  $orderNo = $this->orderNo;
879
  $reqUrl = Mage::helper('core/http')->getRequestUri();
880
- $modNovalCallback->setOrderId($orderNo)
881
  ->setCallbackAmount($sum)
882
  ->setReferenceTid($orgTid)
883
- ->setCallbackDatetime($this->currenttime)
884
  ->setCallbackLog($reqUrl)
885
  ->save();
886
  }
@@ -938,9 +902,7 @@ class Novalnet_Payment_Model_Callbackscript
938
  */
939
  public function getParam()
940
  {
941
- return Mage::app()->getRequest()->getPost()
942
- ? Mage::app()->getRequest()->getPost()
943
- : Mage::app()->getRequest()->getQuery();
944
  }
945
 
946
  /**
@@ -954,21 +916,16 @@ class Novalnet_Payment_Model_Callbackscript
954
  $payment = $order->getPayment();
955
  $paymentObj = $payment->getMethodInstance();
956
  $storeId = $order->getStoreId();
957
- $getresponseData = unserialize($payment->getAdditionalData());
958
  $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
959
- array_push($redirectPayment, Novalnet_Payment_Model_Config::NN_PREPAYMENT,Novalnet_Payment_Model_Config::NN_INVOICE);
960
 
961
- $status = $paymentObj->_getConfigData('order_status', '', $storeId);
962
- if (($paymentObj->getCode() && (in_array($paymentObj->getCode(), $redirectPayment)))
963
- || ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_CC
964
- && isset($getresponseData['ActiveCc3d']) && $getresponseData['ActiveCc3d'])) {
965
- $status = $paymentObj->_getConfigData('order_status_after_payment', '', $storeId);
966
  }
967
- if ($paymentObj->getCode() && $paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_PAYPAL
968
- && ($this->getAdminTransaction->getStatus() == Novalnet_Payment_Model_Config::PAYPAL_PENDING_CODE)) {
969
- $status = $paymentObj->_getConfigData('order_status', '', $storeId)
970
- ? $paymentObj->_getConfigData('order_status', '', $storeId)
971
- : Mage_Sales_Model_Order::STATE_PENDING_PAYMENT;
972
  }
973
  if (!$status) {
974
  $status = Mage_Sales_Model_Order::STATE_PROCESSING;
@@ -1029,7 +986,7 @@ class Novalnet_Payment_Model_Callbackscript
1029
  $recurringSave->setSignupTid($request['signup_tid']);
1030
  $recurringSave->setBillingcycle($periodMaxCycles);
1031
  $recurringSave->setCallbackcycle($callbackCycle);
1032
- $recurringSave->setCycleDatetime($this->currenttime);
1033
  $recurringSave->save();
1034
  } else {
1035
  foreach ($recurringCollection as $recurringValue) {
@@ -1038,7 +995,7 @@ class Novalnet_Payment_Model_Callbackscript
1038
  $callbackCycle = $callbackCycle + 1;
1039
  $recurringSave = $helper->getModelRecurring()->load($profileId, 'profile_id');
1040
  $recurringSave->setCallbackcycle($callbackCycle);
1041
- $recurringSave->setCycleDatetime($this->currenttime);
1042
  $recurringSave->save();
1043
  }
1044
  return $callbackCycle;
@@ -1061,22 +1018,36 @@ class Novalnet_Payment_Model_Callbackscript
1061
  if ($callbackCycle == $periodMaxCycles) {
1062
  $requestdata = new Varien_Object();
1063
  $order = $this->getOrderByIncrementId($this->orderNo);
1064
- $payment = $order->getPayment()->getMethodInstance();
 
1065
  $helper = $this->_getNovalnetHelper();
1066
  $orderItems = $order->getAllItems();
1067
  $nominalItem = $helper->checkNominalItem($orderItems);
1068
  $storeId = $helper->getMagentoStoreId();
1069
- $payment->assignOrderBasicParams($requestdata, $payment, $storeId, $nominalItem);
1070
  $requestdata->setNnLang(strtoupper($helper->getDefaultLanguage()))
1071
  ->setCancelSub(1)
1072
  ->setCancelReason('other')
1073
  ->setTid($request['signup_tid']);
1074
  $buildNovalnetParam = http_build_query($requestdata->getData());
1075
- $recurringcancelUrl = $helper->getPayportUrl('paygate');
1076
- $response = Mage::helper('novalnet_payment/AssignData')->setRawCallRequest($buildNovalnetParam, $recurringcancelUrl);
1077
- $recurringProfileId->setState('canceled');
1078
- $recurringProfileId->save();
1079
- $this->endTime = 1;
 
 
 
 
 
 
 
 
 
 
 
 
 
1080
  }
1081
  }
1082
 
@@ -1091,8 +1062,7 @@ class Novalnet_Payment_Model_Callbackscript
1091
  $orderPaymentName = strtolower($this->getPaymentMethod($order));
1092
  $paymentType = $this->allowedPayment[$orderPaymentName];
1093
  if (!in_array($this->request['payment_type'], $paymentType)) {
1094
- echo "Novalnet callback received. Payment type (" . $this->request['payment_type'] . ") is not matched with $orderPaymentName!" . $this->lineBreak . $this->lineBreak;
1095
- die;
1096
  }
1097
 
1098
  return true;
@@ -1106,29 +1076,20 @@ class Novalnet_Payment_Model_Callbackscript
1106
  * @param mixed $nominalItem
1107
  * @return float
1108
  */
1109
- private function getRecurringTotal($request, $order,$nominalItem)
1110
  {
1111
  if ($this->recurring || $nominalItem) {
1112
  $profileInfo = $this->getProfileInformation($request);
1113
  $billingAmount = $profileInfo->getBillingAmount();
1114
  $initialAmount = $profileInfo->getInitAmount();
1115
- $trialAmount = $profileInfo->getTrialBillingAmount();
1116
- $shippingAmount = $profileInfo->getShippingAmount();
1117
- $taxAmount = $profileInfo->getTaxAmount();
1118
  }
1119
 
1120
  $changeAmount = $this->_getNovalnetHelper()->getAmountCollection($order->getId(), 1, NULL);
1121
- if ($changeAmount != '') {
1122
  $amountvalue = $changeAmount;
1123
- } else if (($this->recurring || $nominalItem) && ($initialAmount != '' && $trialAmount != ''
1124
- && $billingAmount != '')) {
1125
- $amountvalue = round(($trialAmount + $initialAmount + $shippingAmount
1126
- + $taxAmount), 2);
1127
- } else if (($this->recurring || $nominalItem) && ($trialAmount != '' && $billingAmount != '')) {
1128
- $amountvalue = round(($trialAmount + $shippingAmount + $taxAmount), 2);
1129
- } else if (($this->recurring || $nominalItem) && ($initialAmount != '' && $billingAmount != '')) {
1130
- $amountvalue = round(($initialAmount + $billingAmount + $shippingAmount
1131
- + $taxAmount), 2);
1132
  } else {
1133
  $amountvalue = $order->getGrandTotal();
1134
  }
@@ -1161,38 +1122,32 @@ class Novalnet_Payment_Model_Callbackscript
1161
  */
1162
  private function getEmailConfig($storeId = NULL)
1163
  {
1164
- $this->emailFromAddr = Mage::getStoreConfig('trans_email/ident_general/email', $storeId); //sender email addr., mandatory, adapt it
1165
- $this->emailToAddr = Mage::getStoreConfig('payment/novalnetcallback/emailtoaddr',$storeId); //recipient email addr., mandatory, adapt it
1166
- $this->emailBCcAddr = Mage::getStoreConfig('payment/novalnetcallback/emailBcc',$storeId); //Bcc mail
1167
- $this->emailSubject = 'Novalnet Callback Script Access Report'; //adapt if necessary;
1168
- $this->emailBody = ""; //Email text's 1. line, can be let blank, adapt for your need
1169
- $this->emailFromName = Mage::getStoreConfig('trans_email/ident_general/name', $storeId); // Sender name, adapt
1170
- $this->emailToName = ""; // Recipient name, adapt
1171
  $this->callBackExecuted = false;
1172
-
1173
- if (isset($this->request['debug_mode']) && $this->request['debug_mode'] == 1) {
1174
- $this->emailFromAddr = 'testadmin@novalnet.de';
1175
- $this->emailFromName = 'Novalnet';
1176
- $this->emailToAddr = 'test@novalnet.de';
1177
- $this->emailToName = 'Novalnet';
1178
- }
1179
  }
1180
 
1181
  /*
1182
- * Get given payment_type level for process
1183
- *
1184
- * @return Integer | boolean
1185
- */
 
1186
  private function getPaymentTypeLevel()
1187
  {
1188
  if (!empty($this->request)) {
1189
- if (in_array($this->request['payment_type'], $this->paymentTypes)) {
1190
- return 0;
1191
- } else if(in_array($this->request['payment_type'], $this->chargebacks)) {
1192
- return 1;
1193
- } else if(in_array($this->request['payment_type'], $this->aryCollection)) {
1194
- return 2;
1195
- }
1196
  }
1197
  return false;
1198
  }
@@ -1209,20 +1164,20 @@ class Novalnet_Payment_Model_Callbackscript
1209
 
1210
  $tablePrefix = Mage::getConfig()->getTablePrefix();
1211
  if (in_array($request['payment_type'], $this->chargebacks)) {
1212
- $orderPayment = $tablePrefix.'sales_payment_transaction';
1213
  $onCondition = "main_table.entity_id = $orderPayment.order_id";
1214
- $orderCollection = Mage::getModel('sales/order')->getCollection()
1215
- ->addFieldToFilter('txn_id', array('like' => "%$orgTid%"))
1216
- ->addFieldToSelect('increment_id');
1217
  } else {
1218
- $orderPayment = $tablePrefix.'sales_flat_order_payment';
1219
  $onCondition = "main_table.entity_id = $orderPayment.parent_id";
1220
- $orderCollection = Mage::getModel('sales/order')->getCollection()
1221
- ->addFieldToFilter('last_trans_id', array('like' => "%$orgTid%"))
1222
- ->addFieldToSelect('increment_id');
1223
  }
1224
 
1225
- $orderCollection->getSelect()->join($orderPayment,$onCondition);
1226
  $count = $orderCollection->count();
1227
  if ($count > 0) {
1228
  foreach ($orderCollection as $order) {
@@ -1230,7 +1185,7 @@ class Novalnet_Payment_Model_Callbackscript
1230
  }
1231
  }
1232
 
1233
- $orderId = (isset($orderid) && $orderid != NULL) ? $orderid : '';
1234
  return $orderId;
1235
  }
1236
 
@@ -1244,8 +1199,7 @@ class Novalnet_Payment_Model_Callbackscript
1244
  {
1245
  if (isset($request['signup_tid']) && $request['signup_tid']) {
1246
  $tidPayment = trim($request['signup_tid']);
1247
- } elseif ((in_array($this->request['payment_type'], $this->chargebacks))
1248
- || ($this->request['payment_type'] == 'INVOICE_CREDIT')) {
1249
  $tidPayment = trim($request['tid_payment']);
1250
  } else {
1251
  $tidPayment = trim($request['tid']);
@@ -1263,68 +1217,67 @@ class Novalnet_Payment_Model_Callbackscript
1263
  * @param varien_object $paymentold
1264
  * @param int $profileId
1265
  */
1266
- private function createOrder($order,$script,$data,$paymentold,$profileId)
1267
  {
1268
  $helper = $this->_getNovalnetHelper();
1269
  $paymentCode = $order->getPayment()->getMethodInstance()->getCode();
1270
  $additionalInfo = $order->getPayment()->getAdditionalInformation();
1271
  $storeId = $order->getStoreId();
1272
  $this->setLanguageStore($storeId);
1273
- $ordernew = Mage::getModel('sales/order')
1274
- ->setState('new');
1275
 
1276
  $orderPayment = Mage::getModel('sales/order_payment')
1277
- ->setStoreId($storeId)
1278
- ->setMethod($paymentCode)
1279
- ->setPo_number('-');
1280
- $ordernew->setPayment($orderPayment);
1281
- $ordernew = $this->setOrderDetails($order,$ordernew);
1282
  $billingAddress = Mage::getModel('sales/order_address');
1283
  $getBillingAddress = Mage::getModel('sales/order_address')->load($order->getBillingAddress()->getId());
1284
- $ordernew = $this->setBillingShippingAddress($getBillingAddress,$billingAddress,$ordernew,$order);
1285
  $isVirtual = $order->getIsVirtual();
1286
 
1287
  if ($isVirtual == 0) {
1288
  $shippingAddress = Mage::getModel('sales/order_address');
1289
  $getShippingAddress = Mage::getModel('sales/order_address')->load($order->getShippingAddress()->getId());
1290
- $ordernew = $this->setBillingShippingAddress($getShippingAddress,$shippingAddress,$ordernew,$order);
1291
  }
1292
 
1293
- $ordernew = $this->setOrderItemsDetails($order,$ordernew);
1294
- $payment = $ordernew->getPayment();
1295
  $paymentObj = $payment->getMethodInstance();
1296
- $setOrderAfterStatus = $paymentObj->getConfigData('order_status',$storeId);
1297
  $setOrderAfterStatus = $setOrderAfterStatus ? $setOrderAfterStatus : Mage_Sales_Model_Order::STATE_PROCESSING;
1298
- $ordernew->addStatusToHistory($setOrderAfterStatus, $helper->__('Novalnet Recurring Callback script Executed Successfully'), false);
1299
  $tid = trim($this->request['tid']);
1300
- $ordernew->save();
1301
- $newOrderId = $ordernew->getId();
1302
- $parentOrderNo = $this->getOrderIdByTransId() ? $this->getOrderIdByTransId() : $ordernew->getIncrementId();
1303
- $script .= ' Recurring Payment for order id : '.$parentOrderNo;
1304
 
1305
- $script .= !$this->endTime ? '<br>Next Payment Date is: '.$this->getAdminTransaction->getNextSubsCycle() : '';
1306
  $this->emailBody = $script;
1307
 
1308
  $newData = array('NnTestOrder' => $this->request['test_mode'],
1309
  'NnTid' => $tid,
1310
- 'orderNo' => $ordernew->getIncrementId(),
1311
  'vendor' => $data['vendor'],
1312
  'auth_code' => $data['auth_code'],
1313
  'product' => $data['product'],
1314
  'tariff' => $data['tariff'],
1315
- 'key' => $data['key']
 
1316
  );
1317
  if ($paymentCode == 'novalnetPrepayment' || $paymentCode == 'novalnetInvoice') {
1318
  $dataObj = new Varien_Object($this->request);
1319
  $dataHelper = Mage::helper('novalnet_payment/AssignData');
1320
  $newData['NnNoteDesc'] = $dataHelper->getNoteDescription();
 
1321
  $newData['NnDueDate'] = isset($this->request['due_date']) ? ($helper->__('Due Date') . ' : <b>' . Mage::helper('core')->formatDate($this->request['due_date']) . "</b><br />") : '';
1322
  $newData['NnNote'] = $dataHelper->getNote($dataObj);
1323
  $newData['NnNoteAmount'] = $dataHelper->getBankDetailsAmount(($this->request['amount'] / 100));
1324
- $newData['NnNoteTID'] = $dataHelper->getReferenceDetails($tid,$newData);
1325
  }
1326
- // save subscription informations in parent order
1327
- $this->saveParentInfo($script, $parentOrderNo);
1328
 
1329
  $payment->setTransactionId($tid)
1330
  ->setAdditionalData(serialize($newData))
@@ -1332,52 +1285,64 @@ class Novalnet_Payment_Model_Callbackscript
1332
  ->setLastTransId($tid)
1333
  ->setParentTransactionId(null)
1334
  ->save();
1335
- $ordernew->sendNewOrderEmail()
1336
- ->setEmailSent(true)
1337
- ->setPayment($payment)
1338
- ->save();
1339
- $this->insertOrderId($newOrderId,$profileId);
1340
- $getTransactionStatus = $paymentObj->doNovalnetStatusCall($tid,$payment);
1341
- if ($ordernew->canInvoice() && $getTransactionStatus->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED
1342
- && $paymentCode != Novalnet_Payment_Model_Config::NN_PREPAYMENT) {
1343
- $invoice = $ordernew->prepareInvoice();
1344
  $invoice->setTransactionId($tid);
1345
  $invoice->setRequestedCaptureCase(Mage_Sales_Model_Order_Invoice::CAPTURE_ONLINE)
1346
  ->setState(Mage_Sales_Model_Order_Invoice::STATE_PAID)
1347
  ->register();
1348
 
1349
  Mage::getModel('core/resource_transaction')
1350
- ->addObject($invoice)
1351
- ->addObject($invoice->getOrder())
1352
- ->save();
1353
 
1354
  $magentoVersion = $this->_getNovalnetHelper()->getMagentoVersion();
1355
- $transMode = (version_compare($magentoVersion, '1.6', '<'))
1356
- ? false : true;
1357
 
1358
  $payment->setTransactionId($tid)
1359
  ->setIsTransactionClosed($transMode);
1360
  }
1361
  $transaction = $payment->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE, null, false);
1362
  $transaction->setParentTxnId(null)
1363
- ->save();
1364
  $this->updateInventory($order);
1365
  }
1366
 
1367
  /**
1368
- * Save the subscription details in parent order
1369
  *
1370
- * @param string $script
1371
- * @param int $orderNo
 
 
1372
  * @return null
1373
  */
1374
- private function saveParentInfo($script, $orderNo) {
1375
- $parentOrder = $this->getOrderByIncrementId($orderNo);
1376
- $getayment = $parentOrder->getPayment();
1377
- $additionalData = $getresponseData = unserialize($getayment->getAdditionalData());
1378
- $additionalData['NnComments'] = empty($additionalData['NnComments']) ? $script : $additionalData['NnComments'] . '<br><br>' . $script;
1379
- $getayment->setAdditionalData(serialize($additionalData));
1380
- $parentOrder->setPayment($getayment)->save();
 
 
 
 
 
 
 
 
 
 
 
1381
  }
1382
 
1383
  /**
@@ -1385,215 +1350,132 @@ class Novalnet_Payment_Model_Callbackscript
1385
  *
1386
  * @param varien_object $getBillingAddress
1387
  * @param varien_object $billingAddress
1388
- * @param varien_object $ordernew
1389
  * @param varien_object $order
1390
  * @return mixed
1391
  */
1392
- private function setBillingShippingAddress($getBillingAddress,$billingAddress,$ordernew,$order)
1393
  {
1394
  $addressType = $getBillingAddress->getAddressType();
1395
- $prefix = $getBillingAddress->getPrefix();
1396
- $firstName = $getBillingAddress->getFirstname();
1397
- $lastName = $getBillingAddress->getLastname();
1398
- $middlename = $getBillingAddress->getMiddlename();
1399
- $company = $getBillingAddress->getCompany();
1400
- $suffix = $getBillingAddress->getSuffix();
1401
- $street = $getBillingAddress->getStreet();
1402
-
1403
- if (isset($street[1])) {
1404
- $street = array($street[0], $street[1]);
1405
- } else {
1406
- $street = array($street[0]);
1407
- }
1408
- $city = $getBillingAddress->getCity();
1409
- $countryId = $getBillingAddress->getCountryId();
1410
- $postCode = $getBillingAddress->getPostcode();
1411
- $regionId = $getBillingAddress->getRegionId();
1412
- $telephone = $getBillingAddress->getTelephone();
1413
- $fax = $getBillingAddress->getFax();
1414
- $vatId = $getBillingAddress->getVatId();
1415
- $storeId = $order->getStoreId();
1416
-
1417
- $billingAddress->setStoreId($storeId)
1418
- ->setAddressType($addressType)
1419
- ->setPrefix($prefix)
1420
- ->setFirstname($firstName)
1421
- ->setLastname($lastName)
1422
- ->setMiddlename($middlename)
1423
- ->setSuffix($suffix)
1424
- ->setCompany($company)
1425
- ->setStreet($street)
1426
- ->setCity($city)
1427
- ->setCountryId($countryId)
1428
- ->setRegionId($regionId)
1429
- ->setTelephone($telephone)
1430
- ->setFax($fax)
1431
- ->setVatId($vatId)
1432
- ->setPostcode($postCode);
1433
 
1434
  if ($addressType == Mage_Sales_Model_Quote_Address::TYPE_BILLING) {
1435
- $ordernew->setBillingAddress($billingAddress);
1436
  } else {
1437
  $shippingMethod = $order->getShippingMethod();
1438
  $shippingDescription = $order->getShippingDescription();
1439
- $ordernew->setShippingAddress($billingAddress)
1440
- ->setShippingMethod($shippingMethod)
1441
- ->setShippingDescription($shippingDescription);
1442
  }
1443
- return $ordernew;
1444
 
 
1445
  }
1446
 
1447
  /**
1448
  * Set order amount and customer informations
1449
  *
1450
  * @param varien_object $order
1451
- * @param varien_object $ordernew
1452
  * @return mixed
1453
  */
1454
- private function setOrderDetails($order,$ordernew)
1455
  {
1456
- $customerGroupId = $order->getCustomerGroupId();
1457
- $globalCurrencyCode = $order->getGlobalCurrencyCode();
1458
- $baseCurrencyCode = $order->getBaseCurrencyCode();
1459
- $storeCurrencyCode = $order->getStoreCurrencyCode();
1460
- $orderCurrencyCode = $order->getOrderCurrencyCode();
1461
- $status = $order->getStatus();
1462
- $state = $order->getState();
1463
- $isVirtual = $order->getIsVirtual();
1464
- $storeName = $order->getStoreName();
1465
- $customerEmail = $order->getCustomerEmail();
1466
- $customerFirstName = $order->getCustomerFirstname();
1467
- $customerLastName = $order->getCustomerLastname();
1468
- $customerId = $order->getCustomerId();
1469
- $customerIsGuest = $order->getCustomerIsGuest();
1470
- $shippingMethod = $order->getShippingMethod();
1471
- $shippingDescription = $order->getShippingDescription();
1472
- $subtotal = $order->getSubtotal();
1473
- $baseSubtoal = $order->getBaseSubtotal();
1474
- $subtotalInclTax = $order->getSubtotalInclTax();
1475
- $baseSubtotalInclTax = $order->getBaseSubtotalInclTax();
1476
- $totalQtyOrdered = $order->getTotalQtyOrdered();
1477
- $shippingAmount = $order->getShippingAmount();
1478
- $baseShippingAmount = $order->getBaseShippingAmount();
1479
- $taxAmount = $order->getTaxAmount();
1480
- $baseTaxAmount = $order->getBaseTaxAmount();
1481
- $baseGrandTotal = $order->getBaseGrandTotal();
1482
- $grandTotal = $order->getGrandTotal();
1483
- $storeId = $order->getStoreId();
1484
- $baseTaxAmount = $order->getBaseTaxAmount();
1485
- $baseToGlobalRate = $order->getBaseToGlobalRate();
1486
- $baseToOrderRate = $order->getBaseToOrderRate();
1487
- $storeToBaseRate = $order->getStoreToBaseRate();
1488
- $storeToOrderRate = $order->getStoreToOrderRate();
1489
- $weight = $order->getWeight();
1490
- $customerNoteNotify = $order->getCustomerNoteNotify();
1491
-
1492
- $ordernew->setStoreId($storeId)
1493
- ->setCustomerGroupId($customerGroupId)
1494
- ->setQuoteId(0)
1495
- ->setIsVirtual($isVirtual)
1496
- ->setGlobalCurrencyCode($globalCurrencyCode)
1497
- ->setBaseCurrencyCode($baseCurrencyCode)
1498
- ->setStoreCurrencyCode($storeCurrencyCode)
1499
- ->setOrderCurrencyCode($orderCurrencyCode)
1500
- ->setStoreName($storeName)
1501
- ->setCustomerEmail($customerEmail)
1502
- ->setCustomerFirstname($customerFirstName)
1503
- ->setCustomerLastname($customerLastName)
1504
- ->setCustomerId($customerId)
1505
- ->setCustomerIsGuest($customerIsGuest)
1506
- ->setState('processing')
1507
- ->setStatus($status)
1508
- ->setSubtotal($subtotal)
1509
- ->setBaseSubtotal($baseSubtoal)
1510
- ->setSubtotalInclTax($subtotalInclTax)
1511
- ->setBaseSubtotalInclTax($baseSubtotalInclTax)
1512
- ->setShippingAmount($shippingAmount)
1513
- ->setBaseShippingAmount($baseShippingAmount)
1514
- ->setGrandTotal($grandTotal)
1515
- ->setBaseGrandTotal($baseGrandTotal)
1516
- ->setTaxAmount($taxAmount)
1517
- ->setTotalQtyOrdered($totalQtyOrdered)
1518
- ->setBaseTaxAmount($baseTaxAmount)
1519
- ->setBaseToGlobalRate($baseToGlobalRate)
1520
- ->setBaseToOrderRate($baseToOrderRate)
1521
- ->setStoreToBaseRate($storeToBaseRate)
1522
- ->setStoreToOrderRate($storeToOrderRate)
1523
- ->setWeight($weight)
1524
- ->setCustomerNoteNotify($customerNoteNotify);
1525
-
1526
- return $ordernew;
1527
  }
1528
 
1529
  /**
1530
  * Set product informations (product, discount, tax, etc.,)
1531
  *
1532
  * @param varien_object $order
1533
- * @param varien_object $ordernew
1534
  * @return mixed
1535
  */
1536
- private function setOrderItemsDetails($order,$ordernew)
1537
  {
1538
  foreach ($order->getAllItems() as $orderValue) {
1539
- $getItemProdutType = $orderValue->getProductType();
1540
- $getProductId = $orderValue->getProductId();
1541
- $getIsVirtual = $orderValue->getIsVirtual();
1542
- $getItemStoreId = $orderValue->getStoreId();
1543
- $getItemQtyOrdered = $orderValue->getQtyOrdered();
1544
- $getItemName = $orderValue->getName();
1545
- $getItemSku = $orderValue->getSku();
1546
- $getItemWeight = $orderValue->getWeight();
1547
- $getItemPrice = $orderValue->getPrice();
1548
- $getItemBasePrice = $orderValue->getBasePrice();
1549
- $getItemOrginalPrice = $orderValue->getOriginalPrice();
1550
- $getItemRowTotal = $orderValue->getRowTotal();
1551
- $getItemBaseRowTotal = $orderValue->getBaseRowTotal();
1552
- $getItemTaxAmount = $orderValue->getTaxAmount();
1553
- $getItemTaxPercent = $orderValue->getTaxPercent();
1554
- $getItemDiscountAmount = $orderValue->getDiscountAmount();
1555
- $getIsNominal = $orderValue->getIsNominal();
1556
- $baseweeeTaxAppliedAmount = $orderValue->getBaseWeeeTaxAppliedAmount();
1557
- $weeeTaxAppliedAmount = $orderValue->getWeeeTaxAppliedAmount();
1558
- $weeeTaxAppliedRowAmount = $orderValue->getWeeeTaxAppliedRowAmount();
1559
- $weeeTaxApplied = $orderValue->getWeeeTaxApplied();
1560
- $weeeTaxDisposition = $orderValue->getWeeeTaxDisposition();
1561
- $weeeTaxRowDisposition = $orderValue->getWeeeTaxRowDisposition();
1562
- $baseWeeeTaxDisposition = $orderValue->getBaseWeeeTaxDisposition();
1563
- $baseWeeeTaxRowDisposition = $orderValue->getBaseWeeeTaxRowDisposition();
1564
- }
1565
-
1566
- $orderItem = Mage::getModel('sales/order_item')
1567
- ->setStoreId($getItemStoreId)
1568
  ->setQuoteItemId(0)
1569
  ->setQuoteParentItemId(NULL)
1570
  ->setQtyBackordered(NULL)
1571
- ->setQtyOrdered($getItemQtyOrdered)
1572
- ->setName($getItemName)
1573
- ->setIsVirtual($getIsVirtual)
1574
- ->setProductId($getProductId)
1575
- ->setProductType($getItemProdutType)
1576
- ->setSku($getItemSku)
1577
- ->setWeight($getItemWeight)
1578
- ->setPrice($getItemPrice)
1579
- ->setBasePrice($getItemBasePrice)
1580
- ->setOriginalPrice($getItemOrginalPrice)
1581
- ->setTaxAmount($getItemTaxAmount)
1582
- ->setTaxPercent($getItemTaxPercent)
1583
- ->setIsNominal($getIsNominal)
1584
- ->setRowTotal($getItemRowTotal)
1585
- ->setBaseRowTotal($getItemBaseRowTotal)
1586
- ->setBaseWeeeTaxAppliedAmount($baseweeeTaxAppliedAmount)
1587
- ->setWeeeTaxAppliedAmount($weeeTaxAppliedAmount)
1588
- ->setWeeeTaxAppliedRowAmount($weeeTaxAppliedRowAmount)
1589
- ->setWeeeTaxApplied($weeeTaxApplied)
1590
- ->setWeeeTaxDisposition($weeeTaxDisposition)
1591
- ->setWeeeTaxRowDisposition($weeeTaxRowDisposition)
1592
- ->setBaseWeeeTaxDisposition($baseWeeeTaxDisposition)
1593
- ->setBaseWeeeTaxRowDisposition($baseWeeeTaxRowDisposition);
1594
- $ordernew->addItem($orderItem);
1595
-
1596
- return $ordernew;
 
1597
  }
1598
 
1599
  /**
@@ -1616,13 +1498,13 @@ class Novalnet_Payment_Model_Callbackscript
1616
  * @param int $newOrderId
1617
  * @param int $profileId
1618
  */
1619
- private function insertOrderId($newOrderId,$profileId)
1620
  {
1621
  if ($newOrderId && $profileId) {
1622
  $connection = Mage::getSingleton('core/resource')->getConnection('core_write');
1623
  $connection->beginTransaction();
1624
  $tablePrefix = Mage::getConfig()->getTablePrefix();
1625
- $orderTable = $tablePrefix.'sales_recurring_profile_order';
1626
  $fields = array();
1627
  $fields['profile_id'] = $profileId;
1628
  $fields['order_id'] = $newOrderId;
@@ -1638,8 +1520,7 @@ class Novalnet_Payment_Model_Callbackscript
1638
  */
1639
  private function updateInventory($order)
1640
  {
1641
- foreach($order->getAllItems() as $orderValue)
1642
- {
1643
  $itemsQtyOrdered = floor($orderValue->getQtyOrdered());
1644
  $productId = $orderValue->getProductId();
1645
  break;
@@ -1647,15 +1528,29 @@ class Novalnet_Payment_Model_Callbackscript
1647
 
1648
  if ($productId) {
1649
  $stockObj = Mage::getModel('cataloginventory/stock_item')->loadByProduct($productId);
1650
- $productQtyBefore = (int)$stockObj->getQty();
1651
  }
1652
 
1653
  if (isset($productQtyBefore) && $productQtyBefore > 0) {
1654
- $productQtyAfter = (int)($productQtyBefore - $itemsQtyOrdered);
1655
- $stockData['qty'] = $productQtyAfter;
1656
  $stockObj->setQty($productQtyAfter);
1657
  $stockObj->save();
1658
  }
1659
  }
1660
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1661
  }
1
  <?php
2
+
3
  /**
4
  * Magento
5
  *
26
  */
27
  class Novalnet_Payment_Model_Callbackscript
28
  {
29
+
 
30
  var $useZendEmail = true; //false|true; adapt for your need
 
31
 
32
  public function Callback()
33
  {
34
  //Security Setting; only this IP is allowed for call back script
35
+ $this->ipAllowed = array('195.143.189.210', '195.143.189.214'); //Novalnet IP, is a fixed value, DO NOT CHANGE!!!!!
36
+ $this->debug = Mage::getStoreConfig('novalnet_global/novalnetsetting/enabledebugmode');
37
+ $this->test = Mage::getStoreConfig('novalnet_global/novalnetsetting/enabletestmode');
38
 
39
  $this->callback = false;
40
  $this->recurring = false;
41
  $this->request = $this->getParam();
42
+ $this->currentTime = Mage::getModel('core/date')->date('Y-m-d H:i:s');
43
+ $this->emailSendOption = Mage::getStoreConfig('novalnet_global/novalnetsetting/emailsendoption');
44
 
45
  $this->allowedPayment = array(
46
  'novalnetcc' => array('CREDITCARD', 'CREDITCARD_BOOKBACK', 'CREDITCARD_CHARGEBACK',
69
  'DEBT_COLLECTION_CREDITCARD');
70
  $this->arySubscription = array('SUBSCRIPTION_STOP');
71
 
 
 
 
 
 
 
72
  $httpHost = Mage::helper('core/http')->getHttpHost();
73
  $this->lineBreak = empty($httpHost) ? PHP_EOL : '<br />';
74
 
84
 
85
  $this->level = $this->getPaymentTypeLevel();
86
 
87
+ if (in_array($this->request['payment_type'], $this->recurringAllowed)
88
+ && (!empty($this->request['signup_tid']) || !empty($this->request['subs_billing']))) {
89
  $this->recurring = true;
90
  } else {
91
  $this->callback = true;
92
  }
93
 
94
  //Parameter Settings
95
+ $this->paramsRequired = array(
96
  'vendor_id' => '',
97
  'tid' => '',
98
  'payment_type' => '',
103
  );
104
 
105
  if ($this->callback) {
106
+ unset($this->paramsRequired['signup_tid']);
107
+ $invoiceChargeback = array_merge($this->invoiceAllowed, $this->chargebacks);
108
+ if ((!in_array($this->request['payment_type'], $invoiceChargeback))) {
109
+ unset($this->paramsRequired['tid_payment']);
110
  }
111
  } else {
112
+ unset($this->paramsRequired['tid_payment']);
113
+ unset($this->paramsRequired['order_no']);
114
  }
115
 
116
+ ksort($this->paramsRequired);
117
 
118
  // ################### Main Prog. ##########################
119
  try {
129
  $this->orderNo = $orderNo;
130
  } else {
131
  $this->orderNo = isset($response['order_no']) && $response['order_no'] ? $response['order_no'] : '';
132
+ if (!$this->orderNo) {
133
  $this->orderNo = $this->getOrderIdByTransId();
134
  }
135
  }
136
 
137
  if (empty($response['payment_type'])) {
138
+ $this->showDebug("Required param (payment_type) missing!");
139
  } elseif (empty($this->orderNo)) {
140
+ $this->showDebug("Required (Transaction ID) not Found!");
141
+ } elseif (!empty($response['payment_type'])
142
+ && in_array(strtoupper($response['payment_type']), array_merge($this->paymentTypes, $this->chargebacks, $this->aryCollection, $this->arySubscription))) {
143
  //Complete the order incase response failure from novalnet server
144
  $order = $this->getOrderByIncrementId($this->orderNo);
145
  $storeId = $order->getStoreId();
149
  $payment = $order->getPayment();
150
  $paymentObj = $payment->getMethodInstance();
151
  $this->paymentCode = $paymentObj->getCode();
152
+ $additionalData = $getResponseData = unserialize($payment->getAdditionalData());
153
+ $paymentObj->_vendorId = ($getResponseData['vendor']) ? $getResponseData['vendor'] : $paymentObj->getNovalnetConfig('merchant_id', true, $storeId);
154
+ $paymentObj->_authCode = ($getResponseData['auth_code']) ? $getResponseData['auth_code'] : $paymentObj->getNovalnetConfig('auth_code', true, $storeId);
155
+ $paymentObj->_productId = ($getResponseData['product']) ? $getResponseData['product'] : $paymentObj->getNovalnetConfig('product_id', true, $storeId);
 
 
 
156
  // Get Admin Transaction status via API
157
  if ($this->recurring) {
158
  $paymentTid = $response['signup_tid'];
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();
170
  }
171
 
172
  $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
173
+ $serverResponseMode = $response['test_mode'];
174
+ $shopMode = $paymentObj->getNovalnetConfig('live_mode', '', $storeId);
175
+ $testMode = ((isset($serverResponseMode) && $serverResponseMode == 1) || (isset($shopMode) && $shopMode == 0)) ? 1 : 0;
 
176
  $data = array('NnTestOrder' => $testMode);
177
  $data = $additionalData ? array_merge($additionalData, $data) : $data;
178
  $txnId = $response['tid'];
184
  $dataObj = new Varien_Object($response);
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)
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
 
212
  $this->callBackExecuted = true;
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)
220
  ->save();
221
  } catch (Exception $e) {
222
+ $helper->showException('Cannot send new order email.');
223
  }
224
  }
225
  $order->save();
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 {
241
+ $this->showDebug("Order no [" . $this->orderNo . "] is not valid!");
242
  }
243
  } else {
244
+ $this->showDebug("Payment type [" . $response['payment_type'] . "] is mismatched!");
245
  }
246
  }
247
 
 
 
 
 
248
  } catch (Exception $e) {
249
  $this->emailBody .= "Exception catched: $this->lineBreak\$e:" . $e->getMessage() . $this->lineBreak;
250
  }
261
  {
262
  if (isset($this->emailBody) && $this->emailBody && $this->emailFromAddr && $this->emailToAddr) {
263
  if (!$this->sendMail($this->emailBody)) {
264
+ $this->showDebug("Mailing failed!".$this->lineBreak, false);
265
+ $this->showDebug("This mail text should be sent: ", false);
 
 
266
  }
267
  }
268
 
269
+ if (isset($this->emailBody)) {
270
+ $this->showDebug($this->emailBody);
271
  }
272
  }
273
 
332
  $mail->setSubject($this->emailSubject);
333
 
334
  try {
335
+ $this->showDebug(__FUNCTION__ . ': Sending Email succeeded!'.$this->lineBreak, false);
 
 
336
  $emailTemplate->send($this->emailToAddr, $this->emailToName, $emailTemplateVariables);
337
  } catch (Exception $e) {
338
  Mage::getSingleton('core/session')->addError($this->_getNovalnetHelper()->__('Unable to send email'));
339
+ $this->showDebug('Email sending failed: ', false);
 
 
340
  return false;
341
  }
342
  return true;
361
 
362
  try {
363
  $mail->send();
364
+ $this->showDebug(__FUNCTION__ . ': Sending Email succeeded!'.$this->lineBreak, false);
 
 
365
  } catch (Exception $e) {
366
+ $this->showDebug('Email sending failed: ', false);
 
 
367
  return false;
368
  }
369
  return true;
379
  */
380
  public function emailSeparate($emailaddr, $mail, $addr)
381
  {
 
382
  $email = explode(',', $emailaddr);
383
  $validatorEmail = $this->validatorEmail;
384
 
399
  public function checkParams($request)
400
  {
401
  if (!$request) {
402
+ $this->showDebug('Novalnet callback received. No params passed over!');
403
+ }
404
+
405
+ if (in_array($request['payment_type'], $this->arySubscription)) {
406
+ unset($this->paramsRequired['amount']);
407
  }
408
 
409
+ foreach ($this->paramsRequired as $k => $v) {
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
+ }
417
  }
418
 
419
  if ($this->recurring && !preg_match('/^\d{17}$/', $request['signup_tid'])) {
420
+ $this->showDebug('Novalnet callback received. Invalid TID [' . $request['signup_tid'] . '] for Order.');
 
421
  } else if ((in_array($request['payment_type'], $this->invoiceAllowed)) || (in_array($request['payment_type'], $this->chargebacks))) {
422
  if (!$this->recurring && !preg_match('/^\d{17}$/', $request['tid_payment'])) {
423
+ $this->showDebug('Novalnet callback received. Invalid TID [' . $request['tid_payment'] . '] for Order:' . $this->orderNo);
 
424
  }
425
  }
426
 
427
  if (!preg_match('/^\d{17}$/', $request['tid'])) {
428
  if ((in_array($request['payment_type'], $this->invoiceAllowed)) || (in_array($request['payment_type'], $this->chargebacks))) {
429
+ $this->showDebug('Novalnet callback received. New TID is not valid.');
430
  } else {
431
+ $this->showDebug('Novalnet callback received. Invalid TID [' . $request['tid'] . '] for Order:' . $this->orderNo);
432
  }
 
433
  }
434
 
435
  if ($request['payment_type'] == 'INVOICE_CREDIT' && !empty($request['status']) && 100 != $request['status']) {
436
+ $this->showDebug('Novalnet callback received. Callback Script executed already. Refer Order :' . $this->orderNo);
 
437
  }
438
 
439
  return true;
457
  }
458
 
459
  if ($order->getIncrementId() == $orderNo && !empty($orderNo)) {
 
 
 
 
 
 
 
460
  $orderPaymentName = strtolower($this->paymentCode);
461
+
462
  if ($request['subs_billing'] == 1) {
463
+ $orgTid = $request['signup_tid'];
464
  } else if ((in_array($request['payment_type'], $this->chargebacks)) || $request['payment_type'] == 'INVOICE_CREDIT') {
465
  $orgTid = $request['tid_payment'];
466
  } else {
469
 
470
  $paymentType = $this->allowedPayment[$orderPaymentName];
471
  if (!in_array($request['payment_type'], $paymentType)) {
472
+ $this->showDebug("Novalnet callback received. Payment type (" . $request['payment_type'] . ") is not matched with $orderPaymentName!");
 
473
  }
474
 
475
  $payment = $order->getPayment();
476
  $additionalData = unserialize($payment->getAdditionalData());
477
+ $orderTid = ((in_array($request['payment_type'], $this->chargebacks)) && $additionalData['NnTid']) ? $additionalData['NnTid'] : $order->getPayment()->getLastTransId();
 
478
 
479
+ if (!preg_match('/^' . $orgTid . '/i', $orderTid) && !$this->recurring) {
480
+ $this->showDebug('Novalnet callback received. Order no is not valid');
 
 
481
  }
482
 
483
  if ($this->recurring && $request['subs_billing'] && $activeState == 'canceled') {
484
+ $this->showDebug('Subscription already Cancelled. Refer Order : ' . $orderNo);
 
485
  }
486
 
487
  return true;
488
  } else {
489
+ $this->showDebug('Novalnet callback received. Order no is not valid');
 
490
  }
491
  }
492
 
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;
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;
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']);
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 {
617
+ $this->showDebug("Novalnet Callback: No order for Increment-ID $this->orderNo found.");
 
618
  }
619
  return true;
620
  }
627
  * @param int $paid
628
  * @return boolean
629
  */
630
+ public function saveInvoice(Mage_Sales_Model_Order $order, $nominalItem, $paid)
631
  {
632
  if (!$this->callBackExecuted) {
633
  $request = $this->request;
637
  $paymentObj = $payment->getMethodInstance();
638
  $data = unserialize($payment->getAdditionalData());
639
 
640
+ $novalnetCallbackModel = Mage::getModel('novalnet_payment/callback')->loadLogByOrderId($orderNo);
641
+ $sum = sprintf(($request['amount'] + $novalnetCallbackModel->getCallbackAmount()), 0.2);
642
+ $amountvalue = $this->getRecurringTotal($request, $order, $nominalItem);
643
+ $grandTotal = sprintf(($amountvalue * 100), 0.2);
644
  if (!$this->recurring) {
645
+ $tidPayment = $request['tid_payment'];
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 {
658
+ $this->doNovalnetCallbackLog($novalnetCallbackModel, $request, $sum);
659
  $amount = $helper->getFormatedAmount($request['amount'], 'RAW');
660
  if ($order->canInvoice()) {
661
  $tid = $this->requestTid($request);
670
  ->save();
671
  if ($this->recurring || $nominalItem) {
672
  $profileInfo = $this->getProfileInformation($request);
673
+ if ($profileInfo->getState() != 'canceled') {
674
+ $profileInfo->setState('active');
675
+ $profileInfo->save();
676
+ }
677
  }
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;
693
+ $this->saveAdditionalInfo($payment, $data, $scriptText, $order);
694
+ $this->saveOrderStatus($order, $nominalItem);
695
  $this->sendCallbackMail();
696
  die;
697
  }
698
 
699
  $invoicePayments = array(Novalnet_Payment_Model_Config::NN_PREPAYMENT, Novalnet_Payment_Model_Config::NN_INVOICE);
700
  if (in_array($paymentObj->getCode(), $invoicePayments)) {
701
+ $this->showDebug("Novalnet callback received. Callback Script executed already. Refer Order :" . $this->orderNo);
702
  } elseif ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_PAYPAL) {
703
+ $this->showDebug("Novalnet callback received. Order already paid.");
704
  } else {
705
+ $this->showDebug("Novalnet Callbackscript received. Payment type ( " . $request['payment_type'] . " ) is not applicable for this process!");
706
  }
 
707
  }
708
  }
709
  }
716
  * @param varien_object $order
717
  * @param varien_object $nominalItem
718
  */
719
+ private function saveOrderStatus($order, $nominalItem)
720
  {
721
  $payment = $order->getPayment();
722
  $originalTid = trim($payment->getLastTransId());
723
  if (!$this->recurring && !$nominalItem) {
724
  $transaction = Mage::getModel('sales/order_payment')->getCollection()
725
+ ->addFieldToFilter('last_trans_id', $originalTid)
726
+ ->addFieldToSelect('entity_id');
727
  foreach ($transaction as $transactionId) {
728
+ $entitiyId = $transactionId->getEntityId();
729
  }
730
  Mage::getModel('sales/order_payment')->load($entitiyId)
731
+ ->setLastTransId(trim($this->request['tid']))
732
+ ->save();
733
  }
734
 
735
  $orderStatus = $this->getOrderStatus($order);
736
+ $orderState = Mage_Sales_Model_Order::STATE_PROCESSING;
737
  $order->setState($orderState, true, 'Novalnet callback set state ' . $orderState . ' for Order-ID = ' . $this->orderNo);
738
+ $order->addStatusToHistory($orderStatus, 'Novalnet callback added order status ' . $orderStatus);
739
  $order->save();
740
 
741
  $invoice = $order->getInvoiceCollection()->getFirstItem();
744
 
745
  if ($this->recurring || $nominalItem) {
746
  $profileInfo = $this->getProfileInformation($this->request);
747
+ if ($profileInfo->getState() != 'canceled') {
748
+ $profileInfo->setState('active');
749
+ $profileInfo->save();
750
+ }
751
  }
752
  }
753
 
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
 
778
  return true;
794
  $payment = $order->getPayment();
795
  $paymentObj = $payment->getMethodInstance();
796
  $storeId = $order->getStoreId();
797
+ $transactionStatus = Mage::getModel('novalnet_payment/transactionstatus');
798
+ $transactionStatus->setTransactionNo($response['tid'])
799
  ->setOrderId($this->orderNo)
800
+ ->setTransactionStatus($status)
801
+ ->setNcNo($ncNo)
802
  ->setCustomerId($response['customer_no'])
803
  ->setPaymentName($this->paymentCode)
804
  ->setAmount($helper->getFormatedAmount($amount, 'RAW'))
819
  $order = $this->getOrderByIncrementId($this->orderNo);
820
  $helper = $this->_getNovalnetHelper();
821
  $storeId = $order->getStoreId();
822
+ $transactionOverview = $helper->getModelTransactionOverview()->loadByAttribute('order_id', $this->orderNo);
823
+ $transactionOverview->setTransactionId($response['tid'])
824
  ->setResponseData(base64_encode(serialize($response)))
825
  ->setCustomerId($response['customer_no'])
826
+ ->setStatus($response['status'])
827
  ->setStoreId($storeId)
828
  ->setShopUrl($helper->getCurrentSiteUrl())
829
  ->save();
832
  /**
833
  * Log partial callback data
834
  *
835
+ * @param Novalnet_Payment_Model_Callback $novalnetCallbackModel
836
  * @param array $response
837
  * @param int $sum
838
  */
839
+ public function doNovalnetCallbackLog($novalnetCallbackModel, $response, $sum)
840
  {
841
  $orgTid = $this->requestTid($response);
842
  $orderNo = $this->orderNo;
843
  $reqUrl = Mage::helper('core/http')->getRequestUri();
844
+ $novalnetCallbackModel->setOrderId($orderNo)
845
  ->setCallbackAmount($sum)
846
  ->setReferenceTid($orgTid)
847
+ ->setCallbackDatetime($this->currentTime)
848
  ->setCallbackLog($reqUrl)
849
  ->save();
850
  }
902
  */
903
  public function getParam()
904
  {
905
+ return Mage::app()->getRequest()->getPost() ? Mage::app()->getRequest()->getPost() : Mage::app()->getRequest()->getQuery();
 
 
906
  }
907
 
908
  /**
916
  $payment = $order->getPayment();
917
  $paymentObj = $payment->getMethodInstance();
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;
986
  $recurringSave->setSignupTid($request['signup_tid']);
987
  $recurringSave->setBillingcycle($periodMaxCycles);
988
  $recurringSave->setCallbackcycle($callbackCycle);
989
+ $recurringSave->setCycleDatetime($this->currentTime);
990
  $recurringSave->save();
991
  } else {
992
  foreach ($recurringCollection as $recurringValue) {
995
  $callbackCycle = $callbackCycle + 1;
996
  $recurringSave = $helper->getModelRecurring()->load($profileId, 'profile_id');
997
  $recurringSave->setCallbackcycle($callbackCycle);
998
+ $recurringSave->setCycleDatetime($this->currentTime);
999
  $recurringSave->save();
1000
  }
1001
  return $callbackCycle;
1018
  if ($callbackCycle == $periodMaxCycles) {
1019
  $requestdata = new Varien_Object();
1020
  $order = $this->getOrderByIncrementId($this->orderNo);
1021
+ $payment = $order->getPayment();
1022
+ $paymentObj = $payment->getMethodInstance();
1023
  $helper = $this->_getNovalnetHelper();
1024
  $orderItems = $order->getAllItems();
1025
  $nominalItem = $helper->checkNominalItem($orderItems);
1026
  $storeId = $helper->getMagentoStoreId();
1027
+ $paymentObj->assignOrderBasicParams($requestdata, $payment, $storeId, $nominalItem);
1028
  $requestdata->setNnLang(strtoupper($helper->getDefaultLanguage()))
1029
  ->setCancelSub(1)
1030
  ->setCancelReason('other')
1031
  ->setTid($request['signup_tid']);
1032
  $buildNovalnetParam = http_build_query($requestdata->getData());
1033
+ $recurringCancelUrl = $helper->getPayportUrl('paygate');
1034
+ $dataHelper = Mage::helper('novalnet_payment/AssignData');
1035
+ $response = $dataHelper->setRawCallRequest($buildNovalnetParam, $recurringCancelUrl, $payment);
1036
+ $orderNo = $this->getOrderIdByTransId();
1037
+ // load parent order
1038
+ $parentOrder = $this->getOrderByIncrementId($orderNo);
1039
+ $parentPayment = $parentOrder->getPayment();
1040
+ $data = unserialize($parentPayment->getAdditionalData());
1041
+ $data['subsCancelReason'] = 'other';
1042
+ $parentPayment->setAdditionalData(serialize($data))->save();
1043
+ $paymentObj->logNovalnetTransactionData($requestdata, $response, $request['signup_tid'], NULL, $storeId, $orderNo);
1044
+ if ($response->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
1045
+ $recurringProfileId->setState('canceled');
1046
+ $recurringProfileId->save();
1047
+ $this->endTime = 1;
1048
+ } else {
1049
+ $this->endTime = 0;
1050
+ }
1051
  }
1052
  }
1053
 
1062
  $orderPaymentName = strtolower($this->getPaymentMethod($order));
1063
  $paymentType = $this->allowedPayment[$orderPaymentName];
1064
  if (!in_array($this->request['payment_type'], $paymentType)) {
1065
+ $this->showDebug("Novalnet callback received. Payment type (" . $this->request['payment_type'] . ") is not matched with $orderPaymentName!");
 
1066
  }
1067
 
1068
  return true;
1076
  * @param mixed $nominalItem
1077
  * @return float
1078
  */
1079
+ private function getRecurringTotal($request, $order, $nominalItem)
1080
  {
1081
  if ($this->recurring || $nominalItem) {
1082
  $profileInfo = $this->getProfileInformation($request);
1083
  $billingAmount = $profileInfo->getBillingAmount();
1084
  $initialAmount = $profileInfo->getInitAmount();
 
 
 
1085
  }
1086
 
1087
  $changeAmount = $this->_getNovalnetHelper()->getAmountCollection($order->getId(), 1, NULL);
1088
+ if ($changeAmount) {
1089
  $amountvalue = $changeAmount;
1090
+ } elseif (($this->recurring || $nominalItem) && ($initialAmount && $billingAmount)) {
1091
+ $amountvalue = round(($initialAmount + $billingAmount + $profileInfo->getShippingAmount()
1092
+ + $profileInfo->getTaxAmount()), 2);
 
 
 
 
 
 
1093
  } else {
1094
  $amountvalue = $order->getGrandTotal();
1095
  }
1122
  */
1123
  private function getEmailConfig($storeId = NULL)
1124
  {
1125
+ $this->emailFromAddr = Mage::getStoreConfig('trans_email/ident_general/email', $storeId);
1126
+ $this->emailToAddr = Mage::getStoreConfig('novalnet_global/novalnetsetting/emailtoaddr', $storeId);
1127
+ $this->emailBCcAddr = Mage::getStoreConfig('novalnet_global/novalnetsetting/emailBcc', $storeId);
1128
+ $this->emailSubject = 'Novalnet Callback Script Access Report';
1129
+ $this->emailBody = "";
1130
+ $this->emailFromName = Mage::getStoreConfig('trans_email/ident_general/name', $storeId);
1131
+ $this->emailToName = "";
1132
  $this->callBackExecuted = false;
 
 
 
 
 
 
 
1133
  }
1134
 
1135
  /*
1136
+ * Get given payment_type level for process
1137
+ *
1138
+ * @return Integer | boolean
1139
+ */
1140
+
1141
  private function getPaymentTypeLevel()
1142
  {
1143
  if (!empty($this->request)) {
1144
+ if (in_array($this->request['payment_type'], $this->paymentTypes)) {
1145
+ return 0;
1146
+ } else if (in_array($this->request['payment_type'], $this->chargebacks)) {
1147
+ return 1;
1148
+ } else if (in_array($this->request['payment_type'], $this->aryCollection)) {
1149
+ return 2;
1150
+ }
1151
  }
1152
  return false;
1153
  }
1164
 
1165
  $tablePrefix = Mage::getConfig()->getTablePrefix();
1166
  if (in_array($request['payment_type'], $this->chargebacks)) {
1167
+ $orderPayment = $tablePrefix . 'sales_payment_transaction';
1168
  $onCondition = "main_table.entity_id = $orderPayment.order_id";
1169
+ $orderCollection = Mage::getModel('sales/order')->getCollection()
1170
+ ->addFieldToFilter('txn_id', array('like' => "%$orgTid%"))
1171
+ ->addFieldToSelect('increment_id');
1172
  } else {
1173
+ $orderPayment = $tablePrefix . 'sales_flat_order_payment';
1174
  $onCondition = "main_table.entity_id = $orderPayment.parent_id";
1175
+ $orderCollection = Mage::getModel('sales/order')->getCollection()
1176
+ ->addFieldToFilter('last_trans_id', array('like' => "%$orgTid%"))
1177
+ ->addFieldToSelect('increment_id');
1178
  }
1179
 
1180
+ $orderCollection->getSelect()->join($orderPayment, $onCondition);
1181
  $count = $orderCollection->count();
1182
  if ($count > 0) {
1183
  foreach ($orderCollection as $order) {
1185
  }
1186
  }
1187
 
1188
+ $orderId = !empty($orderid) ? $orderid : '';
1189
  return $orderId;
1190
  }
1191
 
1199
  {
1200
  if (isset($request['signup_tid']) && $request['signup_tid']) {
1201
  $tidPayment = trim($request['signup_tid']);
1202
+ } elseif ((in_array($this->request['payment_type'], $this->chargebacks)) || ($this->request['payment_type'] == 'INVOICE_CREDIT')) {
 
1203
  $tidPayment = trim($request['tid_payment']);
1204
  } else {
1205
  $tidPayment = trim($request['tid']);
1217
  * @param varien_object $paymentold
1218
  * @param int $profileId
1219
  */
1220
+ private function createOrder($order, $script, $data, $paymentold, $profileId)
1221
  {
1222
  $helper = $this->_getNovalnetHelper();
1223
  $paymentCode = $order->getPayment()->getMethodInstance()->getCode();
1224
  $additionalInfo = $order->getPayment()->getAdditionalInformation();
1225
  $storeId = $order->getStoreId();
1226
  $this->setLanguageStore($storeId);
1227
+ $orderNew = Mage::getModel('sales/order')
1228
+ ->setState('new');
1229
 
1230
  $orderPayment = Mage::getModel('sales/order_payment')
1231
+ ->setStoreId($storeId)
1232
+ ->setMethod($paymentCode)
1233
+ ->setPo_number('-');
1234
+ $orderNew->setPayment($orderPayment);
1235
+ $orderNew = $this->setOrderDetails($order, $orderNew);
1236
  $billingAddress = Mage::getModel('sales/order_address');
1237
  $getBillingAddress = Mage::getModel('sales/order_address')->load($order->getBillingAddress()->getId());
1238
+ $orderNew = $this->setBillingShippingAddress($getBillingAddress, $billingAddress, $orderNew, $order);
1239
  $isVirtual = $order->getIsVirtual();
1240
 
1241
  if ($isVirtual == 0) {
1242
  $shippingAddress = Mage::getModel('sales/order_address');
1243
  $getShippingAddress = Mage::getModel('sales/order_address')->load($order->getShippingAddress()->getId());
1244
+ $orderNew = $this->setBillingShippingAddress($getShippingAddress, $shippingAddress, $orderNew, $order);
1245
  }
1246
 
1247
+ $orderNew = $this->setOrderItemsDetails($order, $orderNew);
1248
+ $payment = $orderNew->getPayment();
1249
  $paymentObj = $payment->getMethodInstance();
1250
+ $setOrderAfterStatus = $paymentObj->getConfigData('order_status', $storeId);
1251
  $setOrderAfterStatus = $setOrderAfterStatus ? $setOrderAfterStatus : Mage_Sales_Model_Order::STATE_PROCESSING;
1252
+ $orderNew->addStatusToHistory($setOrderAfterStatus, $helper->__('Novalnet Recurring Callback script Executed Successfully'), false);
1253
  $tid = trim($this->request['tid']);
1254
+ $orderNew->save();
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'],
1263
  'NnTid' => $tid,
1264
+ 'orderNo' => $orderNew->getIncrementId(),
1265
  'vendor' => $data['vendor'],
1266
  'auth_code' => $data['auth_code'],
1267
  'product' => $data['product'],
1268
  'tariff' => $data['tariff'],
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
  }
 
 
1281
 
1282
  $payment->setTransactionId($tid)
1283
  ->setAdditionalData(serialize($newData))
1285
  ->setLastTransId($tid)
1286
  ->setParentTransactionId(null)
1287
  ->save();
1288
+ $orderNew->sendNewOrderEmail()
1289
+ ->setEmailSent(true)
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)
1299
  ->setState(Mage_Sales_Model_Order_Invoice::STATE_PAID)
1300
  ->register();
1301
 
1302
  Mage::getModel('core/resource_transaction')
1303
+ ->addObject($invoice)
1304
+ ->addObject($invoice->getOrder())
1305
+ ->save();
1306
 
1307
  $magentoVersion = $this->_getNovalnetHelper()->getMagentoVersion();
1308
+ $transMode = (version_compare($magentoVersion, '1.6', '<')) ? false : true;
 
1309
 
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();
1316
  $this->updateInventory($order);
1317
  }
1318
 
1319
  /**
1320
+ * Log Novalnet transaction status data
1321
  *
1322
+ * @param varien_object $response
1323
+ * @param int $txnId
1324
+ * @param varien_object $order
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() : '';
1332
+ $storeId = $order->getStoreId() ? $order->getStoreId() : '';
1333
+ $amount = $this->request['amount'] ? ($this->request['amount'] / 100) : '';
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
1341
+ ->setRemoteIp($helper->getRealIpAddr()) // Remote ip
1342
+ ->setStoreId($storeId) // Store id
1343
+ ->setShopUrl($helper->getCurrentSiteUrl())
1344
+ ->setCreatedDate($helper->getCurrentDateTime()) // Created date
1345
+ ->save();
1346
  }
1347
 
1348
  /**
1350
  *
1351
  * @param varien_object $getBillingAddress
1352
  * @param varien_object $billingAddress
1353
+ * @param varien_object $orderNew
1354
  * @param varien_object $order
1355
  * @return mixed
1356
  */
1357
+ private function setBillingShippingAddress($getBillingAddress, $billingAddress, $orderNew, $order)
1358
  {
1359
  $addressType = $getBillingAddress->getAddressType();
1360
+ $billingStreet = $getBillingAddress->getStreet();
1361
+ $street = !empty($billingStreet[1]) ? array($billingStreet[0], $billingStreet[1]) : array($billingStreet[0]);
1362
+ $billingAddress->setStoreId($order->getStoreId())
1363
+ ->setAddressType($addressType)
1364
+ ->setPrefix($getBillingAddress->getPrefix())
1365
+ ->setFirstname($getBillingAddress->getFirstname())
1366
+ ->setLastname($getBillingAddress->getLastname())
1367
+ ->setMiddlename($getBillingAddress->getMiddlename())
1368
+ ->setSuffix($getBillingAddress->getSuffix())
1369
+ ->setCompany($getBillingAddress->getCompany())
1370
+ ->setStreet($street)
1371
+ ->setCity($getBillingAddress->getCity())
1372
+ ->setCountryId($getBillingAddress->getCountryId())
1373
+ ->setRegionId($getBillingAddress->getRegionId())
1374
+ ->setTelephone($getBillingAddress->getTelephone())
1375
+ ->setFax($getBillingAddress->getFax())
1376
+ ->setVatId($getBillingAddress->getVatId())
1377
+ ->setPostcode($getBillingAddress->getPostcode());
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1378
 
1379
  if ($addressType == Mage_Sales_Model_Quote_Address::TYPE_BILLING) {
1380
+ $orderNew->setBillingAddress($billingAddress);
1381
  } else {
1382
  $shippingMethod = $order->getShippingMethod();
1383
  $shippingDescription = $order->getShippingDescription();
1384
+ $orderNew->setShippingAddress($billingAddress)
1385
+ ->setShippingMethod($shippingMethod)
1386
+ ->setShippingDescription($shippingDescription);
1387
  }
 
1388
 
1389
+ return $orderNew;
1390
  }
1391
 
1392
  /**
1393
  * Set order amount and customer informations
1394
  *
1395
  * @param varien_object $order
1396
+ * @param varien_object $orderNew
1397
  * @return mixed
1398
  */
1399
+ private function setOrderDetails($order, $orderNew)
1400
  {
1401
+ $orderNew->setStoreId($order->getStoreId())
1402
+ ->setCustomerGroupId($order->getCustomerGroupId())
1403
+ ->setQuoteId(0)
1404
+ ->setIsVirtual($order->getIsVirtual())
1405
+ ->setGlobalCurrencyCode($order->getGlobalCurrencyCode())
1406
+ ->setBaseCurrencyCode($order->getBaseCurrencyCode())
1407
+ ->setStoreCurrencyCode($order->getStoreCurrencyCode())
1408
+ ->setOrderCurrencyCode($order->getOrderCurrencyCode())
1409
+ ->setStoreName($order->getStoreName())
1410
+ ->setCustomerEmail($order->getCustomerEmail())
1411
+ ->setCustomerFirstname($order->getCustomerFirstname())
1412
+ ->setCustomerLastname($order->getCustomerLastname())
1413
+ ->setCustomerId($order->getCustomerId())
1414
+ ->setCustomerIsGuest($order->getCustomerIsGuest())
1415
+ ->setState('processing')
1416
+ ->setStatus($order->getStatus())
1417
+ ->setSubtotal($order->getSubtotal())
1418
+ ->setBaseSubtotal($order->getBaseSubtotal())
1419
+ ->setSubtotalInclTax($order->getSubtotalInclTax())
1420
+ ->setBaseSubtotalInclTax($order->getBaseSubtotalInclTax())
1421
+ ->setShippingAmount($order->getShippingAmount())
1422
+ ->setBaseShippingAmount($order->getBaseShippingAmount())
1423
+ ->setGrandTotal($order->getGrandTotal())
1424
+ ->setBaseGrandTotal($order->getBaseGrandTotal())
1425
+ ->setTaxAmount($order->getTaxAmount())
1426
+ ->setTotalQtyOrdered($order->getTotalQtyOrdered())
1427
+ ->setBaseTaxAmount($order->getBaseTaxAmount())
1428
+ ->setBaseToGlobalRate($order->getBaseToGlobalRate())
1429
+ ->setBaseToOrderRate($order->getBaseToOrderRate())
1430
+ ->setStoreToBaseRate($order->getStoreToBaseRate())
1431
+ ->setStoreToOrderRate($order->getStoreToOrderRate())
1432
+ ->setWeight($order->getWeight())
1433
+ ->setCustomerNoteNotify($order->getCustomerNoteNotify());
1434
+ return $orderNew;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1435
  }
1436
 
1437
  /**
1438
  * Set product informations (product, discount, tax, etc.,)
1439
  *
1440
  * @param varien_object $order
1441
+ * @param varien_object $orderNew
1442
  * @return mixed
1443
  */
1444
+ private function setOrderItemsDetails($order, $orderNew)
1445
  {
1446
  foreach ($order->getAllItems() as $orderValue) {
1447
+ $orderItem = Mage::getModel('sales/order_item')
1448
+ ->setStoreId($orderValue->getStoreId())
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1449
  ->setQuoteItemId(0)
1450
  ->setQuoteParentItemId(NULL)
1451
  ->setQtyBackordered(NULL)
1452
+ ->setQtyOrdered($orderValue->getQtyOrdered())
1453
+ ->setName($orderValue->getName())
1454
+ ->setIsVirtual($orderValue->getIsVirtual())
1455
+ ->setProductId($orderValue->getProductId())
1456
+ ->setProductType($orderValue->getProductType())
1457
+ ->setSku($orderValue->getSku())
1458
+ ->setWeight($orderValue->getWeight())
1459
+ ->setPrice($orderValue->getPrice())
1460
+ ->setBasePrice($orderValue->getBasePrice())
1461
+ ->setOriginalPrice($orderValue->getOriginalPrice())
1462
+ ->setTaxAmount($orderValue->getTaxAmount())
1463
+ ->setTaxPercent($orderValue->getTaxPercent())
1464
+ ->setIsNominal($orderValue->getIsNominal())
1465
+ ->setRowTotal($orderValue->getRowTotal())
1466
+ ->setBaseRowTotal($orderValue->getBaseRowTotal())
1467
+ ->setBaseWeeeTaxAppliedAmount($orderValue->getBaseWeeeTaxAppliedAmount())
1468
+ ->setWeeeTaxAppliedAmount($orderValue->getWeeeTaxAppliedAmount())
1469
+ ->setWeeeTaxAppliedRowAmount($orderValue->getWeeeTaxAppliedRowAmount())
1470
+ ->setWeeeTaxApplied($orderValue->getWeeeTaxApplied())
1471
+ ->setWeeeTaxDisposition($orderValue->getWeeeTaxDisposition())
1472
+ ->setWeeeTaxRowDisposition($orderValue->getWeeeTaxRowDisposition())
1473
+ ->setBaseWeeeTaxDisposition($orderValue->getBaseWeeeTaxDisposition())
1474
+ ->setBaseWeeeTaxRowDisposition($orderValue->getBaseWeeeTaxRowDisposition());
1475
+ $orderNew->addItem($orderItem);
1476
+ }
1477
+
1478
+ return $orderNew;
1479
  }
1480
 
1481
  /**
1498
  * @param int $newOrderId
1499
  * @param int $profileId
1500
  */
1501
+ private function insertOrderId($newOrderId, $profileId)
1502
  {
1503
  if ($newOrderId && $profileId) {
1504
  $connection = Mage::getSingleton('core/resource')->getConnection('core_write');
1505
  $connection->beginTransaction();
1506
  $tablePrefix = Mage::getConfig()->getTablePrefix();
1507
+ $orderTable = $tablePrefix . 'sales_recurring_profile_order';
1508
  $fields = array();
1509
  $fields['profile_id'] = $profileId;
1510
  $fields['order_id'] = $newOrderId;
1520
  */
1521
  private function updateInventory($order)
1522
  {
1523
+ foreach ($order->getAllItems() as $orderValue) {
 
1524
  $itemsQtyOrdered = floor($orderValue->getQtyOrdered());
1525
  $productId = $orderValue->getProductId();
1526
  break;
1528
 
1529
  if ($productId) {
1530
  $stockObj = Mage::getModel('cataloginventory/stock_item')->loadByProduct($productId);
1531
+ $productQtyBefore = (int) $stockObj->getQty();
1532
  }
1533
 
1534
  if (isset($productQtyBefore) && $productQtyBefore > 0) {
1535
+ $productQtyAfter = (int) ($productQtyBefore - $itemsQtyOrdered);
 
1536
  $stockObj->setQty($productQtyAfter);
1537
  $stockObj->save();
1538
  }
1539
  }
1540
 
1541
+ /**
1542
+ * Show debug message
1543
+ *
1544
+ * @param string $text
1545
+ * @param bool $die
1546
+ */
1547
+ public function showDebug($text, $die = true) {
1548
+ if ($this->debug == true && !empty($text)) {
1549
+ echo $text;
1550
+ }
1551
+ if ($die) {
1552
+ die;
1553
+ }
1554
+ }
1555
+
1556
  }
app/code/community/Novalnet/Payment/Model/Config.php CHANGED
@@ -74,8 +74,6 @@ class Novalnet_Payment_Model_Config
74
  protected $_setonholdPayments = array('novalnetCc', 'novalnetSepa', 'novalnetInvoice');
75
  protected $_callbackAllowedCountry = array('AT', 'DE', 'CH');
76
  protected $_paymentOnholdStaus = array('91', '98', '99');
77
- protected $_novalnetEncodeParams = array('auth_code', 'product', 'tariff', 'test_mode',
78
- 'uniqid', 'amount');
79
  protected $_novalnetHashParams = array('auth_code', 'product', 'tariff', 'amount',
80
  'test_mode', 'uniqid');
81
  protected $_fraudCheckPayment = array('novalnetInvoice', 'novalnetSepa');
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');
app/code/community/Novalnet/Payment/Model/Factory.php CHANGED
@@ -36,7 +36,7 @@ class Novalnet_Payment_Model_Factory
36
  */
37
  public function captureResponseSave($amount, $loadTransStatus, $transStatus, $payment, $lastTranId)
38
  {
39
- if ($amount != '') {
40
  $loadTransStatus->setTransactionStatus(Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED)
41
  ->setAmount($amount)
42
  ->save();
@@ -66,7 +66,6 @@ class Novalnet_Payment_Model_Factory
66
  /**
67
  * Call Transation status refund and void
68
  *
69
- * @param Mage_Checkout_Model_Session $helper
70
  * @param int $getTid
71
  * @param varien_object $payment
72
  * @param int $amountAfterRefund
@@ -76,9 +75,10 @@ class Novalnet_Payment_Model_Factory
76
  * @param array $response
77
  * @return mixed
78
  */
79
- public function callTransactionStatus($helper, $getTid, $payment, $amountAfterRefund, $call, $refundTid
80
  = NULL, $customerId = NULL, $response = NULL)
81
  {
 
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');
@@ -137,12 +137,16 @@ class Novalnet_Payment_Model_Factory
137
  * @param varien_object $infoObject
138
  * @param int $orderId
139
  * @param int $amount
140
- * @param Mage_Checkout_Model_Session $helper
141
  * @param int $livemode
142
  */
143
- public function requestParams($request, $infoObject, $orderId, $amount, $helper, $livemode)
144
  {
 
145
  $billing = $infoObject->getBillingAddress();
 
 
 
 
146
  $request->setTestMode($livemode)
147
  ->setAmount($amount)
148
  ->setCurrency($infoObject->getBaseCurrencyCode())
@@ -155,13 +159,14 @@ class Novalnet_Payment_Model_Factory
155
  ->setCity($billing->getCity())
156
  ->setZip($billing->getPostcode())
157
  ->setCountry($billing->getCountry())
 
158
  ->setLanguage(strtoupper($helper->getDefaultLanguage()))
159
  ->setLang(strtoupper($helper->getDefaultLanguage()))
160
  ->setTel($billing->getTelephone())
161
  ->setFax($billing->getFax())
162
  ->setRemoteIp($helper->getRealIpAddr())
163
  ->setGender('u')
164
- ->setEmail($infoObject->getCustomerEmail())
165
  ->setOrderNo($orderId)
166
  ->setSystemUrl(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB))
167
  ->setSystemIp($helper->getServerAddr())
@@ -175,34 +180,30 @@ class Novalnet_Payment_Model_Factory
175
  * Set Request profile params
176
  *
177
  * @param varien_object $request
178
- * @param Novalnet_Payment_Helper_Data $helper
 
179
  */
180
- public function requestProfileParams($request, $helper)
181
  {
182
- $profileInfo = $helper->getProfileInfodata();
183
- $periodUnit = $profileInfo[1];
184
- $periodFrequency = $profileInfo[0];
185
- $regularAmount = $helper->getFormatedAmount($helper->getCheckoutSession()->getNnRegularAmount());
186
- $day = $helper->__('Day');
187
- $month = $helper->__('Month');
188
- $year = $helper->__('Year');
189
- $week = $helper->__('Week');
190
- $two = $helper->__('Two');
191
-
192
- $periodUnitFormat = array($day => "d", $month => "m", $year => "y");
193
 
194
- if ($periodUnit == $two || $periodUnit == 'Two') {
195
- $tariffPeriod2 = "14d";
196
- } else if ($periodUnit == $week || $periodUnit == 'Week') {
197
- $tariffPeriod2 = ($periodFrequency * 7) . "d";
198
  } else {
199
- $tariffPeriod2 = $periodFrequency . $periodUnitFormat[$periodUnit];
200
  }
201
 
202
- $request->setTariffPeriod($tariffPeriod2)
203
- ->setTariffPeriod2($tariffPeriod2)
 
 
204
  ->setTariffPeriod2Amount($regularAmount);
205
-
206
  }
207
 
208
  /**
@@ -307,20 +308,19 @@ class Novalnet_Payment_Model_Factory
307
  $refundIban = $getParamRequest->getParam('refund_payment_type_iban');
308
  $refundBic = $getParamRequest->getParam('refund_payment_type_bic');
309
  $refundRef = $getParamRequest->getParam('nn_refund_ref');
 
310
 
311
- if ($refundIban !='' && $refundBic == '') {
312
  Mage::throwException($helper->__('Please enter valid account details'));
313
- } else if ($refundIban =='' && $refundBic != '') {
314
- Mage::throwException($helper->__('Please enter valid account details'));
315
- } else if ($refundRef && !$helper->checkIsValid($refundRef)) {
316
  Mage::throwException($helper->__('Please enter valid account details'));
317
  }
318
 
319
- if ($refundRef != NULL) {
320
  $request->setRefundRef($refundRef);
321
  }
322
 
323
- if ($refundIban !='' && $refundBic != '') {
324
  $request->setAccountHolder($refundAccountholder)
325
  ->setIban($refundIban)
326
  ->setBic($refundBic);
@@ -360,12 +360,12 @@ class Novalnet_Payment_Model_Factory
360
  * @param string $currency
361
  * @param int $getTid
362
  * @param varien_object $payment
363
- * @param Novalnet_Payment_Helper_Data $helper
364
  * @param int $refundAmount
365
  * @return int
366
  */
367
- public function checkNovalnetCardAmount($currency, $getTid, $payment, $helper, $refundAmount)
368
  {
 
369
  $paymentObj = $payment->getMethodInstance();
370
  $statusCallSub = $paymentObj->doNovalnetStatusCall($getTid,$payment);
371
  $respnseCode = $statusCallSub->getStatus();
36
  */
37
  public function captureResponseSave($amount, $loadTransStatus, $transStatus, $payment, $lastTranId)
38
  {
39
+ if ($amount) {
40
  $loadTransStatus->setTransactionStatus(Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED)
41
  ->setAmount($amount)
42
  ->save();
66
  /**
67
  * Call Transation status refund and void
68
  *
 
69
  * @param int $getTid
70
  * @param varien_object $payment
71
  * @param int $amountAfterRefund
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');
137
  * @param varien_object $infoObject
138
  * @param int $orderId
139
  * @param int $amount
 
140
  * @param int $livemode
141
  */
142
+ public function requestParams($request, $infoObject, $orderId, $amount, $livemode)
143
  {
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())
159
  ->setCity($billing->getCity())
160
  ->setZip($billing->getPostcode())
161
  ->setCountry($billing->getCountry())
162
+ ->setCountryCode($billing->getCountry())
163
  ->setLanguage(strtoupper($helper->getDefaultLanguage()))
164
  ->setLang(strtoupper($helper->getDefaultLanguage()))
165
  ->setTel($billing->getTelephone())
166
  ->setFax($billing->getFax())
167
  ->setRemoteIp($helper->getRealIpAddr())
168
  ->setGender('u')
169
+ ->setEmail($email)
170
  ->setOrderNo($orderId)
171
  ->setSystemUrl(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB))
172
  ->setSystemIp($helper->getServerAddr())
180
  * Set Request profile params
181
  *
182
  * @param varien_object $request
183
+ * @param mixed $subsequentPeriod
184
+ * @return null
185
  */
186
+ public function requestProfileParams($request, $subsequentPeriod)
187
  {
188
+ $helper = Mage::helper('novalnet_payment');
189
+ $checkoutSession = $helper->getCheckoutSession();
190
+ $periodUnit = $checkoutSession->getNnPeriodUnit();
191
+ $periodFrequency = $checkoutSession->getNnPeriodFrequency();
192
+ $periodUnitFormat = array("day" => "d", "month" => "m", "year" => "y");
 
 
 
 
 
 
193
 
194
+ if ($periodUnit == "semi_month") {
195
+ $tariffPeriod = "14d";
196
+ } elseif ($periodUnit == "week") {
197
+ $tariffPeriod = ($periodFrequency * 7) . "d";
198
  } else {
199
+ $tariffPeriod = $periodFrequency . $periodUnitFormat[$periodUnit];
200
  }
201
 
202
+ $subsequentPeriod = $subsequentPeriod ? $subsequentPeriod : $tariffPeriod;
203
+ $regularAmount = $helper->getFormatedAmount($helper->getCheckoutSession()->getNnRegularAmount());
204
+ $request->setTariffPeriod($tariffPeriod)
205
+ ->setTariffPeriod2($subsequentPeriod)
206
  ->setTariffPeriod2Amount($regularAmount);
 
207
  }
208
 
209
  /**
308
  $refundIban = $getParamRequest->getParam('refund_payment_type_iban');
309
  $refundBic = $getParamRequest->getParam('refund_payment_type_bic');
310
  $refundRef = $getParamRequest->getParam('nn_refund_ref');
311
+ $refundType = $getParamRequest->getParam('refund_payment_type');
312
 
313
+ if ($refundType == 'SEPA' && (!$refundIban || !$refundBic)) {
314
  Mage::throwException($helper->__('Please enter valid account details'));
315
+ } elseif ($refundRef && !$helper->checkIsValid($refundRef)) {
 
 
316
  Mage::throwException($helper->__('Please enter valid account details'));
317
  }
318
 
319
+ if ($refundRef) {
320
  $request->setRefundRef($refundRef);
321
  }
322
 
323
+ if ($refundIban && $refundBic) {
324
  $request->setAccountHolder($refundAccountholder)
325
  ->setIban($refundIban)
326
  ->setBic($refundBic);
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();
app/code/community/Novalnet/Payment/Model/Novalnet/Source/Cctype.php CHANGED
@@ -1,4 +1,5 @@
1
  <?php
 
2
  /**
3
  * Magento
4
  *
@@ -23,11 +24,31 @@
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_Novalnet_Source_Cctype extends Mage_Payment_Model_Source_Cctype
27
  {
28
- public function getAllowedTypes()
 
29
  {
30
- return array('VI', 'MC', 'AE');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
31
  }
32
 
33
  }
1
  <?php
2
+
3
  /**
4
  * Magento
5
  *
24
  * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
+ class Novalnet_Payment_Model_Novalnet_Source_Cctype
28
  {
29
+
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
 
54
  }
app/code/community/Novalnet/Payment/Model/Observer.php CHANGED
@@ -86,9 +86,9 @@ class Novalnet_Payment_Model_Observer
86
  } else {
87
  $baseurl = Mage::getUrl('', array('_secure' => true));
88
  }
89
- $currentlUrl = Mage::helper('core/url')->getCurrentUrl();
90
  $block = $observer->getEvent()->getBlock();
91
- if ("head" == $block->getNameInLayout() && $currentlUrl != $baseurl) {
92
  foreach (Mage::helper('novalnet_payment/AssignData')->getFiles() as $file) {
93
  $block->addJs(Mage::helper('novalnet_payment/AssignData')->getJQueryPath($file));
94
  }
@@ -123,9 +123,29 @@ class Novalnet_Payment_Model_Observer
123
  $paymentObj = $payment->getMethodInstance();
124
  $paymentCode = $paymentObj->getCode();
125
  if (preg_match("/novalnet/i", $paymentCode)) {
126
- $setOrderAfterStatus = $paymentObj->_getConfigData('order_status',true,$storeId);
127
  $setOrderAfterStatus = $setOrderAfterStatus ? $setOrderAfterStatus : Mage_Sales_Model_Order::STATE_PROCESSING;
128
  $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $setOrderAfterStatus, Mage::helper('novalnet_payment')->__('Invoice Created Successfully'), true)->save();
129
  }
130
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
131
  }
86
  } else {
87
  $baseurl = Mage::getUrl('', array('_secure' => true));
88
  }
89
+ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
90
  $block = $observer->getEvent()->getBlock();
91
+ if ("head" == $block->getNameInLayout() && $currentUrl != $baseurl) {
92
  foreach (Mage::helper('novalnet_payment/AssignData')->getFiles() as $file) {
93
  $block->addJs(Mage::helper('novalnet_payment/AssignData')->getJQueryPath($file));
94
  }
123
  $paymentObj = $payment->getMethodInstance();
124
  $paymentCode = $paymentObj->getCode();
125
  if (preg_match("/novalnet/i", $paymentCode)) {
126
+ $setOrderAfterStatus = $paymentObj->getNovalnetConfig('order_status',true,$storeId);
127
  $setOrderAfterStatus = $setOrderAfterStatus ? $setOrderAfterStatus : Mage_Sales_Model_Order::STATE_PROCESSING;
128
  $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $setOrderAfterStatus, Mage::helper('novalnet_payment')->__('Invoice Created Successfully'), true)->save();
129
  }
130
  }
131
+
132
+ /**
133
+ * Get recurring product custom option values
134
+ *
135
+ * @param null
136
+ * @return null
137
+ */
138
+ public function getProfilePeriodValues(Varien_Event_Observer $observer) {
139
+ $quote = $observer->getEvent()->getCart()->getQuote();
140
+
141
+ foreach($quote->getAllItems() as $items) {
142
+ if($items->getProduct()->isRecurring()) {
143
+ $recurringProfile = $items->getProduct()->getRecurringProfile();
144
+ $profileInfo = array('period_unit' => $recurringProfile['period_unit'],
145
+ 'period_frequency' => $recurringProfile['period_frequency']);
146
+ Mage::getSingleton('checkout/session')->setNnPeriodUnit($recurringProfile['period_unit'])
147
+ ->setNnPeriodFrequency($recurringProfile['period_frequency']);
148
+ }
149
+ }
150
+ }
151
  }
app/code/community/Novalnet/Payment/Model/Payment/Method/Abstract.php CHANGED
@@ -26,21 +26,28 @@
26
  class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_Method_Abstract
27
  implements Mage_Payment_Model_Recurring_Profile_MethodInterface
28
  {
 
 
 
 
29
  protected $_isGateway = false;
30
- protected $_canAuthorize = true;
31
- protected $_canCapture = false;
32
  protected $_canCapturePartial = false;
33
  protected $_canRefund = true;
34
  protected $_canRefundInvoicePartial = true;
35
  protected $_canVoid = true;
36
- protected $_canUseInternal = true;
37
  protected $_canUseCheckout = true;
38
- protected $_canUseForMultishipping = false;
39
  protected $_canSaveCc = false;
40
  protected $_isInitializeNeeded = false;
 
 
 
 
 
 
 
41
  protected $_canCancelInvoice = false;
42
- protected $_methodType = '';
43
- protected $_redirectUrl = '';
44
  var $infoInstance;
45
  var $helper;
46
  var $dataHelper;
@@ -54,14 +61,30 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
54
  {
55
  //Novalnet Basic parameters
56
  $this->assignUtilities();
57
- $this->_vendorId = $this->_getConfigData('merchant_id', true);
58
- $this->_authcode = $this->_getConfigData('auth_code', true);
59
- $this->_productId = $this->_getConfigData('product_id', true);
60
- $this->_tariffId = $this->_getConfigData('tariff_id', true);
61
- $this->_subscribTariffId = $this->_getConfigData('subscrib_tariff_id', true);
62
- $this->_referrerId = trim($this->_getConfigData('referrer_id', true));
63
  //Manual Check Limits
64
- $this->_manualCheckLimit = (int) $this->_getConfigData('manual_checking_amount',true);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
65
  }
66
 
67
  /**
@@ -132,7 +155,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
132
  $helper = $this->helper;
133
  $recuring = $helper->getModelRecurring();
134
  $orderNo = $recuring->getRecurringOrderNo($profile);
135
- $order = $recuring->getOrderByIncrementId($orderNo);
136
  $payment = $order->getPayment();
137
  $paymentObj = $payment->getMethodInstance();
138
  $subsId = $payment->getAdditionalInformation('subs_id');
@@ -143,12 +166,6 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
143
  $storeId = $helper->getMagentoStoreId();
144
 
145
  if ($profile->getNewState() == 'canceled') {
146
- $httpClientConfig = array('maxredirects' => 0);
147
- if (((int) $this->_getConfigData('gateway_timeout',true)) > 0) {
148
- $httpClientConfig['timeout'] = (int) $this->_getConfigData('gateway_timeout',true);
149
- }
150
- $recurringCancelUrl = $helper->getPayportUrl('paygate');
151
- $client = new Varien_Http_Client($recurringCancelUrl, $httpClientConfig);
152
  $request = new Varien_Object();
153
  $paymentObj->assignOrderBasicParams($request, $payment, $storeId, $nominalItem);
154
  $request->setNnLang(strtoupper($helper->getDefaultLanguage()))
@@ -156,15 +173,16 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
156
  ->setCancelReason($getRequest['reason'])
157
  ->setTid($profile->getReferenceId());
158
  $buildNovalnetParam = http_build_query($request->getData());
159
- $response = $this->dataHelper->setRawCallRequest($buildNovalnetParam, $recurringCancelUrl);
 
160
  $data = unserialize($payment->getAdditionalData());
161
  $data['subsCancelReason'] = $getRequest['reason'];
162
  $payment->setAdditionalData(serialize($data))->save();
163
  $this->logNovalnetTransactionData($request, $response, $profile->getReferenceId(), $customerId, $storeId, $orderNo);
164
- if ($response->getStatus() != 100) {
165
  $this->showException($response->getStatusDesc(), false);
166
  }
167
- } else if ($profile->getNewState() == 'suspended' || $profile->getNewState() == 'active') {
168
  $this->infoRequestxml($profile->getNewState(), $profile, $subsId, $storeId, $customerId, $orderNo);
169
  }
170
  }
@@ -178,10 +196,10 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
178
  * @param int $storeId
179
  * @param int $customerId
180
  * @param int $orderNo
 
181
  */
182
  private function infoRequestxml($action, $profile, $subsId, $storeId, $customerId, $orderNo)
183
  {
184
- $helper = $this->helper;
185
  if ($action == 'suspended') {
186
  $pausePeriod = 1;
187
  $pausePeriodUnit = 'd';
@@ -195,6 +213,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
195
  $subsIdRequest = $subsId;
196
  $subsId = NULL;
197
  }
 
198
  $request = '<?xml version="1.0" encoding="UTF-8"?>';
199
  $request .= '<nnxml><info_request>';
200
  $request .= '<vendor_id>' . $this->_vendorId . '</vendor_id>';
@@ -208,14 +227,14 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
208
  $request .= '<suspend>' . $suspend . '</suspend>';
209
  $request .= '</info_request></nnxml>';
210
 
211
- $infoRequestUrl = $helper->getPayportUrl('infoport');
212
  $result = $this->setNovalnetRequestCall($request, $infoRequestUrl, 'XML');
213
  $xml = simplexml_load_string($request);
214
  $json = json_encode($xml);
215
  $array = json_decode($json, TRUE);
216
  $request = new Varien_Object($array);
217
  $this->logNovalnetTransactionData($request, $result, $profile->getReferenceId(), $customerId, $storeId, $orderNo, $subsId);
218
- if ($result->getStatus() != 100) {
219
  $statusDesc = $result->getStatusDesc();
220
  if ($action == 'suspended') {
221
  $statusDesc = $result->getSubscriptionPause();
@@ -234,22 +253,20 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
234
  public function getPeriodValues($profile) {
235
  $periodFrequency = $profile->getperiodFrequency();
236
  $periodUnit = $this->helper->__(ucfirst($profile->getperiodUnit()));
237
-
238
  $day = $this->helper->__('Day');
239
  $month = $this->helper->__('Month');
240
  $year = $this->helper->__('Year');
241
-
242
  $periodUnitFormat = array($day => "d", $month => "m", $year => "y");
243
 
244
  if ($periodUnit == 'Semi_month') {
245
- $tariffPeriod2 = array('periodFrequency' => '14', 'periodUnit' => 'd');
246
- } else if ($periodUnit == 'Week') {
247
- $tariffPeriod2 = array('periodFrequency' => ($periodFrequency * 7), 'periodUnit' => 'd');
248
  } else {
249
- $tariffPeriod2 = array('periodFrequency' => $periodFrequency, 'periodUnit' => $periodUnitFormat[$periodUnit]);
250
  }
251
 
252
- return $tariffPeriod2;
253
  }
254
 
255
  /**
@@ -260,36 +277,29 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
260
  */
261
  public function isAvailable($quote = null)
262
  {
263
- $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
264
  $getNnDisableTime = "getNnDisableTime" . ucfirst($this->_code); //Dynamic Getter based on payment methods
265
- $minOrderCount = $this->_getConfigData('orderscount');
266
- $userGroupId = $this->_getConfigData('user_group_excluded');
267
  $helper = $this->helper;
268
 
269
- if ($helper->checkOrdersCount($minOrderCount)) {
270
- return false;
271
- } else if (!$helper->checkCustomerAccess($userGroupId)) {
272
  return false;
273
- } else if ($helper->checkIsAdmin() && $this->_getConfigData('active_cc3d') == 1) {
274
  return false;
275
- } else if (!empty($quote) && $quote->hasNominalItems() && $helper->checkIsAdmin()) {
276
  return false;
277
- } else if (!empty($quote) && !$quote->hasNominalItems() && !$helper->isModuleActive($quote->getGrandTotal())) {
278
  return false;
279
- } else if (!empty($quote) && $quote->hasNominalItems() && (in_array($this->_code, $redirectPayment)
280
- || $this->_getConfigData('active_cc3d') == 1)) {
281
- return false;
282
- } else if (time() < $this->_getCheckout()->$getNnDisableTime()) {
283
  return false;
284
  }
285
 
286
  $this->paymentRefillValidate();
287
-
 
288
  return parent::isAvailable($quote);
289
  }
290
 
291
  /**
292
- * Assign Form Data in quote instance
293
  *
294
  * @param array $data
295
  * @return Mage_Payment_Model_Abstract Object
@@ -298,10 +308,12 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
298
  {
299
  $infoInstance = $this->_getInfoInstance();
300
  // unset form method session
301
-
302
- if ($this->_code != $this->_getCheckout()->getNnPaymentCode()) {
303
  $this->unsetFormMethodSession();
 
304
  }
 
305
  $this->dataHelper->assignNovalnetData($this->_code, $data, $infoInstance);
306
  return $this;
307
  }
@@ -309,6 +321,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
309
  /**
310
  * Validate payment method information object
311
  *
 
312
  * @return Mage_Payment_Model_Abstract
313
  */
314
  public function validate()
@@ -328,7 +341,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
328
 
329
  $callbackPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('fraudCheckPayment');
330
  if ((in_array($this->_code, $callbackPayment) || ($this->_code == 'novalnetCc'
331
- && $this->_getConfigData('active_cc3d') != 1))) {
332
  $this->_initiateCallbackProcess($this->_code, $infoInstance);
333
  }
334
 
@@ -341,6 +354,8 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
341
  /**
342
  * Payment form refill validation
343
  *
 
 
344
  */
345
  public function paymentRefillValidate()
346
  {
@@ -350,23 +365,22 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
350
  // Check the users (guest or login)
351
  $customerSession = $helper->getCustomerSession();
352
  $coreSession = $helper->getCoresession();
353
- if (!$customerSession->isLoggedIn() && $coreSession->getGuestloginvalue()
354
- == '') {
355
  $coreSession->setGuestloginvalue('1');
356
- } elseif ($coreSession->getGuestloginvalue() == '1' && $customerSession->isLoggedIn()) {
357
  $coreSession->setGuestloginvalue('0');
358
  $this->unsetFormMethodSession();
359
  $this->unsetMethodSession($prevPaymentCode);
360
  }
361
-
362
  $paymentCode = $checkoutSession->getQuote()->getPayment()->getMethod();
363
- if ($paymentCode && $paymentCode != $prevPaymentCode) {
364
  $this->unsetFormMethodSession();
365
  $this->unsetMethodSession($prevPaymentCode);
366
  }
367
 
368
- $paymentSucess = $this->_getConfigData('payment_last_success', true);
369
- if(!$helper->checkIsAdmin() && $customerSession->isLoggedIn() && $paymentCode =='' && $paymentSucess){
370
  $helper->getModelFactory()->getlastSuccesOrderMethod($customerSession->getId(),$checkoutSession);
371
  }
372
  }
@@ -374,6 +388,8 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
374
  /**
375
  * Assign the Novalnet direct payment methods request
376
  *
 
 
377
  */
378
  private function _sendRequestToNovalnet()
379
  {
@@ -382,7 +398,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
382
  $helper = $this->helper;
383
 
384
  if ($this->_code == Novalnet_Payment_Model_Config::NN_CC && !$helper->checkIsAdmin()
385
- && $this->_getConfigData('active_cc3d') == 1) {
386
  return false;
387
  }
388
 
@@ -404,9 +420,9 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
404
  $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
405
  $responseCodeApproved = Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED;
406
 
407
- if ($this->canCapture() && $this->_code && !in_array($this->_code, $redirectPayment)) {
408
- $orderId = $payment->getOrder()->getId();
409
  $helper = $this->helper;
 
410
  $amount = $helper->getAmountCollection($orderId, 1, NULL);
411
  $lastTranId = $helper->makeValidNumber($payment->getLastTransId());
412
  $loadTransStatus = $helper->loadTransactionStatus($lastTranId);
@@ -416,7 +432,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
416
  if ($response->getStatus() == $responseCodeApproved) {
417
  $data = unserialize($payment->getAdditionalData());
418
  $data['captureTid'] = $payment->getLastTransId();
419
- $data['CaptureCreateAt'] = Mage::getModel('core/date')->date('Y-m-d H:i:s');
420
  $payment->setAdditionalData(serialize($data))->save();
421
  $helper->getModelFactory()->captureResponseSave($amount, $loadTransStatus, $transStatus, $payment, $lastTranId);
422
  } else {
@@ -436,62 +452,45 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
436
  * @param varien_object $nominalItem
437
  * @return mixed
438
  */
439
- public function buildRequest($type = Novalnet_Payment_Model_Config::POST_NORMAL, $storeId
440
- = NULL, $amountValue = NULL, $nominalItem = NULL)
441
- {
442
- $payCode = ucfirst($this->_code);
443
- $helper = $this->helper;
444
- $callbackTelNo = "getNnCallbackTel" . $payCode;
445
- $callbackEmail = "getNnCallbackEmail" . $payCode;
446
- $referenceOne = trim(strip_tags(trim($this->_getConfigData('reference_one'))));
447
- $referenceTwo = trim(strip_tags(trim($this->_getConfigData('reference_two'))));
448
-
449
- $amount = $amountValue ? $amountValue : $helper->getFormatedAmount($this->_getAmount());
450
-
451
- if ($nominalItem) {
452
- $amount = $helper->getFormatedAmount($this->_getCheckout()->getNnRowAmount());
453
- }
454
-
455
  if ($type == Novalnet_Payment_Model_Config::POST_NORMAL || $type == Novalnet_Payment_Model_Config::POST_CALLBACK) {
456
- $infoObject = $this->_getInfoObject();
457
- $orderId = $this->_getOrderId();
458
  $request = new Varien_Object();
 
459
  $this->assignNnAuthData($request, $storeId);
460
- $livemode = (!$this->_getConfigData('live_mode')) ? 1 : 0;
 
 
 
461
  $modelFactory = $helper->getModelFactory();
462
- $modelFactory->requestParams($request, $infoObject, $orderId, $amount, $helper, $livemode);
 
 
 
463
  if ($this->_manualCheckLimit) {
464
  $this->_manualCheckValidate($request);
465
  }
466
- if ($this->_referrerId) {
467
- $request->setReferrerId($this->_referrerId);
468
- }
469
- if ($helper->checkIsAdmin()) {
470
- $adminUserId = Mage::getSingleton('admin/session')->getUser()->getUserId();
471
- $request->setInput2('admin_user')
472
- ->setInputval2($adminUserId);
473
- }
474
- if ($referenceOne) {
475
- $request->setInput3('reference1')
476
- ->setInputval3($referenceOne);
477
- }
478
- if ($referenceTwo) {
479
- $request->setInput4('reference2')
480
- ->setInputval4($referenceTwo);
481
- }
482
-
483
  // set payment type
484
  $request->setPaymentType($helper->getPaymentType($this->_code));
485
  // set Novalnet params
486
  $this->_setNovalnetParam($request, $this->_code);
487
  }
488
 
 
489
  if ($nominalItem) {
490
- $modelFactory->requestProfileParams($request, $helper);
 
491
  }
492
 
493
- //Callback Method
494
  if ($type == Novalnet_Payment_Model_Config::POST_CALLBACK) {
 
 
 
 
495
  if ($this->getConfigData('callback') == 1) { //PIN By Callback
496
  $request->setTel($this->getInfoInstance()->$callbackTelNo());
497
  $request->setPinByCallback(true);
@@ -507,6 +506,36 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
507
  return $request;
508
  }
509
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
510
  /**
511
  * Post request to gateway and return response
512
  *
@@ -520,17 +549,12 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
520
  $paymentKey = $helper->getPaymentId($this->_code);
521
  $quote = $this->_getCheckout()->getQuote();
522
  $payportUrl = $helper->getPayportUrl('paygate');
 
523
  if ($this->_validateBasicParams() && $helper->checkIsNumeric($paymentKey)
524
  && $paymentKey == $request->getKey() && $request->getAmount() && $helper->checkIsNumeric($request->getAmount())) {
525
  $response = $this->setNovalnetRequestCall($request->getData(), $payportUrl);
526
  parse_str($response->getBody(), $data);
527
  $result->addData($data);
528
- } else if ($this->_validateBasicParams() && $helper->checkIsNumeric($paymentKey)
529
- && $paymentKey == $request->getKey() && $quote->hasNominalItems()
530
- && $helper->checkIsNumeric($request->getAmount())) {
531
- $response = $this->setNovalnetRequestCall($request->getData(), $payportUrl);
532
- parse_str($response->getBody(), $data);
533
- $result->addData($data);
534
  } else {
535
  $this->showException($helper->__('Required parameter not valid') . '!', false);
536
  }
@@ -538,19 +562,18 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
538
  }
539
 
540
  /**
541
- * Assign Novalnet Authentication Data
542
  *
543
  * @param int $storeId
544
  * @param varien_object $request
 
545
  */
546
  public function assignNnAuthData(Varien_Object $request, $storeId = NULL)
547
  {
548
  //Reassign the Basic Params Based on store
549
- $quote = $this->_getCheckout()->getQuote();
550
- $this->_vendorId = $this->_getConfigData('merchant_id', true, $storeId);
551
- $this->_authcode = $this->_getConfigData('auth_code', true, $storeId);
552
- $nominalItem = $quote->hasNominalItems();
553
- if ($nominalItem) {
554
  $this->_tariffId = $this->_subscribTariffId;
555
  }
556
 
@@ -570,14 +593,15 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
570
  * @param varien_object $payment
571
  * @param int $storeId
572
  * @param varien_object $nominalItem
 
573
  */
574
- public function assignOrderBasicParams(Varien_Object $request, $payment, $storeId
575
- = NULL, $nominalItem = NULL)
576
- {
577
  $this->assignVendorConfig($payment);
578
  $getresponseData = unserialize($payment->getAdditionalData());
579
  // subscription tariff
580
- if ($nominalItem == 1) {
581
  $this->_tariffId = $this->_subscribTariffId;
582
  }
583
  $this->_vendorId = ($getresponseData['vendor']) ? $getresponseData['vendor']
@@ -614,15 +638,18 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
614
  $helper = $this->helper;
615
  $order = $payment->getOrder();
616
  $refundAmount = $helper->getFormatedAmount($amount);
617
-
618
  $customerId = $order->getCustomerId();
619
  $orderItems = $this->getPaymentAllItems($order);
620
  $nominalItem = $helper->checkNominalItem($orderItems);
621
  $data = unserialize($payment->getAdditionalData());
622
  $getTid = $helper->makeValidNumber($payment->getRefundTransactionId());
623
- if (($this->_code == Novalnet_Payment_Model_Config::NN_SEPA) || ($nominalItem && (in_array($this->_code, array(Novalnet_Payment_Model_Config::NN_PREPAYMENT,Novalnet_Payment_Model_Config::NN_INVOICE))))) {
 
 
 
 
624
  $getTid = $helper->makeValidNumber($payment->getLastTransId());
625
- if (isset($data['NnSepaParentTid']) && $data['NnSepaParentTid']) {
626
  $getTid = $data['NnSepaParentTid'];
627
  }
628
  }
@@ -632,32 +659,29 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
632
  }
633
 
634
  $cardAmount = NULL;
635
- $paymentObj = $order->getPayment()->getMethodInstance();
636
  $modelFactory = $helper->getModelFactory();
637
  if ($nominalItem) {
638
  $currency = Mage::app()->getLocale()->currency($this->_getInfoObject()->getBaseCurrencyCode())->getSymbol();
639
- $cardAmount = $modelFactory->checkNovalnetCardAmount($currency, $getTid,$payment, $helper, $refundAmount);
640
  }
641
 
642
  $response = $this->payportRequest($payment, 'refund', $refundAmount, $getTid,$cardAmount);
643
 
644
  if ($response->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
645
  $amountAfterRefund = ($order->getTotalPaid() - $order->getBaseTotalRefunded());
646
- $statusCode = $modelFactory->callTransactionStatus($helper, $getTid, $payment, $amountAfterRefund,1);
647
  $txnId = $response->getTid();
648
-
649
  $refundTid = !empty($txnId) ? $txnId : $payment->getLastTransId() . '-refund';
650
  $data['fullRefund'] = ((string)$this->_getAmount() == (string)$amount) ? true : false;
651
 
652
- if (in_array($this->_code, array(Novalnet_Payment_Model_Config::NN_INVOICE,
653
- Novalnet_Payment_Model_Config::NN_PREPAYMENT))) {
654
  $data['NnTid'] = $data['NnTid'] . '-refund';
655
  $refundTid = $data['NnTid'];
656
  }
657
 
658
  if ($refundTid) {
659
  $refAmount = Mage::helper('core')->currency($amount, true, false);
660
- $data = $modelFactory->refundTidData($refAmount,$data,$refundTid,$getTid);
661
  }
662
  // For SEPA payment after submitting to bank
663
  if ($statusCode->getStatus() && $this->_code == Novalnet_Payment_Model_Config::NN_SEPA) {
@@ -671,13 +695,13 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
671
 
672
  $modelFactory->refundValidateProcess($helper, $payment, $refundTid,$data);
673
  if ($txnId) {
674
- $modelFactory->callTransactionStatus($helper, $refundTid, $payment, $amountAfterRefund, 2, $refundTid, $customerId, $response);
675
  }
676
  } else {
677
  $this->showException($response->getStatusDesc(), false);
678
  }
679
  } else {
680
- $this->showException('Error in you refund request');
681
  }
682
  return $this;
683
  }
@@ -694,7 +718,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
694
  $orderId = $payment->getOrder()->getIncrementId();
695
  $helper = $this->helper;
696
  $callbackTrans = $helper->loadCallbackValue($orderId);
697
- $callbackValue = $callbackTrans && $callbackTrans->getCallbackAmount() != NULL
698
  ? $callbackTrans->getCallbackAmount() : '';
699
  $currency = Mage::app()->getLocale()->currency($this->_getInfoObject()->getBaseCurrencyCode())->getSymbol();
700
  if ($callbackValue < (string) $refundAmount) {
@@ -727,23 +751,23 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
727
  $response = $this->payportRequest($payment, 'void');
728
 
729
  if ($response->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
730
- $txnId = $response->getTid();
731
  $voidTid = !empty($txnId) ? $txnId : $payment->getLastTransId() . '-void';
732
  $data = unserialize($payment->getAdditionalData());
733
  $data['voidTid'] = $voidTid;
734
- $data['voidCreateAt'] = Mage::getModel('core/date')->date('Y-m-d H:i:s');
735
 
736
  if (in_array($this->_code, array(Novalnet_Payment_Model_Config::NN_INVOICE,
737
  Novalnet_Payment_Model_Config::NN_PREPAYMENT))) {
738
  $bankVoidTid = !empty($txnId) ? $txnId : $payment->getLastTransId();
739
- $data['NnNoteTID'] = $this->dataHelper->getReferenceDetails($bankVoidTid, $data);
740
  $payment->setAdditionalData(serialize($data));
741
  }
742
  $payment->setTransactionId($voidTid)
743
  ->setLastTransId($voidTid)
744
  ->setAdditionalData(serialize($data))
745
  ->save();
746
- $helper->getModelFactory()->callTransactionStatus($helper, $getTid, $payment, NULL,1);
747
  } else {
748
  $this->showException('Error in you void request');
749
  }
@@ -760,10 +784,9 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
760
  * @param float $cardAmount
761
  * @return mixed
762
  */
763
- private function payportRequest($payment, $requestType, $refundAmount = NULL, $refundTid
764
- = NULL, $cardAmount = NULL
765
- )
766
- {
767
  $request = new Varien_Object();
768
  $order = $payment->getOrder();
769
  $storeId = $order->getStoreId();
@@ -775,7 +798,6 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
775
  $responseCodeApproved = Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED;
776
  $this->assignOrderBasicParams($request, $payment, $storeId, $nominalItem);
777
  $modelFactory = $helper->getModelFactory();
778
- $grandTotal = $order->getGrandTotal();
779
  $totalRefunded = $order->getTotalRefunded();
780
  $lastTransId = $payment->getLastTransId();
781
 
@@ -784,31 +806,30 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
784
  if (!in_array(NULL, $request->toArray())) {
785
  $buildNovalnetParam = http_build_query($request->getData());
786
  $payportUrl = $helper->getPayportUrl('paygate');
787
- $response = $this->dataHelper->setRawCallRequest($buildNovalnetParam, $payportUrl);
788
  $this->logNovalnetTransactionData($request, $response, $payment->getLastTransId(), $customerId, $storeId);
789
  } else {
790
  $this->showException('Error in processing the transactions request');
791
  }
792
- $tId = $response->getTid();
793
-
794
- if ($response->getStatus() == $responseCodeApproved && $requestType == 'capture'
795
- && $nominalItem) {
796
- $modelFactory->saveProfileState($lastTransId);
797
- } else if ($response->getStatus() == $responseCodeApproved && $requestType == 'void'
798
- && $nominalItem) {
799
- $modelFactory->saveProfileCancelState($lastTransId);
800
- } else if ($response->getStatus() == $responseCodeApproved && $requestType == 'refund'
801
- && $nominalItem && $this->_code == Novalnet_Payment_Model_Config::NN_CC && $totalRefunded == $order->getTotalPaid()){
802
- $modelFactory->saveProfileCancelState($getTid);
803
- } else if ($response->getStatus() == $responseCodeApproved && $requestType == 'refund'
804
- && $nominalItem && $this->_code != Novalnet_Payment_Model_Config::NN_CC && ($grandTotal == $totalRefunded || $refundAmount == $cardAmount)) {
805
- $lastTransId = preg_match("/refund/i", $lastTransId) ? str_replace("-refund",'',$lastTransId) : $lastTransId;
806
- $modelFactory->saveProfileCancelState($lastTransId);
807
- $tId ? $modelFactory->saveProfileTID($lastTransId,$tId) : '';
808
- } else if ($response->getStatus() == $responseCodeApproved && $requestType == 'refund'
809
- && $nominalItem && $tId != '' && $this->_code != Novalnet_Payment_Model_Config::NN_CC) {
810
- $lastTransId = preg_match("/refund/i", $lastTransId) ? str_replace("-refund",'',$lastTransId) : $lastTransId;
811
- $modelFactory->saveProfileTID($lastTransId,$tId);
812
  }
813
  return $response;
814
  }
@@ -817,6 +838,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
817
  *
818
  * Get affiliate account/user detail
819
  *
 
820
  * @return mixed
821
  */
822
  public function loadAffAccDetail()
@@ -834,7 +856,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
834
  $helper->getCoresession()->setNnAffId($nnAffId);
835
  }
836
 
837
- if ($nnAffId != NULL) {
838
  $orderCollection = Mage::getModel('novalnet_payment/affiliate')->getCollection()
839
  ->addFieldToFilter('aff_id', $nnAffId)
840
  ->addFieldToSelect('aff_id')
@@ -848,10 +870,12 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
848
  if ($vendorId && $vendorAuthcode) {
849
  $this->_vendorId = $vendorId;
850
  $this->_authcode = $vendorAuthcode;
 
 
851
  }
852
  }
853
 
854
- $accessKey = (isset($affAccesskey) && $affAccesskey != NULL) ? $affAccesskey : $this->_getConfigData('password', true);
855
  return $accessKey;
856
  }
857
 
@@ -859,7 +883,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
859
  * Get Method Session
860
  *
861
  * @param string $paymentCode
862
- * @return Checkout session
863
  */
864
  private function _getMethodSession($paymentCode = NULL)
865
  {
@@ -875,7 +899,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
875
  * Unset method session
876
  *
877
  * @param string $paymentCode
878
- * @return method session
879
  */
880
  public function unsetMethodSession($paymentCode = NULL)
881
  {
@@ -892,7 +916,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
892
  * @param int $storeId
893
  * @return boolean | null
894
  */
895
- public function _getConfigData($field, $globalMode = false, $storeId = NULL)
896
  {
897
  $helper = $this->helper;
898
  $storeId = is_null($storeId) ? $helper->getMagentoStoreId() : $storeId;
@@ -915,6 +939,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
915
  *
916
  * @param varien_object $result
917
  * @param varien_object $payment
 
918
  */
919
  public function saveCancelledOrder($result, $payment)
920
  {
@@ -929,7 +954,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
929
  $serverResponse = ($result->getTestMode() && is_numeric($result->getTestMode()))
930
  ? $result->getTestMode()
931
  : $this->helper->getDecodedParam($result->getTestMode(), $authorizeKey);
932
- $shopMode = $this->_getConfigData('live_mode', true);
933
  $testMode = (((isset($serverResponse) && $serverResponse == 1) || (isset($shopMode)
934
  && $shopMode == 0)) ? 1 : 0 );
935
  $data['NnTestOrder'] = $testMode;
@@ -945,7 +970,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
945
  * Send order_no to server after the Completion of payment
946
  *
947
  * @param array $response
948
- * @return mixed
949
  */
950
  public function doNovalnetPostbackCall($response)
951
  {
@@ -985,13 +1010,13 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
985
  * Log Affiliate user details
986
  *
987
  * @param int $affId
 
988
  */
989
  public function doNovalnetAffUserInfoLog($affId)
990
  {
991
- $customerNo = $this->helper->getCustomerId();
992
  $affiliateUserInfo = $this->helper->getModelAffiliateuser();
993
  $affiliateUserInfo->setAffId($affId)
994
- ->setCustomerNo($customerNo)
995
  ->setAffOrderNo($this->_getOrderId())
996
  ->save();
997
  $this->helper->getCoresession()->unsNnAffId();
@@ -1007,25 +1032,25 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1007
  */
1008
  public function setNovalnetRequestCall($requestData, $requestUrl, $type = "")
1009
  {
1010
- if ($requestUrl == "") {
1011
  $this->showException('Server Request URL is Empty');
1012
  return;
1013
  }
1014
  $httpClientConfig = array('maxredirects' => 0);
1015
 
1016
- if ($this->_getConfigData('use_proxy',true)) {
1017
- $proxyHost = $this->_getConfigData('proxy_host',true);
1018
- $proxyPort = $this->_getConfigData('proxy_port',true);
1019
- if ($proxyHost && $proxyPort) {
1020
- $httpClientConfig['proxy'] = $proxyHost. ':' . $proxyPort;//http://proxy.shr.secureserver.net:3128',;
1021
- $httpClientConfig['httpproxytunnel'] = true;
1022
- $httpClientConfig['proxytype'] = CURLPROXY_HTTP;
1023
- $httpClientConfig['SSL_VERIFYHOST'] = false;
1024
- $httpClientConfig['SSL_VERIFYPEER'] = false;
1025
- }
1026
  }
1027
 
1028
- $gatewayTimeout = (int) $this->_getConfigData('gateway_timeout',true);
1029
  if ($gatewayTimeout > 0) {
1030
  $httpClientConfig['timeout'] = $gatewayTimeout;
1031
  }
@@ -1064,7 +1089,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1064
  if ($paymentCode) {
1065
  switch ($paymentCode) {
1066
  case Novalnet_Payment_Model_Config::NN_INVOICE:
1067
- $paymentDuration = trim($this->_getConfigData('payment_duration'));
1068
  $dueDate = $helper->setDueDate($paymentDuration);
1069
  if ($dueDate) {
1070
  $request->setDueDate($dueDate);
@@ -1090,15 +1115,11 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1090
  break;
1091
  case Novalnet_Payment_Model_Config::NN_CC:
1092
  $checkoutSession = $this->_getCheckout();
1093
- $request->setCcHolder()
1094
- ->setCcNo()
1095
- ->setCcExpMonth()
1096
- ->setCcExpYear()
1097
- ->setCcCvc2($checkoutSession->getNnCcCvc())
1098
  ->setPanHash($checkoutSession->getCcPanHash())
1099
  ->setUniqueId($checkoutSession->getCcUniqueId());
1100
  if ($this->_code == Novalnet_Payment_Model_Config::NN_CC && !$helper->checkIsAdmin()
1101
- && $this->_getConfigData('active_cc3d') == 1) {
1102
  $amount = $helper->getFormatedAmount($this->_getAmount());
1103
  $authorizeKey = $this->loadAffAccDetail();
1104
  $request->setCountryCode($request->getCountry())
@@ -1111,15 +1132,11 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1111
  case Novalnet_Payment_Model_Config::NN_SEPA:
1112
  $paymentInfo = $dataHelper->novalnetCardDetails('payment');
1113
  $request->setBankAccountHolder($paymentInfo['account_holder'])
1114
- ->setBankAccount()
1115
- ->setBankCode()
1116
- ->setBic()
1117
- ->setIban()
1118
  ->setSepaHash($dataHelper->novalnetCardDetails('result_sepa_hash'))
1119
  ->setSepaUniqueId($dataHelper->novalnetCardDetails('result_mandate_unique'))
1120
  ->setIbanBicConfirmed($dataHelper->novalnetCardDetails('nnsepa_iban_confirmed'));
1121
 
1122
- $paymentDuration = trim($this->_getConfigData('sepa_due_date'));
1123
  $dueDate = (!$paymentDuration) ? date('Y-m-d', strtotime('+7 days'))
1124
  : date('Y-m-d', strtotime('+' . $paymentDuration . ' days'));
1125
  $request->setSepaDueDate($dueDate);
@@ -1151,7 +1168,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1151
  $this->sepaPaymentRefill();
1152
  }
1153
  $payment->setStatus(self::STATUS_APPROVED)
1154
- ->setIsTransactionClosed(false) // Set transaction opend to make payment void
1155
  ->setAdditionalData(serialize($data))
1156
  ->save();
1157
  $order->setPayment($payment);
@@ -1163,8 +1180,8 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1163
  $this->logNovalnetStatusData($result, $txnId);
1164
 
1165
  $helper = $this->helper;
1166
- $captureMode = (version_compare($helper->getMagentoVersion(), '1.6', '<')) ? false
1167
- : true;
1168
 
1169
  // Capture the payment only if status is 100
1170
  if ($order->canInvoice() && $getTransactionStatus->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED
@@ -1173,7 +1190,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1173
  ->setIsTransactionClosed($captureMode) // Close the transaction
1174
  ->capture(null)
1175
  ->save();
1176
- $setOrderStatus = $this->_getConfigData('order_status') ? $this->_getConfigData('order_status')
1177
  : Mage_Sales_Model_Order::STATE_PROCESSING; // If after status is empty set default status
1178
  $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $setOrderStatus, $this->helper->__('Payment was successful.'), true);
1179
  }
@@ -1189,8 +1206,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1189
  if (!$this->isCallbackTypeCall()) {
1190
  $this->logNovalnetTransactionData($request, $result, $txnId, $this->helper->getCustomerId(), $this->helper->getMagentoStoreId());
1191
  }
1192
- $statusText = ($result->getStatusText()) ? $result->getStatusText()
1193
- : $helper->__('successful');
1194
  $helper->getCoresession()->addSuccess($statusText);
1195
  $error = false;
1196
  break;
@@ -1221,12 +1237,10 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1221
  $txnId = trim($result->getTid());
1222
  // set Novalnet Mode
1223
  $responseTestMode = $result->getTestMode();
1224
- $shopMode = $this->_getConfigData('live_mode');
1225
  $testMode = (((isset($responseTestMode) && $responseTestMode == 1) || (isset($shopMode)
1226
  && $shopMode == 0)) ? 1 : 0 );
1227
- $quote = $this->_getCheckout()->getQuote();
1228
- $nominalItem = $quote->hasNominalItems();
1229
- if ($nominalItem) {
1230
  $this->_tariffId = $this->_subscribTariffId;
1231
  }
1232
 
@@ -1247,7 +1261,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1247
  $data['NnDueDate'] = $dataHelper->getDueDate($result);
1248
  $data['NnNote'] = $dataHelper->getNote($result);
1249
  $data['NnNoteAmount'] = $dataHelper->getBankDetailsAmount($result->getAmount());
1250
- $data['NnNoteTID'] = $dataHelper->getReferenceDetails($txnId,$data);
1251
  }
1252
  return $data;
1253
  }
@@ -1255,6 +1269,8 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1255
  /**
1256
  * Log sepa payment refill information
1257
  *
 
 
1258
  */
1259
  public function sepaPaymentRefill()
1260
  {
@@ -1262,15 +1278,14 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1262
  $customerLogin = $helper->getCustomerSession()->isLoggedIn();
1263
 
1264
  if ($customerLogin && !$helper->checkIsAdmin()) {
1265
- $checkout = $this->_getCheckout();
1266
  $customerId = $helper->getCustomerId();
1267
  $modNovalSepaReFillCollection = $helper->getModelSepaRefill()->getCollection();
1268
  $modNovalSepaReFillCollection->addFieldToFilter('customer_id', $customerId);
1269
- $countRefill = count($modNovalSepaReFillCollection);
1270
- $modNovalSepaRefill = $countRefill ? $helper->getModelSepaRefill()->load($customerId, 'customer_id')
1271
  : $helper->getModelSepaRefill();
1272
  $modNovalSepaRefill->setCustomerId($customerId)
1273
- ->setPanHash($checkout->getSepaHash())
1274
  ->setSepaDatetime($helper->getCurrentDateTime())
1275
  ->save();
1276
  }
@@ -1279,21 +1294,27 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1279
  /**
1280
  * Unset Form method session
1281
  *
 
 
1282
  */
1283
  public function unsetFormMethodSession()
1284
  {
1285
  $this->_getCheckout()->unsNnCcCvc()
1286
  ->unsCcPanHash()
1287
- ->unsCcUniqueId();
1288
- $this->_getCheckout()->unsSepaHash()
1289
- ->unsSepaUniqueId();
1290
- $this->_getCheckout()->unsRefilldatavalues()
1291
- ->unsNnPaymentCode();
 
 
1292
  }
1293
 
1294
  /**
1295
  * Unset payment method session
1296
  *
 
 
1297
  */
1298
  public function unsetPaymentReqResData()
1299
  {
@@ -1321,7 +1342,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1321
  $requestType = ($reqType == Novalnet_Payment_Model_Config::TRANS_STATUS)
1322
  ? Novalnet_Payment_Model_Config::TRANS_STATUS : $reqType;
1323
 
1324
- if ($payment != NULL) {
1325
  $this->assignVendorConfig($payment);
1326
  }
1327
  // Callback request data re-assign
@@ -1355,14 +1376,12 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1355
  * Set the Order basic configuration
1356
  *
1357
  * @param string $payment
 
1358
  */
1359
  public function assignVendorConfig($payment = NULL)
1360
  {
1361
  // Reassign the Basic Params Based on store
1362
- $getresponseData = NULL;
1363
- if ($payment) {
1364
- $getresponseData = unserialize($payment->getAdditionalData());
1365
- }
1366
  $this->_vendorId = ($getresponseData['vendor']) ? $getresponseData['vendor']
1367
  : $this->_vendorId;
1368
  $this->_authcode = ($getresponseData['auth_code']) ? $getresponseData['auth_code']
@@ -1376,6 +1395,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1376
  /**
1377
  * Get checkout session
1378
  *
 
1379
  * @return Mage_Sales_Model_Order
1380
  */
1381
  protected function _getCheckout()
@@ -1390,6 +1410,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1390
  /**
1391
  * validate Novalnet params to proceed checkout
1392
  *
 
1393
  * @return boolean
1394
  */
1395
  public function validateNovalnetParams()
@@ -1422,12 +1443,11 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1422
  private function _manualCheckValidate($request)
1423
  {
1424
  $checkoutSession = $this->_getCheckout();
1425
- $quote = $checkoutSession->getQuote();
1426
- $setonholdPayments = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('setonholdPayments');
1427
- $getAmount = $quote->hasNominalItems() ? $checkoutSession->getNnRowAmount()
1428
- : $this->_getAmount();
1429
- $amount = $this->helper->getFormatedAmount($getAmount);
1430
- if (in_array($this->_code,$setonholdPayments) && $this->_manualCheckLimit <= $amount) {
1431
  $request->setOnHold(1);
1432
  }
1433
 
@@ -1437,44 +1457,43 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1437
  /**
1438
  * Validate Novalnet basic params
1439
  *
 
1440
  * @return boolean
1441
  */
1442
  private function _validateBasicParams()
1443
  {
1444
- $quote = $this->_getCheckout()->getQuote();
1445
  $helper = $this->helper;
1446
 
1447
  if ($helper->checkIsNumeric($this->_vendorId) && $this->_authcode && $helper->checkIsNumeric($this->_productId)
1448
- && $helper->checkIsNumeric($this->_tariffId) && $quote->hasNominalItems()
1449
- && $this->_subscribTariffId) {
1450
- return true;
1451
- } else if (!$quote->hasNominalItems() && $helper->checkIsNumeric($this->_vendorId)
1452
- && $this->_authcode && $helper->checkIsNumeric($this->_productId)
1453
  && $helper->checkIsNumeric($this->_tariffId)) {
 
 
 
1454
  return true;
1455
  }
 
1456
  return false;
1457
  }
1458
 
1459
  /**
1460
  * Check whether callback option is enabled
1461
  *
 
1462
  * @return boolean
1463
  */
1464
  public function isCallbackTypeCall()
1465
  {
1466
  $callbackTid = "hasNnCallbackTid" . ucfirst($this->_code);
1467
  $total = $this->helper->getFormatedAmount($this->_getAmount());
1468
- $callBackMinimum = (int) $this->_getConfigData('callback_minimum_amount');
1469
  $countryCode = strtoupper($this->_getInfoObject()->getBillingAddress()->getCountryId());
1470
- $checkOut = $this->_getCheckout();
1471
- $quote = $checkOut->getQuote();
1472
  $helper = $this->helper;
1473
- if ($quote->hasNominalItems()) {
1474
- $total = $helper->getFormatedAmount($checkOut->getNnRowAmount());
1475
  }
1476
 
1477
- return ($helper->getCheckoutSession()->$callbackTid() || ($this->_getConfigData('callback')
1478
  && ($callBackMinimum ? $total >= $callBackMinimum : true) && ($helper->isCallbackTypeAllowed($countryCode))));
1479
  }
1480
 
@@ -1483,79 +1502,68 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1483
  *
1484
  * @param string $paymentCode
1485
  * @param mixed $$infoInstance
 
1486
  */
1487
- private function _initiateCallbackProcess($paymentCode, $infoInstance)
1488
  {
1489
  $isCallbackTypeCall = $this->isCallbackTypeCall();
 
1490
  $isPlaceOrder = $this->_isPlaceOrder();
1491
 
1492
- $payCode = ucfirst($paymentCode);
1493
- $callbackTid = "getNnCallbackTid" . $payCode;
1494
- $callbackOrderNo = "getNnCallbackOrderNo" . $payCode;
1495
- $callbackPin = "getNnCallbackPin" . $payCode;
1496
- $callbackNewPin = "getNnNewCallbackPin" . $payCode;
1497
- $setcallbackPin = "setNnCallbackPin" . $payCode;
1498
 
1499
- if (!$isPlaceOrder && $isCallbackTypeCall && $this->_getIncrementId() != $this->_getMethodSession()->$callbackOrderNo()) {
1500
  $this->unsetMethodSession();
1501
  }
1502
 
1503
- $methodSession = $this->_getMethodSession();
1504
  // Validate callback session
1505
- $this->_validateCallbackSession($payCode);
1506
 
1507
  if ($isCallbackTypeCall && $infoInstance->getCallbackPinValidationFlag()
1508
  && $methodSession->$callbackTid()) {
1509
  $nnCallbackPin = $infoInstance->$callbackPin();
1510
- if (!$infoInstance->$callbackNewPin() && (!$this->helper->checkIsValid($nnCallbackPin)
1511
- || empty($nnCallbackPin))) {
 
1512
  $this->showException('The PIN you entered is incorrect');
1513
  }
1514
  }
1515
- if ($isCallbackTypeCall && !$isPlaceOrder && $this->_getConfigData('callback')
1516
- != 3) {
1517
- if ($methodSession->$callbackTid()) {
1518
- if ($infoInstance->$callbackNewPin()) {
1519
- $this->_regenerateCallbackPin($methodSession);
1520
- } else {
1521
- $methodSession->$setcallbackPin($infoInstance->$callbackPin());
1522
- }
1523
- } else {
1524
- $this->_generateCallback($payCode);
1525
- }
1526
- } elseif ($isCallbackTypeCall && !$isPlaceOrder && $this->_getConfigData('callback')
1527
- == 3) {
1528
 
1529
- if (!$methodSession->$callbackTid()) {
1530
- $this->_generateCallback($payCode);
 
 
 
 
1531
  }
1532
  }
 
1533
  if ($isPlaceOrder) {
1534
- $this->validateCallbackProcess($payCode);
1535
  }
1536
  }
1537
 
1538
  /**
1539
  * Validate order amount is getting changed after callback initiation
1540
  *
1541
- * @param string $payCode
1542
- * @param mixed $methodSession
1543
- * throw Mage Exception
1544
  */
1545
- private function _validateCallbackSession($payCode)
1546
  {
1547
- $callbackTid = "hasNnCallbackTid" . $payCode;
1548
- $getNnDisableTime = "getNnDisableTime" . $payCode;
1549
- $quote = $this->_getCheckout()->getQuote();
1550
  $checkoutSession = $this->_getCheckout();
1551
  $methodSession = $this->_getMethodSession();
1552
  $helper = $this->helper;
1553
-
1554
- if ($quote->hasNominalItems()) {
1555
- $amount = $helper->getFormatedAmount(Mage::getSingleton('checkout/session')->getNnRowAmount());
1556
- } else {
1557
- $amount = $helper->getFormatedAmount($this->_getAmount());
1558
- }
1559
 
1560
  if ($methodSession->$callbackTid()) {
1561
  if ($checkoutSession->$getNnDisableTime() && time() > $checkoutSession->$getNnDisableTime()) {
@@ -1572,6 +1580,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1572
  /**
1573
  * Get increment id for callback process
1574
  *
 
1575
  * @return int
1576
  */
1577
  private function _getIncrementId()
@@ -1592,39 +1601,41 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1592
  /**
1593
  * Make callback request and validate response
1594
  *
1595
- * @param string $payCode
 
1596
  */
1597
- private function _generateCallback($payCode)
1598
  {
1599
- $callbackTid = "setNnCallbackTid" . $payCode;
1600
- $callbackOrderNo = "setNnCallbackOrderNo" . $payCode;
1601
- $quote = $this->_getCheckout()->getQuote();
1602
- $nominalItem = $quote->hasNominalItems();
 
1603
  if ($nominalItem) {
1604
  $request = $this->buildRequest(Novalnet_Payment_Model_Config::POST_CALLBACK, NULL, NULL, $nominalItem);
1605
  $response = $this->postRequest($request);
1606
- $this->_getCheckout()->setNominalRequest($request)
1607
- ->setNominalResponse($response);
1608
  } else {
1609
  $request = $this->buildRequest(Novalnet_Payment_Model_Config::POST_CALLBACK);
1610
  $response = $this->postRequest($request);
1611
- $this->_getCheckout()->setPaymentReqData($request)
1612
- ->setPaymentResData($response);
1613
  $this->logNovalnetTransactionData($request, $response, $response->getTid());
1614
  }
1615
 
1616
- $this->_getCheckout()->setNnCallbackReqData($request);
1617
  if ($response->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
1618
  $this->_getMethodSession()
1619
- ->$callbackTid(trim($response->getTid()))
1620
- ->setNnTestMode(trim($response->getTestMode()))
1621
- ->setNnCallbackTidTimeStamp(time())
1622
- ->setOrderAmount($request->getAmount())
1623
- ->setNnCallbackSuccessState(true)
1624
- ->$callbackOrderNo(trim($response->getOrderNo()));
1625
- if ($this->_getConfigData('callback') == 3) {
1626
  $text = $this->helper->__('Please reply to the e-mail');
1627
- } else if($this->_getConfigData('callback') == 2) {
1628
  $text = $this->helper->__('You will shortly receive an SMS containing your transaction PIN to complete the payment');
1629
  } else {
1630
  $text = $this->helper->__('You will shortly receive a transaction PIN through phone call to complete the payment');
@@ -1639,7 +1650,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1639
  * Regenerate new pin for callback process
1640
  *
1641
  * @param mixed $methodSession
1642
- * throw Mage Exception
1643
  */
1644
  private function _regenerateCallbackPin($methodSession)
1645
  {
@@ -1658,18 +1669,19 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1658
  /**
1659
  * Validate callback response
1660
  *
1661
- * @param string $payCode
1662
  * @param mixed $methodSession
 
1663
  */
1664
- public function validateCallbackProcess($payCode)
1665
  {
1666
- $callbackTid = "getNnCallbackTid" . $payCode;
1667
- $callbackPin = "getNnCallbackPin" . $payCode;
1668
- $setNnDisableTime = "setNnDisableTime" . $payCode;
1669
  $methodSession = $this->_getMethodSession();
1670
 
1671
  if ($methodSession->getNnCallbackSuccessState()) {
1672
- if ($this->_getConfigData('callback') == 3) {
1673
  $type = Novalnet_Payment_Model_Config::REPLY_EMAIL_STATUS;
1674
  $extraOption = '';
1675
  } else {
@@ -1705,11 +1717,11 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1705
  * @param int $storeId
1706
  * @param int $orderNo
1707
  * @param int $subsId
 
1708
  */
1709
- public function logNovalnetTransactionData($request = NULL, $response = NULL, $txnId, $customerId
1710
- = NULL, $storeId = NULL, $orderNo = NULL, $subsId = NULL
1711
- )
1712
- {
1713
  $this->dataHelper->doRemoveSensitiveData($request, $this->_code);
1714
  $helper = $this->helper;
1715
  $shopUrl = ($response->getMemburl()) ? $response->getMemburl() : $helper->getCurrentSiteUrl();
@@ -1743,11 +1755,11 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1743
  * @param int $customerId
1744
  * @param int $storeId
1745
  * @param float $amount
 
1746
  */
1747
- public function logNovalnetStatusData($response, $txnId, $customerId = NULL, $storeId
1748
- = NULL, $amount = NULL
1749
- )
1750
- {
1751
  $helper = $this->helper;
1752
  $shopUrl = ($response->getMemburl()) ? $response->getMemburl() : $helper->getCurrentSiteUrl();
1753
  $customerId = ($customerId) ? $customerId : $helper->getCustomerId();
@@ -1773,6 +1785,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1773
  *
1774
  * @param varien_object $response
1775
  * @param int $orderId
 
1776
  */
1777
  public function doTransactionOrderLog($response, $orderId)
1778
  {
@@ -1790,6 +1803,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1790
  /**
1791
  * Get current infoinstance
1792
  *
 
1793
  * @return Mage_Payment_Model_Method_Abstract
1794
  */
1795
  private function _getInfoInstance()
@@ -1803,21 +1817,19 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1803
  /**
1804
  * Get current order/quote object
1805
  *
 
1806
  * @return Mage_Payment_Model_Method_Abstract
1807
  */
1808
  private function _getInfoObject()
1809
  {
1810
  $info = $this->_getInfoInstance();
1811
- if ($this->_isPlaceOrder()) {
1812
- return $info->getOrder();
1813
- } else {
1814
- return $info->getQuote();
1815
- }
1816
  }
1817
 
1818
  /**
1819
  * Whether current operation is order placement
1820
  *
 
1821
  * @return boolean
1822
  */
1823
  private function _isPlaceOrder()
@@ -1833,51 +1845,46 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1833
  /**
1834
  * Get grand total amount
1835
  *
 
1836
  * @return double
1837
  */
1838
  private function _getAmount()
1839
  {
1840
  $info = $this->_getInfoInstance();
1841
- if ($this->_isPlaceOrder()) {
1842
- return (double) $info->getOrder()->getBaseGrandTotal();
1843
- } else {
1844
- return (double) $info->getQuote()->getBaseGrandTotal();
1845
- }
1846
  }
1847
 
1848
  /**
1849
  * Order increment ID getter (either real from order or a reserved from quote)
1850
  *
 
1851
  * @return int
1852
  */
1853
  private function _getOrderId()
1854
  {
1855
  $info = $this->_getInfoInstance();
1856
- if ($this->_isPlaceOrder()) {
1857
- return $info->getOrder()->getIncrementId();
1858
- } else {
1859
- return $this->_getIncrementId();
1860
- }
1861
  }
1862
 
1863
  /**
1864
  * Get payment data for current order
1865
  *
1866
- * @return Mage_Payment_Model_Method_Abstract
 
1867
  */
1868
  private function _getNnPaymentData()
1869
  {
1870
  $info = $this->_getInfoInstance();
1871
- if ($this->_isPlaceOrder()) {
1872
- return $info->getOrder()->getPayment();
1873
- } else {
1874
- return $info;
1875
- }
1876
  }
1877
 
1878
  /**
1879
  * Retrieve model helper
1880
  *
 
1881
  * @return Novalnet_Payment_Helper_Data
1882
  */
1883
  protected function _getHelper()
@@ -1888,6 +1895,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1888
  /**
1889
  * Retrieve Assign data helper
1890
  *
 
1891
  * @return Novalnet_Payment_Helper_AssignData
1892
  */
1893
  protected function _getDataHelper()
@@ -1899,7 +1907,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1899
  * Show expection
1900
  *
1901
  * @param string $text
1902
- * @param $lang
1903
  * @return Mage::throwException
1904
  */
1905
  public function showException($text, $lang = true)
@@ -1913,6 +1921,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1913
  /**
1914
  * Assign helper utilities needed for the payment process
1915
  *
 
1916
  * @return Novalnet helper
1917
  */
1918
  public function assignUtilities()
@@ -1928,6 +1937,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1928
  /**
1929
  * Get Billing Address
1930
  *
 
1931
  * @return string
1932
  */
1933
  private function _getBillingAddress()
@@ -1955,6 +1965,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1955
  /**
1956
  * Get redirect URL
1957
  *
 
1958
  * @return string
1959
  */
1960
  public function getOrderPlaceRedirectUrl()
@@ -1962,7 +1973,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1962
  $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
1963
  $helper = $this->helper;
1964
  if ((in_array($this->_code, $redirectPayment)) || ($this->_code == Novalnet_Payment_Model_Config::NN_CC
1965
- && !$helper->checkIsAdmin() && $this->_getConfigData('active_cc3d')
1966
  == 1)) {
1967
  $actionUrl = $helper->getUrl(Novalnet_Payment_Model_Config::GATEWAY_REDIRECT_URL);
1968
  } else {
26
  class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_Method_Abstract
27
  implements Mage_Payment_Model_Recurring_Profile_MethodInterface
28
  {
29
+ /**
30
+ * Payment Method features
31
+ * @var bool
32
+ */
33
  protected $_isGateway = false;
34
+ protected $_canOrder = false;
 
35
  protected $_canCapturePartial = false;
36
  protected $_canRefund = true;
37
  protected $_canRefundInvoicePartial = true;
38
  protected $_canVoid = true;
 
39
  protected $_canUseCheckout = true;
 
40
  protected $_canSaveCc = false;
41
  protected $_isInitializeNeeded = false;
42
+ protected $_canManageRecurringProfiles = true;
43
+
44
+ /**
45
+ * TODO: whether a captured transaction may be voided by this gateway
46
+ * This may happen when amount is captured, but not settled
47
+ * @var bool
48
+ */
49
  protected $_canCancelInvoice = false;
50
+
 
51
  var $infoInstance;
52
  var $helper;
53
  var $dataHelper;
61
  {
62
  //Novalnet Basic parameters
63
  $this->assignUtilities();
64
+ $this->_vendorId = $this->getNovalnetConfig('merchant_id', true);
65
+ $this->_authcode = $this->getNovalnetConfig('auth_code', true);
66
+ $this->_productId = $this->getNovalnetConfig('product_id', true);
67
+ $this->_tariffId = $this->getNovalnetConfig('tariff_id', true);
68
+ $this->_subscribTariffId = $this->getNovalnetConfig('subscrib_tariff_id', true);
69
+ $this->_referrerId = trim($this->getNovalnetConfig('referrer_id', true));
70
  //Manual Check Limits
71
+ $this->_manualCheckLimit = (int) $this->getNovalnetConfig('manual_checking_amount',true);
72
+ }
73
+
74
+ /**
75
+ * Hide the payment method in checkout (without recurring products)
76
+ *
77
+ * @return boolean
78
+ */
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;
88
  }
89
 
90
  /**
155
  $helper = $this->helper;
156
  $recuring = $helper->getModelRecurring();
157
  $orderNo = $recuring->getRecurringOrderNo($profile);
158
+ $order = $recuring->getOrderByIncrementId($orderNo[0]);
159
  $payment = $order->getPayment();
160
  $paymentObj = $payment->getMethodInstance();
161
  $subsId = $payment->getAdditionalInformation('subs_id');
166
  $storeId = $helper->getMagentoStoreId();
167
 
168
  if ($profile->getNewState() == 'canceled') {
 
 
 
 
 
 
169
  $request = new Varien_Object();
170
  $paymentObj->assignOrderBasicParams($request, $payment, $storeId, $nominalItem);
171
  $request->setNnLang(strtoupper($helper->getDefaultLanguage()))
173
  ->setCancelReason($getRequest['reason'])
174
  ->setTid($profile->getReferenceId());
175
  $buildNovalnetParam = http_build_query($request->getData());
176
+ $recurringCancelUrl = $helper->getPayportUrl('paygate');
177
+ $response = $this->dataHelper->setRawCallRequest($buildNovalnetParam, $recurringCancelUrl, $paymentObj);
178
  $data = unserialize($payment->getAdditionalData());
179
  $data['subsCancelReason'] = $getRequest['reason'];
180
  $payment->setAdditionalData(serialize($data))->save();
181
  $this->logNovalnetTransactionData($request, $response, $profile->getReferenceId(), $customerId, $storeId, $orderNo);
182
+ if ($response->getStatus() != Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
183
  $this->showException($response->getStatusDesc(), false);
184
  }
185
+ } elseif ($profile->getNewState() == 'suspended' || $profile->getNewState() == 'active') {
186
  $this->infoRequestxml($profile->getNewState(), $profile, $subsId, $storeId, $customerId, $orderNo);
187
  }
188
  }
196
  * @param int $storeId
197
  * @param int $customerId
198
  * @param int $orderNo
199
+ * @return null
200
  */
201
  private function infoRequestxml($action, $profile, $subsId, $storeId, $customerId, $orderNo)
202
  {
 
203
  if ($action == 'suspended') {
204
  $pausePeriod = 1;
205
  $pausePeriodUnit = 'd';
213
  $subsIdRequest = $subsId;
214
  $subsId = NULL;
215
  }
216
+
217
  $request = '<?xml version="1.0" encoding="UTF-8"?>';
218
  $request .= '<nnxml><info_request>';
219
  $request .= '<vendor_id>' . $this->_vendorId . '</vendor_id>';
227
  $request .= '<suspend>' . $suspend . '</suspend>';
228
  $request .= '</info_request></nnxml>';
229
 
230
+ $infoRequestUrl = $this->helper->getPayportUrl('infoport');
231
  $result = $this->setNovalnetRequestCall($request, $infoRequestUrl, 'XML');
232
  $xml = simplexml_load_string($request);
233
  $json = json_encode($xml);
234
  $array = json_decode($json, TRUE);
235
  $request = new Varien_Object($array);
236
  $this->logNovalnetTransactionData($request, $result, $profile->getReferenceId(), $customerId, $storeId, $orderNo, $subsId);
237
+ if ($result->getStatus() != Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
238
  $statusDesc = $result->getStatusDesc();
239
  if ($action == 'suspended') {
240
  $statusDesc = $result->getSubscriptionPause();
253
  public function getPeriodValues($profile) {
254
  $periodFrequency = $profile->getperiodFrequency();
255
  $periodUnit = $this->helper->__(ucfirst($profile->getperiodUnit()));
 
256
  $day = $this->helper->__('Day');
257
  $month = $this->helper->__('Month');
258
  $year = $this->helper->__('Year');
 
259
  $periodUnitFormat = array($day => "d", $month => "m", $year => "y");
260
 
261
  if ($periodUnit == 'Semi_month') {
262
+ $tariffPeriod = array('periodFrequency' => '14', 'periodUnit' => 'd');
263
+ } elseif ($periodUnit == 'Week') {
264
+ $tariffPeriod = array('periodFrequency' => ($periodFrequency * 7), 'periodUnit' => 'd');
265
  } else {
266
+ $tariffPeriod = array('periodFrequency' => $periodFrequency, 'periodUnit' => $periodUnitFormat[$periodUnit]);
267
  }
268
 
269
+ return $tariffPeriod;
270
  }
271
 
272
  /**
277
  */
278
  public function isAvailable($quote = null)
279
  {
 
280
  $getNnDisableTime = "getNnDisableTime" . ucfirst($this->_code); //Dynamic Getter based on payment methods
 
 
281
  $helper = $this->helper;
282
 
283
+ if ($helper->checkOrdersCount($this->getNovalnetConfig('orderscount'))) {
 
 
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;
293
  }
294
 
295
  $this->paymentRefillValidate();
296
+ // Assign affiliate account information if available.
297
+ $this->loadAffAccDetail();
298
  return parent::isAvailable($quote);
299
  }
300
 
301
  /**
302
+ * Assign form data in quote instance
303
  *
304
  * @param array $data
305
  * @return Mage_Payment_Model_Abstract Object
308
  {
309
  $infoInstance = $this->_getInfoInstance();
310
  // unset form method session
311
+ $prevPaymentCode = $this->_getCheckout()->getNnPaymentCode();
312
+ if ($prevPaymentCode && $this->_code != $prevPaymentCode) {
313
  $this->unsetFormMethodSession();
314
+ $this->unsetMethodSession($prevPaymentCode);
315
  }
316
+
317
  $this->dataHelper->assignNovalnetData($this->_code, $data, $infoInstance);
318
  return $this;
319
  }
321
  /**
322
  * Validate payment method information object
323
  *
324
+ * @param null
325
  * @return Mage_Payment_Model_Abstract
326
  */
327
  public function validate()
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
 
354
  /**
355
  * Payment form refill validation
356
  *
357
+ * @param null
358
+ * @return null
359
  */
360
  public function paymentRefillValidate()
361
  {
365
  // Check the users (guest or login)
366
  $customerSession = $helper->getCustomerSession();
367
  $coreSession = $helper->getCoresession();
368
+ if (!$customerSession->isLoggedIn() && !$coreSession->getGuestloginvalue()) {
 
369
  $coreSession->setGuestloginvalue('1');
370
+ } elseif ($coreSession->getGuestloginvalue() && $customerSession->isLoggedIn()) {
371
  $coreSession->setGuestloginvalue('0');
372
  $this->unsetFormMethodSession();
373
  $this->unsetMethodSession($prevPaymentCode);
374
  }
375
+ // unset form previous payment method session
376
  $paymentCode = $checkoutSession->getQuote()->getPayment()->getMethod();
377
+ if ($paymentCode && !preg_match("/novalnet/i", $paymentCode) && $prevPaymentCode && $paymentCode != $prevPaymentCode) {
378
  $this->unsetFormMethodSession();
379
  $this->unsetMethodSession($prevPaymentCode);
380
  }
381
 
382
+ $paymentSucess = $this->getNovalnetConfig('payment_last_success', true);
383
+ if (!$helper->checkIsAdmin() && $customerSession->isLoggedIn() && empty($paymentCode) && $paymentSucess) {
384
  $helper->getModelFactory()->getlastSuccesOrderMethod($customerSession->getId(),$checkoutSession);
385
  }
386
  }
388
  /**
389
  * Assign the Novalnet direct payment methods request
390
  *
391
+ * @param null
392
+ * @return null
393
  */
394
  private function _sendRequestToNovalnet()
395
  {
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
 
420
  $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
421
  $responseCodeApproved = Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED;
422
 
423
+ if ($this->canCapture() && !in_array($this->_code, $redirectPayment)) {
 
424
  $helper = $this->helper;
425
+ $orderId = $payment->getOrder()->getId();
426
  $amount = $helper->getAmountCollection($orderId, 1, NULL);
427
  $lastTranId = $helper->makeValidNumber($payment->getLastTransId());
428
  $loadTransStatus = $helper->loadTransactionStatus($lastTranId);
432
  if ($response->getStatus() == $responseCodeApproved) {
433
  $data = unserialize($payment->getAdditionalData());
434
  $data['captureTid'] = $payment->getLastTransId();
435
+ $data['CaptureCreateAt'] = $helper->getCurrentDateTime();
436
  $payment->setAdditionalData(serialize($data))->save();
437
  $helper->getModelFactory()->captureResponseSave($amount, $loadTransStatus, $transStatus, $payment, $lastTranId);
438
  } else {
452
  * @param varien_object $nominalItem
453
  * @return mixed
454
  */
455
+ public function buildRequest($type = Novalnet_Payment_Model_Config::POST_NORMAL,
456
+ $storeId = NULL, $amountValue = NULL, $nominalItem = NULL
457
+ ) {
 
 
 
 
 
 
 
 
 
 
 
 
 
458
  if ($type == Novalnet_Payment_Model_Config::POST_NORMAL || $type == Novalnet_Payment_Model_Config::POST_CALLBACK) {
 
 
459
  $request = new Varien_Object();
460
+ // set vendor params
461
  $this->assignNnAuthData($request, $storeId);
462
+ $infoObject = $this->_getInfoObject();
463
+ $orderId = $this->_getOrderId();
464
+ $livemode = (!$this->getNovalnetConfig('live_mode')) ? 1 : 0;
465
+ $helper = $this->helper;
466
  $modelFactory = $helper->getModelFactory();
467
+ $amount = $nominalItem ? $helper->getFormatedAmount($this->_getCheckout()->getNnRowAmount())
468
+ : ($amountValue ? $amountValue : $helper->getFormatedAmount($this->_getAmount()));
469
+ $modelFactory->requestParams($request, $infoObject, $orderId, $amount, $livemode);
470
+
471
  if ($this->_manualCheckLimit) {
472
  $this->_manualCheckValidate($request);
473
  }
474
+ // set reference params
475
+ $this->setReferenceParams($request);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
476
  // set payment type
477
  $request->setPaymentType($helper->getPaymentType($this->_code));
478
  // set Novalnet params
479
  $this->_setNovalnetParam($request, $this->_code);
480
  }
481
 
482
+ // set nominal period params
483
  if ($nominalItem) {
484
+ $subsequentPeriod = $this->getNovalnetConfig('subsequent_period', true);
485
+ $modelFactory->requestProfileParams($request, $subsequentPeriod);
486
  }
487
 
488
+ // Callback Method
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());
496
  $request->setPinByCallback(true);
506
  return $request;
507
  }
508
 
509
+ /**
510
+ * Set additional reference params
511
+ *
512
+ * @param varien_object $request
513
+ */
514
+ public function setReferenceParams($request) {
515
+ $referenceOne = trim(strip_tags(trim($this->getNovalnetConfig('reference_one'))));
516
+ $referenceTwo = trim(strip_tags(trim($this->getNovalnetConfig('reference_two'))));
517
+
518
+ if ($this->_referrerId) {
519
+ $request->setReferrerId($this->_referrerId);
520
+ }
521
+
522
+ if ($this->helper->checkIsAdmin()) {
523
+ $adminUserId = Mage::getSingleton('admin/session')->getUser()->getUserId();
524
+ $request->setInput2('admin_user')
525
+ ->setInputval2($adminUserId);
526
+ }
527
+
528
+ if ($referenceOne) {
529
+ $request->setInput3('reference1')
530
+ ->setInputval3($referenceOne);
531
+ }
532
+
533
+ if ($referenceTwo) {
534
+ $request->setInput4('reference2')
535
+ ->setInputval4($referenceTwo);
536
+ }
537
+ }
538
+
539
  /**
540
  * Post request to gateway and return response
541
  *
549
  $paymentKey = $helper->getPaymentId($this->_code);
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);
 
 
 
 
 
 
558
  } else {
559
  $this->showException($helper->__('Required parameter not valid') . '!', false);
560
  }
562
  }
563
 
564
  /**
565
+ * Assign Novalnet authentication Data
566
  *
567
  * @param int $storeId
568
  * @param varien_object $request
569
+ * @return null
570
  */
571
  public function assignNnAuthData(Varien_Object $request, $storeId = NULL)
572
  {
573
  //Reassign the Basic Params Based on store
574
+ $this->_vendorId = $this->getNovalnetConfig('merchant_id', true, $storeId);
575
+ $this->_authcode = $this->getNovalnetConfig('auth_code', true, $storeId);
576
+ if ($this->_getCheckout()->getQuote()->hasNominalItems()) {
 
 
577
  $this->_tariffId = $this->_subscribTariffId;
578
  }
579
 
593
  * @param varien_object $payment
594
  * @param int $storeId
595
  * @param varien_object $nominalItem
596
+ * @return null
597
  */
598
+ public function assignOrderBasicParams(Varien_Object $request, $payment,
599
+ $storeId = NULL, $nominalItem = NULL
600
+ ) {
601
  $this->assignVendorConfig($payment);
602
  $getresponseData = unserialize($payment->getAdditionalData());
603
  // subscription tariff
604
+ if ($nominalItem) {
605
  $this->_tariffId = $this->_subscribTariffId;
606
  }
607
  $this->_vendorId = ($getresponseData['vendor']) ? $getresponseData['vendor']
638
  $helper = $this->helper;
639
  $order = $payment->getOrder();
640
  $refundAmount = $helper->getFormatedAmount($amount);
 
641
  $customerId = $order->getCustomerId();
642
  $orderItems = $this->getPaymentAllItems($order);
643
  $nominalItem = $helper->checkNominalItem($orderItems);
644
  $data = unserialize($payment->getAdditionalData());
645
  $getTid = $helper->makeValidNumber($payment->getRefundTransactionId());
646
+ $invoicePayment = array(Novalnet_Payment_Model_Config::NN_PREPAYMENT, Novalnet_Payment_Model_Config::NN_INVOICE);
647
+
648
+ if (($this->_code == Novalnet_Payment_Model_Config::NN_SEPA)
649
+ || ($nominalItem && (in_array($this->_code, $invoicePayment)))) {
650
+ // get payment last transaction id
651
  $getTid = $helper->makeValidNumber($payment->getLastTransId());
652
+ if (!empty($data['NnSepaParentTid'])) {
653
  $getTid = $data['NnSepaParentTid'];
654
  }
655
  }
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;
676
 
677
+ if (in_array($this->_code, $invoicePayment)) {
 
678
  $data['NnTid'] = $data['NnTid'] . '-refund';
679
  $refundTid = $data['NnTid'];
680
  }
681
 
682
  if ($refundTid) {
683
  $refAmount = Mage::helper('core')->currency($amount, true, false);
684
+ $data = $modelFactory->refundTidData($refAmount, $data, $refundTid, $getTid);
685
  }
686
  // For SEPA payment after submitting to bank
687
  if ($statusCode->getStatus() && $this->_code == Novalnet_Payment_Model_Config::NN_SEPA) {
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);
702
  }
703
  } else {
704
+ $this->showException('Error in your refund request');
705
  }
706
  return $this;
707
  }
718
  $orderId = $payment->getOrder()->getIncrementId();
719
  $helper = $this->helper;
720
  $callbackTrans = $helper->loadCallbackValue($orderId);
721
+ $callbackValue = ($callbackTrans && $callbackTrans->getCallbackAmount())
722
  ? $callbackTrans->getCallbackAmount() : '';
723
  $currency = Mage::app()->getLocale()->currency($this->_getInfoObject()->getBaseCurrencyCode())->getSymbol();
724
  if ($callbackValue < (string) $refundAmount) {
751
  $response = $this->payportRequest($payment, 'void');
752
 
753
  if ($response->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
754
+ $txnId = trim($response->getTid());
755
  $voidTid = !empty($txnId) ? $txnId : $payment->getLastTransId() . '-void';
756
  $data = unserialize($payment->getAdditionalData());
757
  $data['voidTid'] = $voidTid;
758
+ $data['voidCreateAt'] = $helper->getCurrentDateTime();
759
 
760
  if (in_array($this->_code, array(Novalnet_Payment_Model_Config::NN_INVOICE,
761
  Novalnet_Payment_Model_Config::NN_PREPAYMENT))) {
762
  $bankVoidTid = !empty($txnId) ? $txnId : $payment->getLastTransId();
763
+ $data['NnNoteTID'] = $this->dataHelper->getReferenceDetails($bankVoidTid, $data, $this->_code);
764
  $payment->setAdditionalData(serialize($data));
765
  }
766
  $payment->setTransactionId($voidTid)
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
  }
784
  * @param float $cardAmount
785
  * @return mixed
786
  */
787
+ private function payportRequest($payment, $requestType, $refundAmount = NULL,
788
+ $refundTid = NULL, $cardAmount = NULL
789
+ ) {
 
790
  $request = new Varien_Object();
791
  $order = $payment->getOrder();
792
  $storeId = $order->getStoreId();
798
  $responseCodeApproved = Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED;
799
  $this->assignOrderBasicParams($request, $payment, $storeId, $nominalItem);
800
  $modelFactory = $helper->getModelFactory();
 
801
  $totalRefunded = $order->getTotalRefunded();
802
  $lastTransId = $payment->getLastTransId();
803
 
806
  if (!in_array(NULL, $request->toArray())) {
807
  $buildNovalnetParam = http_build_query($request->getData());
808
  $payportUrl = $helper->getPayportUrl('paygate');
809
+ $response = $this->dataHelper->setRawCallRequest($buildNovalnetParam, $payportUrl, $payment->getMethodInstance());
810
  $this->logNovalnetTransactionData($request, $response, $payment->getLastTransId(), $customerId, $storeId);
811
  } else {
812
  $this->showException('Error in processing the transactions request');
813
  }
814
+
815
+ if ($response->getStatus() == $responseCodeApproved && $nominalItem) {
816
+ // response transaction id
817
+ $responseTid = $response->getTid();
818
+ if ($requestType == 'void') {
819
+ $modelFactory->saveProfileCancelState($lastTransId);
820
+ } elseif ($requestType == 'refund' && $this->_code == Novalnet_Payment_Model_Config::NN_CC
821
+ && $totalRefunded == $order->getTotalPaid()){
822
+ $modelFactory->saveProfileCancelState($getTid);
823
+ } elseif ($requestType == 'refund' && $this->_code != Novalnet_Payment_Model_Config::NN_CC
824
+ && ($order->getGrandTotal() == $totalRefunded || $refundAmount == $cardAmount)) {
825
+ $lastTransId = preg_match("/refund/i", $lastTransId) ? str_replace("-refund",'',$lastTransId) : $lastTransId;
826
+ $modelFactory->saveProfileCancelState($lastTransId);
827
+ $responseTid ? $modelFactory->saveProfileTID($lastTransId,$responseTid) : '';
828
+ } elseif ($requestType == 'refund' && !empty($responseTid)
829
+ && $this->_code != Novalnet_Payment_Model_Config::NN_CC) {
830
+ $lastTransId = preg_match("/refund/i", $lastTransId) ? str_replace("-refund",'',$lastTransId) : $lastTransId;
831
+ $modelFactory->saveProfileTID($lastTransId,$responseTid);
832
+ }
 
833
  }
834
  return $response;
835
  }
838
  *
839
  * Get affiliate account/user detail
840
  *
841
+ * @param null
842
  * @return mixed
843
  */
844
  public function loadAffAccDetail()
856
  $helper->getCoresession()->setNnAffId($nnAffId);
857
  }
858
 
859
+ if ($nnAffId) {
860
  $orderCollection = Mage::getModel('novalnet_payment/affiliate')->getCollection()
861
  ->addFieldToFilter('aff_id', $nnAffId)
862
  ->addFieldToSelect('aff_id')
870
  if ($vendorId && $vendorAuthcode) {
871
  $this->_vendorId = $vendorId;
872
  $this->_authcode = $vendorAuthcode;
873
+ $this->_getCheckout()->setNnVendor($this->_vendorId)
874
+ ->setNnAuthcode($this->_authcode);
875
  }
876
  }
877
 
878
+ $accessKey = !empty($affAccesskey) ? $affAccesskey : $this->getNovalnetConfig('password', true);
879
  return $accessKey;
880
  }
881
 
883
  * Get Method Session
884
  *
885
  * @param string $paymentCode
886
+ * @return mixed
887
  */
888
  private function _getMethodSession($paymentCode = NULL)
889
  {
899
  * Unset method session
900
  *
901
  * @param string $paymentCode
902
+ * @return mixed
903
  */
904
  public function unsetMethodSession($paymentCode = NULL)
905
  {
916
  * @param int $storeId
917
  * @return boolean | null
918
  */
919
+ public function getNovalnetConfig($field, $globalMode = false, $storeId = NULL)
920
  {
921
  $helper = $this->helper;
922
  $storeId = is_null($storeId) ? $helper->getMagentoStoreId() : $storeId;
939
  *
940
  * @param varien_object $result
941
  * @param varien_object $payment
942
+ * @return null
943
  */
944
  public function saveCancelledOrder($result, $payment)
945
  {
954
  $serverResponse = ($result->getTestMode() && is_numeric($result->getTestMode()))
955
  ? $result->getTestMode()
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;
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
  {
1010
  * Log Affiliate user details
1011
  *
1012
  * @param int $affId
1013
+ * @return null
1014
  */
1015
  public function doNovalnetAffUserInfoLog($affId)
1016
  {
 
1017
  $affiliateUserInfo = $this->helper->getModelAffiliateuser();
1018
  $affiliateUserInfo->setAffId($affId)
1019
+ ->setCustomerNo($this->helper->getCustomerId())
1020
  ->setAffOrderNo($this->_getOrderId())
1021
  ->save();
1022
  $this->helper->getCoresession()->unsNnAffId();
1032
  */
1033
  public function setNovalnetRequestCall($requestData, $requestUrl, $type = "")
1034
  {
1035
+ if (!$requestUrl) {
1036
  $this->showException('Server Request URL is Empty');
1037
  return;
1038
  }
1039
  $httpClientConfig = array('maxredirects' => 0);
1040
 
1041
+ if ($this->getNovalnetConfig('use_proxy',true)) {
1042
+ $proxyHost = $this->getNovalnetConfig('proxy_host',true);
1043
+ $proxyPort = $this->getNovalnetConfig('proxy_port',true);
1044
+ if ($proxyHost && $proxyPort) {
1045
+ $httpClientConfig['proxy'] = $proxyHost. ':' . $proxyPort;
1046
+ $httpClientConfig['httpproxytunnel'] = true;
1047
+ $httpClientConfig['proxytype'] = CURLPROXY_HTTP;
1048
+ $httpClientConfig['SSL_VERIFYHOST'] = false;
1049
+ $httpClientConfig['SSL_VERIFYPEER'] = false;
1050
+ }
1051
  }
1052
 
1053
+ $gatewayTimeout = (int) $this->getNovalnetConfig('gateway_timeout',true);
1054
  if ($gatewayTimeout > 0) {
1055
  $httpClientConfig['timeout'] = $gatewayTimeout;
1056
  }
1089
  if ($paymentCode) {
1090
  switch ($paymentCode) {
1091
  case Novalnet_Payment_Model_Config::NN_INVOICE:
1092
+ $paymentDuration = trim($this->getNovalnetConfig('payment_duration'));
1093
  $dueDate = $helper->setDueDate($paymentDuration);
1094
  if ($dueDate) {
1095
  $request->setDueDate($dueDate);
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())
1132
  case Novalnet_Payment_Model_Config::NN_SEPA:
1133
  $paymentInfo = $dataHelper->novalnetCardDetails('payment');
1134
  $request->setBankAccountHolder($paymentInfo['account_holder'])
 
 
 
 
1135
  ->setSepaHash($dataHelper->novalnetCardDetails('result_sepa_hash'))
1136
  ->setSepaUniqueId($dataHelper->novalnetCardDetails('result_mandate_unique'))
1137
  ->setIbanBicConfirmed($dataHelper->novalnetCardDetails('nnsepa_iban_confirmed'));
1138
 
1139
+ $paymentDuration = trim($this->getNovalnetConfig('sepa_due_date'));
1140
  $dueDate = (!$paymentDuration) ? date('Y-m-d', strtotime('+7 days'))
1141
  : date('Y-m-d', strtotime('+' . $paymentDuration . ' days'));
1142
  $request->setSepaDueDate($dueDate);
1168
  $this->sepaPaymentRefill();
1169
  }
1170
  $payment->setStatus(self::STATUS_APPROVED)
1171
+ ->setIsTransactionClosed(false)
1172
  ->setAdditionalData(serialize($data))
1173
  ->save();
1174
  $order->setPayment($payment);
1180
  $this->logNovalnetStatusData($result, $txnId);
1181
 
1182
  $helper = $this->helper;
1183
+ $captureMode = (version_compare($helper->getMagentoVersion(), '1.6', '<'))
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
1190
  ->setIsTransactionClosed($captureMode) // Close the transaction
1191
  ->capture(null)
1192
  ->save();
1193
+ $setOrderStatus = $this->getNovalnetConfig('order_status') ? $this->getNovalnetConfig('order_status')
1194
  : Mage_Sales_Model_Order::STATE_PROCESSING; // If after status is empty set default status
1195
  $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $setOrderStatus, $this->helper->__('Payment was successful.'), true);
1196
  }
1206
  if (!$this->isCallbackTypeCall()) {
1207
  $this->logNovalnetTransactionData($request, $result, $txnId, $this->helper->getCustomerId(), $this->helper->getMagentoStoreId());
1208
  }
1209
+ $statusText = ($result->getStatusText()) ? $result->getStatusText() : $helper->__('successful');
 
1210
  $helper->getCoresession()->addSuccess($statusText);
1211
  $error = false;
1212
  break;
1237
  $txnId = trim($result->getTid());
1238
  // set Novalnet Mode
1239
  $responseTestMode = $result->getTestMode();
1240
+ $shopMode = $this->getNovalnetConfig('live_mode');
1241
  $testMode = (((isset($responseTestMode) && $responseTestMode == 1) || (isset($shopMode)
1242
  && $shopMode == 0)) ? 1 : 0 );
1243
+ if ($this->_getCheckout()->getQuote()->hasNominalItems()) {
 
 
1244
  $this->_tariffId = $this->_subscribTariffId;
1245
  }
1246
 
1261
  $data['NnDueDate'] = $dataHelper->getDueDate($result);
1262
  $data['NnNote'] = $dataHelper->getNote($result);
1263
  $data['NnNoteAmount'] = $dataHelper->getBankDetailsAmount($result->getAmount());
1264
+ $data['NnNoteTID'] = $dataHelper->getReferenceDetails($txnId,$data, $this->_code);
1265
  }
1266
  return $data;
1267
  }
1269
  /**
1270
  * Log sepa payment refill information
1271
  *
1272
+ * @param null
1273
+ * @return null
1274
  */
1275
  public function sepaPaymentRefill()
1276
  {
1278
  $customerLogin = $helper->getCustomerSession()->isLoggedIn();
1279
 
1280
  if ($customerLogin && !$helper->checkIsAdmin()) {
 
1281
  $customerId = $helper->getCustomerId();
1282
  $modNovalSepaReFillCollection = $helper->getModelSepaRefill()->getCollection();
1283
  $modNovalSepaReFillCollection->addFieldToFilter('customer_id', $customerId);
1284
+ $modNovalSepaRefill = count($modNovalSepaReFillCollection)
1285
+ ? $helper->getModelSepaRefill()->load($customerId, 'customer_id')
1286
  : $helper->getModelSepaRefill();
1287
  $modNovalSepaRefill->setCustomerId($customerId)
1288
+ ->setPanHash($this->_getCheckout()->getSepaHash())
1289
  ->setSepaDatetime($helper->getCurrentDateTime())
1290
  ->save();
1291
  }
1294
  /**
1295
  * Unset Form method session
1296
  *
1297
+ * @param null
1298
+ * @return null
1299
  */
1300
  public function unsetFormMethodSession()
1301
  {
1302
  $this->_getCheckout()->unsNnCcCvc()
1303
  ->unsCcPanHash()
1304
+ ->unsCcUniqueId()
1305
+ ->unsSepaHash()
1306
+ ->unsSepaUniqueId()
1307
+ ->unsRefilldatavalues()
1308
+ ->unsNnPaymentCode()
1309
+ ->unsNnVendor()
1310
+ ->unsNnAuthcode();
1311
  }
1312
 
1313
  /**
1314
  * Unset payment method session
1315
  *
1316
+ * @param null
1317
+ * @return null
1318
  */
1319
  public function unsetPaymentReqResData()
1320
  {
1342
  $requestType = ($reqType == Novalnet_Payment_Model_Config::TRANS_STATUS)
1343
  ? Novalnet_Payment_Model_Config::TRANS_STATUS : $reqType;
1344
 
1345
+ if ($payment) {
1346
  $this->assignVendorConfig($payment);
1347
  }
1348
  // Callback request data re-assign
1376
  * Set the Order basic configuration
1377
  *
1378
  * @param string $payment
1379
+ * @return null
1380
  */
1381
  public function assignVendorConfig($payment = NULL)
1382
  {
1383
  // Reassign the Basic Params Based on store
1384
+ $getresponseData = $payment ? unserialize($payment->getAdditionalData()) : NULL;
 
 
 
1385
  $this->_vendorId = ($getresponseData['vendor']) ? $getresponseData['vendor']
1386
  : $this->_vendorId;
1387
  $this->_authcode = ($getresponseData['auth_code']) ? $getresponseData['auth_code']
1395
  /**
1396
  * Get checkout session
1397
  *
1398
+ * @param null
1399
  * @return Mage_Sales_Model_Order
1400
  */
1401
  protected function _getCheckout()
1410
  /**
1411
  * validate Novalnet params to proceed checkout
1412
  *
1413
+ * @param null
1414
  * @return boolean
1415
  */
1416
  public function validateNovalnetParams()
1443
  private function _manualCheckValidate($request)
1444
  {
1445
  $checkoutSession = $this->_getCheckout();
1446
+ $setOnholdPayments = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('setonholdPayments');
1447
+ $amount = $checkoutSession->getQuote()->hasNominalItems()
1448
+ ? $this->helper->getFormatedAmount($checkoutSession->getNnRowAmount())
1449
+ : $this->helper->getFormatedAmount($this->_getAmount());
1450
+ if (in_array($this->_code,$setOnholdPayments) && $this->_manualCheckLimit <= $amount) {
 
1451
  $request->setOnHold(1);
1452
  }
1453
 
1457
  /**
1458
  * Validate Novalnet basic params
1459
  *
1460
+ * @param null
1461
  * @return boolean
1462
  */
1463
  private function _validateBasicParams()
1464
  {
 
1465
  $helper = $this->helper;
1466
 
1467
  if ($helper->checkIsNumeric($this->_vendorId) && $this->_authcode && $helper->checkIsNumeric($this->_productId)
 
 
 
 
 
1468
  && $helper->checkIsNumeric($this->_tariffId)) {
1469
+ if ($this->_getCheckout()->getQuote()->hasNominalItems() && !$helper->checkIsNumeric($this->_subscribTariffId)) {
1470
+ return false;
1471
+ }
1472
  return true;
1473
  }
1474
+
1475
  return false;
1476
  }
1477
 
1478
  /**
1479
  * Check whether callback option is enabled
1480
  *
1481
+ * @param null
1482
  * @return boolean
1483
  */
1484
  public function isCallbackTypeCall()
1485
  {
1486
  $callbackTid = "hasNnCallbackTid" . ucfirst($this->_code);
1487
  $total = $this->helper->getFormatedAmount($this->_getAmount());
1488
+ $callBackMinimum = (int) $this->getNovalnetConfig('callback_minimum_amount');
1489
  $countryCode = strtoupper($this->_getInfoObject()->getBillingAddress()->getCountryId());
1490
+ $checkoutSession = $this->_getCheckout();
 
1491
  $helper = $this->helper;
1492
+ if ($checkoutSession->getQuote()->hasNominalItems()) {
1493
+ $total = $helper->getFormatedAmount($checkoutSession->getNnRowAmount());
1494
  }
1495
 
1496
+ return ($helper->getCheckoutSession()->$callbackTid() || ($this->getNovalnetConfig('callback')
1497
  && ($callBackMinimum ? $total >= $callBackMinimum : true) && ($helper->isCallbackTypeAllowed($countryCode))));
1498
  }
1499
 
1502
  *
1503
  * @param string $paymentCode
1504
  * @param mixed $$infoInstance
1505
+ * @return null
1506
  */
1507
+ private function _initiateCallbackProcess($code, $infoInstance)
1508
  {
1509
  $isCallbackTypeCall = $this->isCallbackTypeCall();
1510
+ $methodSession = $this->_getMethodSession();
1511
  $isPlaceOrder = $this->_isPlaceOrder();
1512
 
1513
+ $paymentCode = ucfirst($code);
1514
+ $callbackTid = "getNnCallbackTid" . $paymentCode;
1515
+ $callbackOrderNo = "getNnCallbackOrderNo" . $paymentCode;
1516
+ $callbackPin = "getNnCallbackPin" . $paymentCode;
1517
+ $callbackNewPin = "getNnNewCallbackPin" . $paymentCode;
1518
+ $setcallbackPin = "setNnCallbackPin" . $paymentCode;
1519
 
1520
+ if (!$isPlaceOrder && $isCallbackTypeCall && $this->_getIncrementId() != $methodSession->$callbackOrderNo()) {
1521
  $this->unsetMethodSession();
1522
  }
1523
 
 
1524
  // Validate callback session
1525
+ $this->_validateCallbackSession($paymentCode);
1526
 
1527
  if ($isCallbackTypeCall && $infoInstance->getCallbackPinValidationFlag()
1528
  && $methodSession->$callbackTid()) {
1529
  $nnCallbackPin = $infoInstance->$callbackPin();
1530
+ if (!$infoInstance->$callbackNewPin() && empty($nnCallbackPin)) {
1531
+ $this->showException('Enter your PIN');
1532
+ } elseif (!$infoInstance->$callbackNewPin() && !$this->helper->checkIsValid($nnCallbackPin)) {
1533
  $this->showException('The PIN you entered is incorrect');
1534
  }
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()) {
1542
+ $this->_generateCallback($paymentCode);
1543
  }
1544
  }
1545
+
1546
  if ($isPlaceOrder) {
1547
+ $this->validateCallbackProcess($paymentCode);
1548
  }
1549
  }
1550
 
1551
  /**
1552
  * Validate order amount is getting changed after callback initiation
1553
  *
1554
+ * @param string $paymentCode
1555
+ * @return throw Mage Exception
 
1556
  */
1557
+ private function _validateCallbackSession($paymentCode)
1558
  {
1559
+ $callbackTid = "hasNnCallbackTid" . $paymentCode;
1560
+ $getNnDisableTime = "getNnDisableTime" . $paymentCode;
 
1561
  $checkoutSession = $this->_getCheckout();
1562
  $methodSession = $this->_getMethodSession();
1563
  $helper = $this->helper;
1564
+ $amount = $this->_getCheckout()->getQuote()->hasNominalItems()
1565
+ ? $helper->getFormatedAmount($checkoutSession->getNnRowAmount())
1566
+ : $helper->getFormatedAmount($this->_getAmount());
 
 
 
1567
 
1568
  if ($methodSession->$callbackTid()) {
1569
  if ($checkoutSession->$getNnDisableTime() && time() > $checkoutSession->$getNnDisableTime()) {
1580
  /**
1581
  * Get increment id for callback process
1582
  *
1583
+ * @param null
1584
  * @return int
1585
  */
1586
  private function _getIncrementId()
1601
  /**
1602
  * Make callback request and validate response
1603
  *
1604
+ * @param string $paymentCode
1605
+ * @return throw Mage Exception
1606
  */
1607
+ private function _generateCallback($paymentCode)
1608
  {
1609
+ $callbackTid = "setNnCallbackTid" . $paymentCode;
1610
+ $callbackOrderNo = "setNnCallbackOrderNo" . $paymentCode;
1611
+ $checkoutSession = $this->_getCheckout();
1612
+ $nominalItem = $checkoutSession->getQuote()->hasNominalItems();
1613
+
1614
  if ($nominalItem) {
1615
  $request = $this->buildRequest(Novalnet_Payment_Model_Config::POST_CALLBACK, NULL, NULL, $nominalItem);
1616
  $response = $this->postRequest($request);
1617
+ $checkoutSession->setNominalRequest($request)
1618
+ ->setNominalResponse($response);
1619
  } else {
1620
  $request = $this->buildRequest(Novalnet_Payment_Model_Config::POST_CALLBACK);
1621
  $response = $this->postRequest($request);
1622
+ $checkoutSession->setPaymentReqData($request)
1623
+ ->setPaymentResData($response);
1624
  $this->logNovalnetTransactionData($request, $response, $response->getTid());
1625
  }
1626
 
1627
+ $checkoutSession->setNnCallbackReqData($request);
1628
  if ($response->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
1629
  $this->_getMethodSession()
1630
+ ->$callbackTid(trim($response->getTid()))
1631
+ ->setNnTestMode(trim($response->getTestMode()))
1632
+ ->setNnCallbackTidTimeStamp(time())
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');
1650
  * Regenerate new pin for callback process
1651
  *
1652
  * @param mixed $methodSession
1653
+ * @return throw Mage Exception
1654
  */
1655
  private function _regenerateCallbackPin($methodSession)
1656
  {
1669
  /**
1670
  * Validate callback response
1671
  *
1672
+ * @param string $paymentCode
1673
  * @param mixed $methodSession
1674
+ * @return null
1675
  */
1676
+ public function validateCallbackProcess($paymentCode)
1677
  {
1678
+ $callbackTid = "getNnCallbackTid" . $paymentCode;
1679
+ $callbackPin = "getNnCallbackPin" . $paymentCode;
1680
+ $setNnDisableTime = "setNnDisableTime" . $paymentCode;
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 {
1717
  * @param int $storeId
1718
  * @param int $orderNo
1719
  * @param int $subsId
1720
+ * @return null
1721
  */
1722
+ public function logNovalnetTransactionData($request = NULL, $response = NULL, $txnId,
1723
+ $customerId = NULL, $storeId = NULL, $orderNo = NULL, $subsId = NULL
1724
+ ) {
 
1725
  $this->dataHelper->doRemoveSensitiveData($request, $this->_code);
1726
  $helper = $this->helper;
1727
  $shopUrl = ($response->getMemburl()) ? $response->getMemburl() : $helper->getCurrentSiteUrl();
1755
  * @param int $customerId
1756
  * @param int $storeId
1757
  * @param float $amount
1758
+ * @return null
1759
  */
1760
+ public function logNovalnetStatusData($response, $txnId, $customerId = NULL,
1761
+ $storeId = NULL, $amount = NULL
1762
+ ) {
 
1763
  $helper = $this->helper;
1764
  $shopUrl = ($response->getMemburl()) ? $response->getMemburl() : $helper->getCurrentSiteUrl();
1765
  $customerId = ($customerId) ? $customerId : $helper->getCustomerId();
1785
  *
1786
  * @param varien_object $response
1787
  * @param int $orderId
1788
+ * @return null
1789
  */
1790
  public function doTransactionOrderLog($response, $orderId)
1791
  {
1803
  /**
1804
  * Get current infoinstance
1805
  *
1806
+ * @param null
1807
  * @return Mage_Payment_Model_Method_Abstract
1808
  */
1809
  private function _getInfoInstance()
1817
  /**
1818
  * Get current order/quote object
1819
  *
1820
+ * @param null
1821
  * @return Mage_Payment_Model_Method_Abstract
1822
  */
1823
  private function _getInfoObject()
1824
  {
1825
  $info = $this->_getInfoInstance();
1826
+ return ($this->_isPlaceOrder()) ? $info->getOrder() : $info->getQuote();
 
 
 
 
1827
  }
1828
 
1829
  /**
1830
  * Whether current operation is order placement
1831
  *
1832
+ * @param null
1833
  * @return boolean
1834
  */
1835
  private function _isPlaceOrder()
1845
  /**
1846
  * Get grand total amount
1847
  *
1848
+ * @param null
1849
  * @return double
1850
  */
1851
  private function _getAmount()
1852
  {
1853
  $info = $this->_getInfoInstance();
1854
+ return ($this->_isPlaceOrder())
1855
+ ? (double) $info->getOrder()->getBaseGrandTotal()
1856
+ : (double) $info->getQuote()->getBaseGrandTotal();
 
 
1857
  }
1858
 
1859
  /**
1860
  * Order increment ID getter (either real from order or a reserved from quote)
1861
  *
1862
+ * @param null
1863
  * @return int
1864
  */
1865
  private function _getOrderId()
1866
  {
1867
  $info = $this->_getInfoInstance();
1868
+ return ($this->_isPlaceOrder()) ? $info->getOrder()->getIncrementId()
1869
+ : $this->_getIncrementId();
 
 
 
1870
  }
1871
 
1872
  /**
1873
  * Get payment data for current order
1874
  *
1875
+ * @param null
1876
+ * @return mixed
1877
  */
1878
  private function _getNnPaymentData()
1879
  {
1880
  $info = $this->_getInfoInstance();
1881
+ return ($this->_isPlaceOrder()) ? $info->getOrder()->getPayment() : $info;
 
 
 
 
1882
  }
1883
 
1884
  /**
1885
  * Retrieve model helper
1886
  *
1887
+ * @param null
1888
  * @return Novalnet_Payment_Helper_Data
1889
  */
1890
  protected function _getHelper()
1895
  /**
1896
  * Retrieve Assign data helper
1897
  *
1898
+ * @param null
1899
  * @return Novalnet_Payment_Helper_AssignData
1900
  */
1901
  protected function _getDataHelper()
1907
  * Show expection
1908
  *
1909
  * @param string $text
1910
+ * @param boolean $lang
1911
  * @return Mage::throwException
1912
  */
1913
  public function showException($text, $lang = true)
1921
  /**
1922
  * Assign helper utilities needed for the payment process
1923
  *
1924
+ * @param null
1925
  * @return Novalnet helper
1926
  */
1927
  public function assignUtilities()
1937
  /**
1938
  * Get Billing Address
1939
  *
1940
+ * @param null
1941
  * @return string
1942
  */
1943
  private function _getBillingAddress()
1965
  /**
1966
  * Get redirect URL
1967
  *
1968
+ * @param null
1969
  * @return string
1970
  */
1971
  public function getOrderPlaceRedirectUrl()
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 {
app/code/community/Novalnet/Payment/Model/Recurring.php CHANGED
@@ -44,19 +44,21 @@ class Novalnet_Payment_Model_Recurring extends Mage_Core_Model_Abstract
44
  */
45
  public function getProfileProgress($profile)
46
  {
47
- $checkout = Mage::getSingleton('checkout/session');
48
- $quote = $checkout->getQuote();
 
49
  $paymentObj = $quote->getPayment()->getMethodInstance();
50
  $paymentCode = $quote->getPayment()->getMethod();
51
- $helper = $paymentObj->helper;
52
- if ($checkout->getNominalRequest() && $checkout->getNominalResponse()) {
53
  $paymentObj->validateCallbackProcess(ucfirst($paymentCode));
54
- $request = $checkout->getNominalRequest();
55
- $result = $checkout->getNominalResponse();
56
  } else {
57
  $request = $this->_buildRecurringRequest($profile, $paymentObj);
58
  $result = $paymentObj->postRequest($request);
59
  }
 
60
  $txnId = trim($result->getTid());
61
  //set profile reference id
62
  $profile->setReferenceId($txnId);
@@ -80,7 +82,7 @@ class Novalnet_Payment_Model_Recurring extends Mage_Core_Model_Abstract
80
  $this->updateInventory($quote);
81
  } else {
82
  $error = $result->getStatusMessage() ? $result->getStatusMessage() : ($result->getStatusDesc() ? $result->getStatusDesc()
83
- : ($result->getStatusText() ? $result->getStatusText() : $this->helper->__('Error in capturing the payment')));
84
  if ($error !== false) {
85
  Mage::throwException($error);
86
  }
@@ -99,12 +101,11 @@ class Novalnet_Payment_Model_Recurring extends Mage_Core_Model_Abstract
99
  protected function _buildPostBackRequestForRecurring($config, $profile, $result, $paymentObj)
100
  {
101
  $request = Mage::getModel('novalnet_payment/novalnet_request');
102
- $shopMode = (!$paymentObj->_getConfigData('live_mode')) ? 1 : 0;
103
  $serverResponse = $result->getTestMode();
104
  $testMode = (((isset($serverResponse) && $serverResponse == 1) || (isset($shopMode)
105
  && $shopMode == 0)) ? 1 : 0 );
106
  $data = $paymentObj->setPaymentAddtionaldata($result, $config);
107
-
108
  $request->setVendor($config->getVendor())
109
  ->setAuthCode($config->getAuthCode())
110
  ->setProduct($config->getProduct())
@@ -130,31 +131,28 @@ class Novalnet_Payment_Model_Recurring extends Mage_Core_Model_Abstract
130
  protected function _buildRecurringRequest(Mage_Payment_Model_Recurring_Profile $profile, $paymentObj)
131
  {
132
  $request = Mage::getModel('novalnet_payment/novalnet_request');
133
- $amount = round(($profile->getBillingAmount() + $profile->getShippingAmount()
134
- + $profile->getTaxAmount()), 2) * 100;
135
- $initAmount = $profile->getInitAmount();
136
- $trialAmount = $profile->getTrialBillingAmount();
137
- if ($initAmount != '' || $trialAmount) {
138
- $amountValue = $this->recurringAmount($profile);
139
- } else {
140
- $amountValue = $amount;
141
- }
142
  $peroidUnit = $profile->getPeriodUnit();
143
  $periodUnitFormat = array("day" => "d", "month" => "m", "year" => "y");
144
 
145
  if ($peroidUnit == "semi_month") {
146
- $tariffPeriod2 = "14d";
147
  } elseif ($peroidUnit == "week") {
148
- $tariffPeriod2 = ($profile->getPeriodFrequency() * 7) . "d";
149
  } else {
150
- $tariffPeriod2 = $profile->getPeriodFrequency() . $periodUnitFormat[$peroidUnit];
151
  }
152
- $storeId = $paymentObj->helper->getMagentoStoreId();
153
- $request = $paymentObj->buildRequest(Novalnet_Payment_Model_Config::POST_NORMAL, $storeId, $amountValue);
154
 
155
- $request->setTariffPeriod($tariffPeriod2)
156
- ->setTariffPeriod2($tariffPeriod2)
157
- ->setTariffPeriod2Amount($amount);
 
 
 
 
 
 
 
 
158
 
159
  return $request;
160
  }
@@ -167,26 +165,10 @@ class Novalnet_Payment_Model_Recurring extends Mage_Core_Model_Abstract
167
  */
168
  public function recurringAmount($profile)
169
  {
170
- $trialAmount = $profile->getTrialBillingAmount();
171
- $initAmount = $profile->getInitAmount();
172
- $billingAmount = $profile->getBillingAmount();
173
- if ($trialAmount != '' && $initAmount != '' && $billingAmount != '') {
174
- $amount = round(($trialAmount + $initAmount + $profile->getShippingAmount()
175
- + $profile->getTaxAmount()), 2) * 100;
176
- } else if ($trialAmount != '' && $billingAmount != '') {
177
- $amount = round(($trialAmount + $profile->getShippingAmount() + $profile->getTaxAmount()), 2)
178
- * 100;
179
- } else if ($initAmount != '' && $billingAmount != '') {
180
- $amount = round(($initAmount + $billingAmount + $profile->getShippingAmount()
181
- + $profile->getTaxAmount()), 2) * 100;
182
- } else {
183
- $amount = round(($billingAmount + $profile->getShippingAmount() + $profile->getTaxAmount()), 2)
184
- * 100;
185
- }
186
- return $amount;
187
  }
188
 
189
-
190
  /**
191
  * Get Recurring Increment Id
192
  *
@@ -195,12 +177,13 @@ class Novalnet_Payment_Model_Recurring extends Mage_Core_Model_Abstract
195
  */
196
  public function getRecurringOrderNo($profile)
197
  {
 
198
  $recurringProfileCollection = Mage::getResourceModel('sales/order_grid_collection')
199
  ->addRecurringProfilesFilter($profile->getId());
200
  foreach ($recurringProfileCollection as $recurringProfileCollectionValue) {
201
- $orderNo = $recurringProfileCollectionValue->getIncrementId();
202
  }
203
- return $orderNo;
204
  }
205
 
206
  /**
@@ -222,29 +205,23 @@ class Novalnet_Payment_Model_Recurring extends Mage_Core_Model_Abstract
222
  * @param varien_object $order
223
  * @return int
224
  */
225
- public function getRecurringCaptureTotal($lastTranId,$order)
226
  {
227
- $profileInfo = Mage::getModel('sales/recurring_profile')->load($lastTranId, 'reference_id');
228
  $billingAmount = $profileInfo->getBillingAmount();
229
  $initialAmount = $profileInfo->getInitAmount();
230
- $trialAmount = $profileInfo->getTrialBillingAmount();
231
- $shippingAmount = $profileInfo->getShippingAmount();
232
- $taxAmount = $profileInfo->getTaxAmount();
233
 
234
- if ($initialAmount != '' && $trialAmount != '' && $billingAmount != '') {
235
- $amountvalue = round(($trialAmount + $initialAmount + $shippingAmount + $taxAmount), 2);
236
- } else if ($trialAmount != '' && $billingAmount != '') {
237
- $amountvalue = round(($trialAmount + $shippingAmount + $taxAmount), 2);
238
- } else if ($initialAmount != '' && $billingAmount != '') {
239
- $amountvalue = round(($initialAmount + $billingAmount + $shippingAmount + $taxAmount), 2);
240
  } else {
241
- $amountvalue = $order->getGrandTotal();
242
  }
243
- $loadTransaction = Mage::helper('novalnet_payment')->loadTransactionStatus($lastTranId)
244
- ->setAmount($amountvalue)
245
- ->save();
246
 
247
- return $amountvalue;
 
 
 
248
  }
249
 
250
  /**
44
  */
45
  public function getProfileProgress($profile)
46
  {
47
+ $helper = Mage::helper('novalnet_payment');
48
+ $checkoutSession = $helper->getCheckoutSession();
49
+ $quote = $checkoutSession->getQuote();
50
  $paymentObj = $quote->getPayment()->getMethodInstance();
51
  $paymentCode = $quote->getPayment()->getMethod();
52
+
53
+ if ($checkoutSession->getNominalRequest() && $checkoutSession->getNominalResponse()) {
54
  $paymentObj->validateCallbackProcess(ucfirst($paymentCode));
55
+ $request = $checkoutSession->getNominalRequest();
56
+ $result = $checkoutSession->getNominalResponse();
57
  } else {
58
  $request = $this->_buildRecurringRequest($profile, $paymentObj);
59
  $result = $paymentObj->postRequest($request);
60
  }
61
+
62
  $txnId = trim($result->getTid());
63
  //set profile reference id
64
  $profile->setReferenceId($txnId);
82
  $this->updateInventory($quote);
83
  } else {
84
  $error = $result->getStatusMessage() ? $result->getStatusMessage() : ($result->getStatusDesc() ? $result->getStatusDesc()
85
+ : ($result->getStatusText() ? $result->getStatusText() : $this->helper->__('Error in capturing the payment')));
86
  if ($error !== false) {
87
  Mage::throwException($error);
88
  }
101
  protected function _buildPostBackRequestForRecurring($config, $profile, $result, $paymentObj)
102
  {
103
  $request = Mage::getModel('novalnet_payment/novalnet_request');
104
+ $shopMode = (!$paymentObj->getNovalnetConfig('live_mode')) ? 1 : 0;
105
  $serverResponse = $result->getTestMode();
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())
131
  protected function _buildRecurringRequest(Mage_Payment_Model_Recurring_Profile $profile, $paymentObj)
132
  {
133
  $request = Mage::getModel('novalnet_payment/novalnet_request');
 
 
 
 
 
 
 
 
 
134
  $peroidUnit = $profile->getPeriodUnit();
135
  $periodUnitFormat = array("day" => "d", "month" => "m", "year" => "y");
136
 
137
  if ($peroidUnit == "semi_month") {
138
+ $tariffPeriod = "14d";
139
  } elseif ($peroidUnit == "week") {
140
+ $tariffPeriod = ($profile->getPeriodFrequency() * 7) . "d";
141
  } else {
142
+ $tariffPeriod = $profile->getPeriodFrequency() . $periodUnitFormat[$peroidUnit];
143
  }
 
 
144
 
145
+ $storeId = $paymentObj->helper->getMagentoStoreId();
146
+ $originalAmount = round(($profile->getBillingAmount() + $profile->getShippingAmount()
147
+ + $profile->getTaxAmount()), 2) * 100;
148
+ $initAmount = $profile->getInitAmount();
149
+ $amount = !empty($initAmount) ? $this->recurringAmount($profile) : $originalAmount;
150
+ $request = $paymentObj->buildRequest(Novalnet_Payment_Model_Config::POST_NORMAL, $storeId, $amount);
151
+ $period = $paymentObj->getNovalnetConfig('subsequent_period', true, $storeId);
152
+ $subsequentPeriod = !empty($period) ? $period : $tariffPeriod;
153
+ $request->setTariffPeriod($tariffPeriod)
154
+ ->setTariffPeriod2($subsequentPeriod)
155
+ ->setTariffPeriod2Amount($originalAmount);
156
 
157
  return $request;
158
  }
165
  */
166
  public function recurringAmount($profile)
167
  {
168
+ return round(($profile->getInitAmount() + $profile->getBillingAmount()
169
+ + $profile->getShippingAmount() + $profile->getTaxAmount()), 2) * 100;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
170
  }
171
 
 
172
  /**
173
  * Get Recurring Increment Id
174
  *
177
  */
178
  public function getRecurringOrderNo($profile)
179
  {
180
+ $incrementId = array();
181
  $recurringProfileCollection = Mage::getResourceModel('sales/order_grid_collection')
182
  ->addRecurringProfilesFilter($profile->getId());
183
  foreach ($recurringProfileCollection as $recurringProfileCollectionValue) {
184
+ $incrementId[] = $recurringProfileCollectionValue->getIncrementId();
185
  }
186
+ return $incrementId;
187
  }
188
 
189
  /**
205
  * @param varien_object $order
206
  * @return int
207
  */
208
+ public function getRecurringCaptureTotal($lastTransId, $order)
209
  {
210
+ $profileInfo = Mage::getModel('sales/recurring_profile')->load($lastTransId, 'reference_id');
211
  $billingAmount = $profileInfo->getBillingAmount();
212
  $initialAmount = $profileInfo->getInitAmount();
 
 
 
213
 
214
+ if (!empty($initialAmount) && !empty($billingAmount)) {
215
+ $amount = round(($initialAmount + $billingAmount
216
+ + $profileInfo->getShippingAmount() + $profileInfo->getTaxAmount()), 2);
 
 
 
217
  } else {
218
+ $amount = $order->getGrandTotal();
219
  }
 
 
 
220
 
221
+ $loadTransaction = Mage::helper('novalnet_payment')->loadTransactionStatus($lastTransId)
222
+ ->setAmount($amount)
223
+ ->save();
224
+ return $amount;
225
  }
226
 
227
  /**
app/code/community/Novalnet/Payment/Model/Sales/Creditmemo/Tax.php DELETED
@@ -1,93 +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
- class Novalnet_Payment_Model_Sales_Creditmemo_Tax extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract
27
- {
28
- /**
29
- * Collect credit memo subtotal
30
- *
31
- * @param Mage_Sales_Model_Order_Creditmemo $creditmemo
32
- * @return Mage_Sales_Model_Order_Creditmemo_Total_Abstract
33
- */
34
- public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo)
35
- {
36
- $order = $creditmemo->getOrder();
37
- $totalPaid = $order->getTotalPaid();
38
- $helper = Mage::helper('novalnet_payment');
39
- $orderItems = $order->getAllItems();
40
- $nominalItem = $helper->checkNominalItem($orderItems);
41
-
42
- $paymentname = array(
43
- Novalnet_Payment_Model_Config::NN_CC,
44
- Novalnet_Payment_Model_Config::NN_IDEAL,
45
- Novalnet_Payment_Model_Config::NN_EPS,
46
- Novalnet_Payment_Model_Config::NN_PAYPAL,
47
- Novalnet_Payment_Model_Config::NN_SOFORT
48
- );
49
- if($nominalItem){
50
- array_shift($paymentname);
51
- }
52
- $paymentMethod = $order->getPayment()->getMethodInstance()->getCode();
53
- if (preg_match("/novalnet/i", $paymentMethod) && in_array($paymentMethod, $paymentname)) {
54
- return $this;
55
- }
56
- $getrefundvalue = $order->getTotalRefunded();
57
- $orderId = $order->getId();
58
-
59
- if ($nominalItem) {
60
- $order->setTotalInvoiced($totalPaid);
61
- }
62
- $amountvalue = $helper->getAmountCollection($orderId, 1, NULL);
63
- if ($amountvalue != '') {
64
- $order->setTotalInvoiced($amountvalue);
65
- $totalQtyOrder = $order->getTotalQtyOrdered();
66
- $totalRefunded = $order->getTotalRefunded();
67
-
68
- $creditmemoBaseGrandTotal = $creditmemo->getBaseGrandTotal();
69
- $creditmemoGrandTotal = $creditmemo->getGrandTotal();
70
- $creditmemoBaseTaxAmount = $creditmemo->getBaseTaxAmount();
71
- $creditmemoTaxAmount = $creditmemo->getTaxAmount();
72
- $captrueAmountfirst = 0;
73
- $captrueAmount = $amountvalue;
74
- if ($totalRefunded == 0) {
75
- $captrueAmountfirst = $captrueAmount;
76
- } else {
77
- $captrueAmountfirst = 0;
78
- }
79
- $creditmemo->setSubtotal($captrueAmountfirst)
80
- ->setShippingAmount(0)
81
- ->setBaseShippingAmount(0)
82
- ->setTaxAmount(0)
83
- ->setBaseTaxAmount(0)
84
- ->setBaseSubtotal($captrueAmountfirst)
85
- ->setBaseGrandTotal($captrueAmountfirst)
86
- ->setGrandTotal($captrueAmountfirst);
87
- } else {
88
- return false;
89
- }
90
-
91
- return $this;
92
- }
93
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Model/Sales/Creditmemo/Total.php DELETED
@@ -1,93 +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
- class Novalnet_Payment_Model_Sales_Creditmemo_Total extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract
27
- {
28
- /**
29
- * Collect credit memo subtotal
30
- *
31
- * @param Mage_Sales_Model_Order_Creditmemo $creditmemo
32
- * @return Mage_Sales_Model_Order_Creditmemo_Total_Abstract
33
- */
34
- public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo)
35
- {
36
- $order = $creditmemo->getOrder();
37
- $totalPaid = $order->getTotalPaid();
38
- $helper = Mage::helper('novalnet_payment');
39
- $orderItems = $order->getAllItems();
40
- $nominalItem = $helper->checkNominalItem($orderItems);
41
-
42
- $paymentname = array(
43
- Novalnet_Payment_Model_Config::NN_CC,
44
- Novalnet_Payment_Model_Config::NN_IDEAL,
45
- Novalnet_Payment_Model_Config::NN_EPS,
46
- Novalnet_Payment_Model_Config::NN_PAYPAL,
47
- Novalnet_Payment_Model_Config::NN_SOFORT
48
- );
49
- if ($nominalItem) {
50
- array_shift($paymentname);
51
- }
52
- $paymentMethod = $order->getPayment()->getMethodInstance()->getCode();
53
- if (preg_match("/novalnet/i", $paymentMethod) && in_array($paymentMethod, $paymentname)) {
54
- return $this;
55
- }
56
- $getrefundvalue = $order->getTotalRefunded();
57
- $orderId = $order->getId();
58
-
59
- if ($nominalItem) {
60
- $order->setTotalInvoiced($totalPaid);
61
- }
62
- $amountvalue = $helper->getAmountCollection($orderId, 1, NULL);
63
- if ($amountvalue != '') {
64
- $order->setTotalInvoiced($amountvalue);
65
- $totalQtyOrder = $order->getTotalQtyOrdered();
66
- $totalRefunded = $order->getTotalRefunded();
67
-
68
- $creditmemoBaseGrandTotal = $creditmemo->getBaseGrandTotal();
69
- $creditmemoGrandTotal = $creditmemo->getGrandTotal();
70
- $creditmemoBaseTaxAmount = $creditmemo->getBaseTaxAmount();
71
- $creditmemoTaxAmount = $creditmemo->getTaxAmount();
72
- $captrueAmountfirst = 0;
73
- $captrueAmount = $amountvalue;
74
- if ($totalRefunded == 0) {
75
- $captrueAmountfirst = $captrueAmount;
76
- } else {
77
- $captrueAmountfirst = 0;
78
- }
79
- $creditmemo->setSubtotal($captrueAmountfirst)
80
- ->setShippingAmount(0)
81
- ->setBaseShippingAmount(0)
82
- ->setTaxAmount(0)
83
- ->setBaseTaxAmount(0)
84
- ->setBaseSubtotal($captrueAmountfirst)
85
- ->setBaseGrandTotal($captrueAmountfirst)
86
- ->setGrandTotal($captrueAmountfirst);
87
- } else {
88
- return false;
89
- }
90
-
91
- return $this;
92
- }
93
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Model/Sales/Order/Creditmemo/Total/Grand.php ADDED
@@ -0,0 +1,68 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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
+ * 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.magentocommerce.com for more information.
20
+ *
21
+ * @category Mage
22
+ * @package Mage_Sales
23
+ * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ class Novalnet_Payment_Model_Sales_Order_Creditmemo_Total_Grand extends Mage_Sales_Model_Order_Creditmemo_Total_Grand
27
+ {
28
+ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo)
29
+ {
30
+ $order = $creditmemo->getOrder();
31
+ $paymentMethod = $order->getPayment()->getMethodInstance()->getCode();
32
+
33
+ if (preg_match("/novalnet/i", $paymentMethod)) {
34
+ $helper = Mage::helper('novalnet_payment');
35
+ $orderItems = $order->getAllItems();
36
+ $nominalItem = $helper->checkNominalItem($orderItems);
37
+ $redirectPayments = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
38
+ !$nominalItem ? array_push($redirectPayments, Novalnet_Payment_Model_Config::NN_CC) : $redirectPayments;
39
+
40
+ if (in_array($paymentMethod, $redirectPayments)) {
41
+ return parent::collect($creditmemo);
42
+ }
43
+
44
+ if ($nominalItem) {
45
+ $order->setTotalInvoiced($order->getTotalPaid());
46
+ }
47
+
48
+ $amountvalue = $helper->getAmountCollection($order->getId(), 1, NULL);
49
+
50
+ if (!empty($amountvalue)) {
51
+ $order->setTotalInvoiced($amountvalue);
52
+ $totalRefunded = (int)$order->getTotalRefunded();
53
+ $captureAmount = empty($totalRefunded) ? $amountvalue : 0;
54
+
55
+ $creditmemo->setSubtotal($captureAmount)
56
+ ->setShippingAmount(0)
57
+ ->setBaseShippingAmount(0)
58
+ ->setTaxAmount(0)
59
+ ->setBaseTaxAmount(0)
60
+ ->setBaseSubtotal($captureAmount)
61
+ ->setBaseGrandTotal($captureAmount)
62
+ ->setGrandTotal($captureAmount);
63
+ }
64
+ }
65
+
66
+ return parent::collect($creditmemo);
67
+ }
68
+ }
app/code/community/Novalnet/Payment/Model/Sales/Order/Invoice.php CHANGED
@@ -47,7 +47,7 @@ class Novalnet_Payment_Model_Sales_Order_Invoice extends Mage_Sales_Model_Order_
47
  $countofvalue = $helper->getAmountCollection($this->getOrder()->getId(), NULL, NULL);
48
  $tidPayment = Mage::app()->getRequest()->getParam('tid_payment');
49
  if ($paymentCode == Novalnet_Payment_Model_Config::NN_INVOICE && $countofvalue
50
- == 0 && $tidPayment == '') {
51
  $this->setState(1);
52
  } else {
53
  $this->setState($invoiceState);
@@ -72,7 +72,7 @@ class Novalnet_Payment_Model_Sales_Order_Invoice extends Mage_Sales_Model_Order_
72
  }
73
 
74
  $this->getOrder()->getPayment()->pay($this);
75
- if ($captrueAmount != '' && in_array($paymentCode, $invoicePayments) && $countofvalue
76
  != 0) {
77
  $amount = $helper->getAmountCollection($this->getOrder()->getId(), 1, NULL);
78
  $this->getOrder()->setTotalPaid($amount);
47
  $countofvalue = $helper->getAmountCollection($this->getOrder()->getId(), NULL, NULL);
48
  $tidPayment = Mage::app()->getRequest()->getParam('tid_payment');
49
  if ($paymentCode == Novalnet_Payment_Model_Config::NN_INVOICE && $countofvalue
50
+ == 0 && !$tidPayment) {
51
  $this->setState(1);
52
  } else {
53
  $this->setState($invoiceState);
72
  }
73
 
74
  $this->getOrder()->getPayment()->pay($this);
75
+ if ($captrueAmount && in_array($paymentCode, $invoicePayments) && $countofvalue
76
  != 0) {
77
  $amount = $helper->getAmountCollection($this->getOrder()->getId(), 1, NULL);
78
  $this->getOrder()->setTotalPaid($amount);
app/code/community/Novalnet/Payment/Model/Sales/Order/Payment.php CHANGED
@@ -68,7 +68,7 @@ class Novalnet_Payment_Model_Sales_Order_Payment extends Mage_Sales_Model_Order_
68
  }
69
  }
70
  $status = true;
71
- $setOrderAfterStatus = $paymentObj->_getConfigData('order_status') ? $paymentObj->_getConfigData('order_status')
72
  : Mage_Sales_Model_Order::STATE_PROCESSING; // If after status is empty set default status
73
  $state = Mage_Sales_Model_Order::STATE_PROCESSING;
74
  $payment->setTransactionId($txnId)
@@ -120,7 +120,7 @@ class Novalnet_Payment_Model_Sales_Order_Payment extends Mage_Sales_Model_Order_
120
  $storeId = $order->getStoreId();
121
  $payment = $order->getPayment();
122
  $paymentObj = $payment->getMethodInstance();
123
- $setOrderAfterStatus = $paymentObj->_getConfigData('void_status',true,$storeId);
124
  $authTransaction = $this->getAuthorizationTransaction();
125
  $this->_generateTransactionId(Mage_Sales_Model_Order_Payment_Transaction::TYPE_VOID, $authTransaction);
126
  $this->setShouldCloseParentTransaction(true);
68
  }
69
  }
70
  $status = true;
71
+ $setOrderAfterStatus = $paymentObj->getNovalnetConfig('order_status') ? $paymentObj->getNovalnetConfig('order_status')
72
  : Mage_Sales_Model_Order::STATE_PROCESSING; // If after status is empty set default status
73
  $state = Mage_Sales_Model_Order::STATE_PROCESSING;
74
  $payment->setTransactionId($txnId)
120
  $storeId = $order->getStoreId();
121
  $payment = $order->getPayment();
122
  $paymentObj = $payment->getMethodInstance();
123
+ $setOrderAfterStatus = $paymentObj->getNovalnetConfig('void_status',true,$storeId);
124
  $authTransaction = $this->getAuthorizationTransaction();
125
  $this->_generateTransactionId(Mage_Sales_Model_Order_Payment_Transaction::TYPE_VOID, $authTransaction);
126
  $this->setShouldCloseParentTransaction(true);
app/code/community/Novalnet/Payment/Model/Sales/Order/Pdf/Creditmemo.php CHANGED
@@ -106,7 +106,7 @@ class Novalnet_Payment_Model_Sales_Order_Pdf_Creditmemo extends Mage_Sales_Model
106
  $currencySymbol = Mage::app()->getLocale()->currency($currencyCode)->getSymbol();
107
  $lineBlock['lines'][] = array(
108
  array(
109
- 'text' => Mage::helper('sales')->__('Novalnet Refunded Amount').':',
110
  'feed' => 475,
111
  'align' => 'right',
112
  'font_size' => 10,
106
  $currencySymbol = Mage::app()->getLocale()->currency($currencyCode)->getSymbol();
107
  $lineBlock['lines'][] = array(
108
  array(
109
+ 'text' => Mage::helper('sales')->__('Novalnet refunded Amount').':',
110
  'feed' => 475,
111
  'align' => 'right',
112
  'font_size' => 10,
app/code/community/Novalnet/Payment/Model/System/Config/Activemethods.php CHANGED
@@ -45,20 +45,18 @@ class Novalnet_Payment_Model_System_Config_Activemethods
45
  $scopeId = 0;
46
  }
47
 
48
- $payments = Mage::getSingleton('payment/config')->getActiveMethods($scopeId);
49
- $novalnetPaymentMethods = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('novalnetPaymentMethods');
50
- foreach ($payments as $paymentCode => $paymentModel) {
51
 
52
- if (preg_match("/novalnet/i", $paymentCode)) {
53
- $paymentActive = Mage::getStoreConfig('payment/' . $paymentCode . '/active', $scopeId);
54
- if ($paymentActive == true) {
55
- $paymentMethod = Mage::helper('novalnet_payment')->__($novalnetPaymentMethods[$paymentCode]);
56
- $methods[$paymentCode] = array(
57
- 'label' => $paymentMethod,
58
- 'value' => $paymentCode,
59
- );
60
- $activePayment = true;
61
- }
62
  } else {
63
  $inactivePayment = true;
64
  }
45
  $scopeId = 0;
46
  }
47
 
48
+ $novalPaymentMethods = array_keys(Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('novalnetPaymentKey'));
 
 
49
 
50
+ foreach($novalPaymentMethods as $paymentCode) {
51
+
52
+ $paymentActive = Mage::getStoreConfig('payment/' . $paymentCode . '/active', $scopeId);
53
+ if ($paymentActive == true) {
54
+ $paymentTitle = Mage::getStoreConfig('payment/' . $paymentCode . '/title', $scopeId);
55
+ $methods[$paymentCode] = array(
56
+ 'label' => $paymentTitle,
57
+ 'value' => $paymentCode,
58
+ );
59
+ $activePayment = true;
60
  } else {
61
  $inactivePayment = true;
62
  }
app/code/community/Novalnet/Payment/controllers/Adminhtml/{Configuration → Novalnetpayment/Configuration}/Wizard/PageController.php RENAMED
@@ -23,7 +23,7 @@
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_Adminhtml_Configuration_Wizard_PageController extends Mage_Adminhtml_Controller_Action
27
  {
28
  /**
29
  * Init layout, menu and breadcrumb
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_Adminhtml_Novalnetpayment_Configuration_Wizard_PageController extends Mage_Adminhtml_Controller_Action
27
  {
28
  /**
29
  * Init layout, menu and breadcrumb
app/code/community/Novalnet/Payment/controllers/Adminhtml/{Information → Novalnetpayment/Information}/ModuleController.php RENAMED
@@ -23,7 +23,7 @@
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_Adminhtml_Information_ModuleController extends Mage_Adminhtml_Controller_Action
27
  {
28
  /**
29
  * Render layout
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_Adminhtml_Novalnetpayment_Information_ModuleController extends Mage_Adminhtml_Controller_Action
27
  {
28
  /**
29
  * Render layout
app/code/community/Novalnet/Payment/controllers/Adminhtml/{Information → Novalnetpayment/Information}/NovalnetmerchantadminController.php RENAMED
@@ -23,7 +23,7 @@
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_Adminhtml_Information_NovalnetmerchantadminController extends Mage_Adminhtml_Controller_Action
27
  {
28
  /**
29
  * Render layout
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_Adminhtml_Novalnetpayment_Information_NovalnetmerchantadminController extends Mage_Adminhtml_Controller_Action
27
  {
28
  /**
29
  * Render layout
app/code/community/Novalnet/Payment/controllers/Adminhtml/{Sales → Novalnetpayment/Sales}/OrderController.php RENAMED
@@ -25,7 +25,7 @@
25
  */
26
  require_once 'Mage' . DS . 'Adminhtml' . DS . 'controllers' . DS . 'Sales' . DS . 'OrderController.php';
27
 
28
- class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sales_OrderController
29
  {
30
  var $moduleName = 'novalnet_payment';
31
 
@@ -108,7 +108,7 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
108
  $paymentCode = $paymentObj->getCode();
109
  $responseCodeApproved = Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED;
110
  $request = new Varien_Object();
111
- $storeId = $payment->getOrder()->getStoreId();
112
  $lastTranId = $helper->makeValidNumber($payment->getLastTransId());
113
  $paymentObj->assignOrderBasicParams($request, $payment, $storeId, $nominalItem);
114
  $request->setTid($lastTranId)
@@ -120,15 +120,15 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
120
  && $transStatus != $responseCodeApproved) {
121
  $buildNovalnetParam = http_build_query($request->getData());
122
  $payportUrl = $helper->getPayportUrl('paygate');
123
- $response = Mage::helper('novalnet_payment/AssignData')->setRawCallRequest($buildNovalnetParam, $payportUrl);
124
  $responseStatus = $response->getStatus();
125
  if ($responseStatus == $responseCodeApproved) {
126
  $captureMode = (version_compare($helper->getMagentoVersion(), '1.6', '<'))
127
  ? false : true;
128
  $loadTransStatus->setTransactionStatus($responseCodeApproved)
129
  ->save();
130
- $data = unserialize($payment->getAdditionalData());
131
- $data['captureTid'] = $lastTranId;
132
  $data['CaptureCreateAt'] = Mage::getModel('core/date')->date('Y-m-d H:i:s');
133
  $payment->setAdditionalData(serialize($data))
134
  ->save();
@@ -144,8 +144,8 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
144
  ->save();
145
  }
146
  }
147
- $this->setOrderStatus($order, 'confirmStatus');
148
- $customerId = $payment->getOrder()->getCustomerId();
149
  $paymentObj->logNovalnetTransactionData($request, $response, $payment->getLastTransId(), $customerId, $storeId);
150
  }
151
  if ($responseStatus != $responseCodeApproved) {
@@ -186,7 +186,7 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
186
  ->addObject($invoice)
187
  ->addObject($invoice->getOrder())
188
  ->save();
189
- if ($paymentCode != NULL) {
190
  $magentoVersion = Mage::helper('novalnet_payment')->getMagentoVersion();
191
  $transMode = (version_compare($magentoVersion, '1.6', '<'))
192
  ? false : true;
@@ -215,11 +215,13 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
215
  $incrementId = $order->getIncrementId();
216
  $currency = $order->getOrderCurrencyCode();
217
  $callbackTrans = $helper->loadCallbackValue($incrementId);
218
- $callbackValue = $callbackTrans && $callbackTrans->getCallbackAmount()!= NULL ? ($callbackTrans->getCallbackAmount() / 100) : '';
219
 
220
  try {
221
- if (empty($rawAmount) || !is_numeric($rawAmount) || $rawAmount < $callbackValue) {
222
- ($rawAmount < $callbackValue) ? Mage::throwException($helper->__('Customer already paid amount is ').$currency. ' ' .$callbackValue) : Mage::throwException('Enter the valid amount');
 
 
223
  }
224
 
225
  if ($order) {
@@ -228,7 +230,7 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
228
  $payment = $order->getPayment();
229
  $paymentObj = $payment->getMethodInstance();
230
  $paymentCode = $paymentObj->getCode();
231
- $lastTranId = $helper->makeValidNumber($payment->getLastTransId());
232
  $responseCodeApproved = Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED;
233
  $storeId = $order->getStoreId();
234
  $request = new Varien_Object();
@@ -238,22 +240,22 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
238
  ->setEditStatus(true)
239
  ->setUpdateInvAmount(1)
240
  ->setAmount($amountChanged);
241
- if ($invoiceDuedate != '') {
242
  $request->setDueDate($invoiceDuedate);
243
  }
244
 
245
  $amountChanged = $rawAmount;
246
  $loadTransStatus = $helper->loadTransactionStatus($lastTranId);
247
  $transStatus = $loadTransStatus->getTransactionStatus();
248
- // set transaction amount
249
- $loadTransStatus->setAmount($amountChanged)
250
  ->save();
251
 
252
  if (!in_array(NULL, $request->toArray()) && !empty($transStatus)) {
253
  $buildNovalnetParam = http_build_query($request->getData());
254
  $payportUrl = $helper->getPayportUrl('paygate');
255
  $dataHelper = Mage::helper('novalnet_payment/AssignData');
256
- $response = $dataHelper->setRawCallRequest($buildNovalnetParam, $payportUrl);
257
 
258
  if ($response->getStatus() == $responseCodeApproved) {
259
  // make capture transaction open for lower versions to make refund
@@ -265,8 +267,7 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
265
  $modNovalamountchanged = $helper->getModelAmountchanged();
266
  if ($paymentCode == Novalnet_Payment_Model_Config::NN_INVOICE || $paymentCode == Novalnet_Payment_Model_Config::NN_PREPAYMENT) {
267
  $data = unserialize($payment->getAdditionalData());
268
- if($invoiceDuedate != '')
269
- {
270
  $note = explode('|',$data['NnNote']);
271
  $formatDate = Mage::helper('core')->formatDate($invoiceDuedate);
272
  $note[0] = "Due Date: <b>$formatDate</b>";
@@ -285,7 +286,7 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
285
  ->setAmountDatetime($helper->getCurrentDateTime())
286
  ->save();
287
  if ($amountChanged == $callbackValue && $paymentCode == Novalnet_Payment_Model_Config::NN_PREPAYMENT) {
288
- $this->setOrderStatus($order);
289
  $this->saveInvoice($order,$lastTranId,$paymentCode);
290
  $this->setNNTotalPaid($order,$amountChanged);
291
  }
@@ -352,9 +353,9 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
352
  $payment = $order->getPayment();
353
  $storeId = $payment->getOrder()->getStoreId();
354
  $paymentObj = $payment->getMethodInstance();
355
- $orderStatus = $confirmStatus
356
- ? $paymentObj->_getConfigData('order_status', true)
357
- : $paymentObj->_getConfigData('order_status_after_payment', '', $storeId);
358
  $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $orderStatus, '', true)->save();
359
  }
360
  }
25
  */
26
  require_once 'Mage' . DS . 'Adminhtml' . DS . 'controllers' . DS . 'Sales' . DS . 'OrderController.php';
27
 
28
+ class Novalnet_Payment_Adminhtml_Novalnetpayment_Sales_OrderController extends Mage_Adminhtml_Sales_OrderController
29
  {
30
  var $moduleName = 'novalnet_payment';
31
 
108
  $paymentCode = $paymentObj->getCode();
109
  $responseCodeApproved = Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED;
110
  $request = new Varien_Object();
111
+ $storeId = $payment->getOrder()->getStoreId();
112
  $lastTranId = $helper->makeValidNumber($payment->getLastTransId());
113
  $paymentObj->assignOrderBasicParams($request, $payment, $storeId, $nominalItem);
114
  $request->setTid($lastTranId)
120
  && $transStatus != $responseCodeApproved) {
121
  $buildNovalnetParam = http_build_query($request->getData());
122
  $payportUrl = $helper->getPayportUrl('paygate');
123
+ $response = Mage::helper('novalnet_payment/AssignData')->setRawCallRequest($buildNovalnetParam, $payportUrl, $paymentObj);
124
  $responseStatus = $response->getStatus();
125
  if ($responseStatus == $responseCodeApproved) {
126
  $captureMode = (version_compare($helper->getMagentoVersion(), '1.6', '<'))
127
  ? false : true;
128
  $loadTransStatus->setTransactionStatus($responseCodeApproved)
129
  ->save();
130
+ $data = unserialize($payment->getAdditionalData());
131
+ $data['captureTid'] = $lastTranId;
132
  $data['CaptureCreateAt'] = Mage::getModel('core/date')->date('Y-m-d H:i:s');
133
  $payment->setAdditionalData(serialize($data))
134
  ->save();
144
  ->save();
145
  }
146
  }
147
+ $this->setOrderStatus($order, 'confirmStatus');
148
+ $customerId = $payment->getOrder()->getCustomerId();
149
  $paymentObj->logNovalnetTransactionData($request, $response, $payment->getLastTransId(), $customerId, $storeId);
150
  }
151
  if ($responseStatus != $responseCodeApproved) {
186
  ->addObject($invoice)
187
  ->addObject($invoice->getOrder())
188
  ->save();
189
+ if ($paymentCode) {
190
  $magentoVersion = Mage::helper('novalnet_payment')->getMagentoVersion();
191
  $transMode = (version_compare($magentoVersion, '1.6', '<'))
192
  ? false : true;
215
  $incrementId = $order->getIncrementId();
216
  $currency = $order->getOrderCurrencyCode();
217
  $callbackTrans = $helper->loadCallbackValue($incrementId);
218
+ $callbackValue = $callbackTrans && $callbackTrans->getCallbackAmount() ? ($callbackTrans->getCallbackAmount() / 100) : '';
219
 
220
  try {
221
+ if (empty($rawAmount) || !is_numeric($rawAmount)) {
222
+ Mage::throwException($helper->__('Enter the valid amount'));
223
+ } elseif ($invoiceDuedate && (strtotime($invoiceDuedate) < strtotime(date('Y-m-d')))) {
224
+ Mage::throwException($helper->__('The date should be in future'));
225
  }
226
 
227
  if ($order) {
230
  $payment = $order->getPayment();
231
  $paymentObj = $payment->getMethodInstance();
232
  $paymentCode = $paymentObj->getCode();
233
+ $lastTranId = $helper->makeValidNumber($payment->getLastTransId());
234
  $responseCodeApproved = Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED;
235
  $storeId = $order->getStoreId();
236
  $request = new Varien_Object();
240
  ->setEditStatus(true)
241
  ->setUpdateInvAmount(1)
242
  ->setAmount($amountChanged);
243
+ if ($invoiceDuedate) {
244
  $request->setDueDate($invoiceDuedate);
245
  }
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
267
  $modNovalamountchanged = $helper->getModelAmountchanged();
268
  if ($paymentCode == Novalnet_Payment_Model_Config::NN_INVOICE || $paymentCode == Novalnet_Payment_Model_Config::NN_PREPAYMENT) {
269
  $data = unserialize($payment->getAdditionalData());
270
+ if ($invoiceDuedate) {
 
271
  $note = explode('|',$data['NnNote']);
272
  $formatDate = Mage::helper('core')->formatDate($invoiceDuedate);
273
  $note[0] = "Due Date: <b>$formatDate</b>";
286
  ->setAmountDatetime($helper->getCurrentDateTime())
287
  ->save();
288
  if ($amountChanged == $callbackValue && $paymentCode == Novalnet_Payment_Model_Config::NN_PREPAYMENT) {
289
+ $this->setOrderStatus($order);
290
  $this->saveInvoice($order,$lastTranId,$paymentCode);
291
  $this->setNNTotalPaid($order,$amountChanged);
292
  }
353
  $payment = $order->getPayment();
354
  $storeId = $payment->getOrder()->getStoreId();
355
  $paymentObj = $payment->getMethodInstance();
356
+ $orderStatus = $confirmStatus
357
+ ? $paymentObj->getNovalnetConfig('order_status', true)
358
+ : $paymentObj->getNovalnetConfig('order_status_after_payment', '', $storeId);
359
  $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $orderStatus, '', true)->save();
360
  }
361
  }
app/code/community/Novalnet/Payment/controllers/Adminhtml/{Sales → Novalnetpayment/Sales}/Recurring/ProfileController.php RENAMED
@@ -26,7 +26,7 @@
26
 
27
  require_once 'Mage' . DS . 'Adminhtml'. DS . 'controllers' . DS . 'Sales' . DS . 'Recurring' . DS . 'ProfileController.php';
28
 
29
- class Novalnet_Payment_Adminhtml_Sales_Recurring_ProfileController extends Mage_Adminhtml_Sales_Recurring_ProfileController
30
  {
31
  /**
32
  * Recurring profiles list
26
 
27
  require_once 'Mage' . DS . 'Adminhtml'. DS . 'controllers' . DS . 'Sales' . DS . 'Recurring' . DS . 'ProfileController.php';
28
 
29
+ class Novalnet_Payment_Adminhtml_Novalnetpayment_Sales_Recurring_ProfileController extends Mage_Adminhtml_Sales_Recurring_ProfileController
30
  {
31
  /**
32
  * Recurring profiles list
app/code/community/Novalnet/Payment/controllers/Adminhtml/{TransactionController.php → Novalnetpayment/TransactionController.php} RENAMED
@@ -23,7 +23,7 @@
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_Adminhtml_TransactionController extends Mage_Adminhtml_Controller_Action
27
  {
28
  /**
29
  * Init layout, menu and breadcrumb
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_Adminhtml_Novalnetpayment_TransactionController extends Mage_Adminhtml_Controller_Action
27
  {
28
  /**
29
  * Init layout, menu and breadcrumb
app/code/community/Novalnet/Payment/controllers/Adminhtml/{TransactionoverviewController.php → Novalnetpayment/TransactionoverviewController.php} RENAMED
@@ -23,7 +23,7 @@
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_Adminhtml_TransactionoverviewController extends Mage_Adminhtml_Controller_Action
27
  {
28
  /**
29
  * Init layout, menu and breadcrumb
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_Adminhtml_Novalnetpayment_TransactionoverviewController extends Mage_Adminhtml_Controller_Action
27
  {
28
  /**
29
  * Init layout, menu and breadcrumb
app/code/community/Novalnet/Payment/controllers/Checkout/OnepageController.php ADDED
@@ -0,0 +1,118 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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
+ require_once 'Mage/Checkout/controllers/OnepageController.php';
27
+ class Novalnet_Payment_Checkout_OnepageController extends Mage_Checkout_OnepageController
28
+ {
29
+
30
+ /**
31
+ * Create order action
32
+ */
33
+ public function saveOrderAction()
34
+ {
35
+ $magentoVersion = Mage::helper("novalnet_payment")->getMagentoVersion();
36
+ $quote = Mage::getModel('checkout/cart')->getQuote();
37
+
38
+ if (!$quote->hasNominalItems() || version_compare($magentoVersion, '1.7', '>=')
39
+ || version_compare($magentoVersion, '1.5', '<')) {
40
+ return parent::saveOrderAction();
41
+ }
42
+
43
+ if ($this->_expireAjax()) {
44
+ return;
45
+ }
46
+
47
+ $result = array();
48
+ try {
49
+ if ($requiredAgreements = Mage::helper('checkout')->getRequiredAgreementIds()) {
50
+ $postedAgreements = array_keys($this->getRequest()->getPost('agreement', array()));
51
+ if ($diff = array_diff($requiredAgreements, $postedAgreements)) {
52
+ $result['success'] = false;
53
+ $result['error'] = true;
54
+ $result['error_messages'] = $this->__('Please agree to all the terms and conditions before placing the order.');
55
+ $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
56
+ return;
57
+ }
58
+ }
59
+ if ($data = $this->getRequest()->getPost('payment', false)) {
60
+ $this->getOnepage()->getQuote()->getPayment()->importData($data);
61
+ }
62
+ $this->getOnepage()->saveOrder();
63
+
64
+ $redirectUrl = $this->getOnepage()->getCheckout()->getRedirectUrl();
65
+ $result['success'] = true;
66
+ $result['error'] = false;
67
+ } catch (Mage_Payment_Model_Info_Exception $e) {
68
+ $message = $e->getMessage();
69
+ if( !empty($message) ) {
70
+ $result['error_messages'] = $message;
71
+ }
72
+ $result['goto_section'] = 'payment';
73
+ $result['update_section'] = array(
74
+ 'name' => 'payment-method',
75
+ 'html' => $this->_getPaymentMethodsHtml()
76
+ );
77
+ } catch (Mage_Core_Exception $e) {
78
+ Mage::logException($e);
79
+ Mage::helper('checkout')->sendPaymentFailedEmail($this->getOnepage()->getQuote(), $e->getMessage());
80
+ $result['success'] = false;
81
+ $result['error'] = true;
82
+ $result['error_messages'] = $e->getMessage();
83
+
84
+ if ($gotoSection = $this->getOnepage()->getCheckout()->getGotoSection()) {
85
+ $result['goto_section'] = $gotoSection;
86
+ $this->getOnepage()->getCheckout()->setGotoSection(null);
87
+ }
88
+
89
+ if ($updateSection = $this->getOnepage()->getCheckout()->getUpdateSection()) {
90
+ if (isset($this->_sectionUpdateFunctions[$updateSection])) {
91
+ $updateSectionFunction = $this->_sectionUpdateFunctions[$updateSection];
92
+ $result['update_section'] = array(
93
+ 'name' => $updateSection,
94
+ 'html' => $this->$updateSectionFunction()
95
+ );
96
+ }
97
+ $this->getOnepage()->getCheckout()->setUpdateSection(null);
98
+ }
99
+ } catch (Exception $e) {
100
+ Mage::logException($e);
101
+ Mage::helper('checkout')->sendPaymentFailedEmail($this->getOnepage()->getQuote(), $e->getMessage());
102
+ $result['success'] = false;
103
+ $result['error'] = true;
104
+ $result['error_messages'] = $this->__('There was an error processing your order. Please contact us or try again later.');
105
+ }
106
+ $this->getOnepage()->getQuote()->save();
107
+ /**
108
+ * when there is redirect to third party, we don't want to save order yet.
109
+ * we will save the order in return action.
110
+ */
111
+ if (isset($redirectUrl)) {
112
+ $result['redirect'] = $redirectUrl;
113
+ }
114
+
115
+ $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
116
+ }
117
+
118
+ }
app/code/community/Novalnet/Payment/controllers/GatewayController.php CHANGED
@@ -41,16 +41,11 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
41
  $session->getQuote()->setIsActive(true)->save();
42
  $redirectActionFlag = $paymentObj->getCode() . '_redirectAction';
43
 
44
- if ($payment->getAdditionalInformation($redirectActionFlag)
45
- != 1) {
46
  $payment->setAdditionalInformation($redirectActionFlag, 1);
47
- if ($session->getLastRealOrderId() && $items) {
48
- $state = Mage_Sales_Model_Order::STATE_HOLDED; //set State,Status to HOLD
49
- $status = Mage_Sales_Model_Order::STATE_HOLDED;
50
- $order->setState($state, $status, $this->_getNovalnetHelper()->__('Customer was redirected to Novalnet'), false)->save();
51
- } else {
52
- $this->_redirect('checkout/cart');
53
- }
54
  $this->getResponse()->setBody(
55
  $this->getLayout()
56
  ->createBlock(Novalnet_Payment_Model_Config::NOVALNET_REDIRECT_BLOCK)
@@ -111,7 +106,7 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
111
  $payment->setAdditionalInformation($errorActionFlag, 1);
112
  $dataObj = new Varien_Object($response);
113
  $paymentObj->saveCancelledOrder($dataObj, $payment);
114
- $statusMessage = ($dataObj->getStatusText() != NULL) ? $dataObj->getStatusText()
115
  : $dataObj->getStatusDesc();
116
  $helper->getCoresession()->addError($statusMessage);
117
  }
@@ -121,7 +116,7 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
121
  }
122
 
123
  /**
124
- * Recieve server response for Novalnet direct payment methods.
125
  *
126
  * Redirects to success or failure page.
127
  */
@@ -159,9 +154,9 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
159
  $paymentObj->unsetFormMethodSession();
160
  // unset payment request and response values
161
  $paymentObj->unsetPaymentReqResData();
162
- $actionUrl = $error !== false ? 'checkout/onepage/failure' : 'checkout/onepage/success';
163
  } else {
164
- $actionUrl = 'checkout/cart';
165
  }
166
 
167
  $this->_redirect($actionUrl);
@@ -242,7 +237,7 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
242
  $status = true;
243
  } else {
244
  $paymentObj->saveCancelledOrder($dataObj, $payment);
245
- $statusMessage = ($dataObj->getStatusText() != NULL) ? $dataObj->getStatusText()
246
  : $dataObj->getStatusDesc();
247
  $helper->getCoresession()->addError($statusMessage);
248
  $status = false;
@@ -283,13 +278,13 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
283
  }
284
  $payment->save();
285
 
286
- $setOrderAfterStatus = $paymentObj->_getConfigData('order_status_after_payment')
287
- ? $paymentObj->_getConfigData('order_status_after_payment')
288
  : Mage_Sales_Model_Order::STATE_PROCESSING; // If after status is empty set default status
289
  if ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_PAYPAL && $response['status']
290
  == Novalnet_Payment_Model_Config::PAYPAL_PENDING_CODE) {
291
- $setOrderAfterStatus = $paymentObj->_getConfigData('order_status')
292
- ? $paymentObj->_getConfigData('order_status') : Mage_Sales_Model_Order::STATE_PENDING_PAYMENT;
293
  }
294
  $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $setOrderAfterStatus, $helper->__('Customer successfully returned from Novalnet'), true
295
  )->save();
@@ -444,7 +439,7 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
444
  $serverResponse = ($paymentObj->getCode() != Novalnet_Payment_Model_Config::NN_CC)
445
  ? $this->_getNovalnetHelper()->getDecodedParam($response['test_mode'], $authorizeKey)
446
  : $response['test_mode'];
447
- $shopMode = $paymentObj->_getConfigData('live_mode');
448
  $testMode = (((isset($serverResponse) && $serverResponse == 1) || (isset($shopMode)
449
  && $shopMode == 0)) ? 1 : 0 );
450
  return $testMode;
41
  $session->getQuote()->setIsActive(true)->save();
42
  $redirectActionFlag = $paymentObj->getCode() . '_redirectAction';
43
 
44
+ if ($payment->getAdditionalInformation($redirectActionFlag) != 1
45
+ && $session->getLastRealOrderId() && $items) {
46
  $payment->setAdditionalInformation($redirectActionFlag, 1);
47
+ $status = $state = Mage_Sales_Model_Order::STATE_HOLDED; //set State,Status to HOLD
48
+ $order->setState($state, $status, $this->_getNovalnetHelper()->__('Customer was redirected to Novalnet'), false)->save();
 
 
 
 
 
49
  $this->getResponse()->setBody(
50
  $this->getLayout()
51
  ->createBlock(Novalnet_Payment_Model_Config::NOVALNET_REDIRECT_BLOCK)
106
  $payment->setAdditionalInformation($errorActionFlag, 1);
107
  $dataObj = new Varien_Object($response);
108
  $paymentObj->saveCancelledOrder($dataObj, $payment);
109
+ $statusMessage = ($dataObj->getStatusText()) ? $dataObj->getStatusText()
110
  : $dataObj->getStatusDesc();
111
  $helper->getCoresession()->addError($statusMessage);
112
  }
116
  }
117
 
118
  /**
119
+ * Receive server response for Novalnet direct payment methods.
120
  *
121
  * Redirects to success or failure page.
122
  */
154
  $paymentObj->unsetFormMethodSession();
155
  // unset payment request and response values
156
  $paymentObj->unsetPaymentReqResData();
157
+ $actionUrl = $error !== false ? 'checkout/onepage/failure' : 'checkout/onepage/success';
158
  } else {
159
+ $actionUrl = 'checkout/cart';
160
  }
161
 
162
  $this->_redirect($actionUrl);
237
  $status = true;
238
  } else {
239
  $paymentObj->saveCancelledOrder($dataObj, $payment);
240
+ $statusMessage = ($dataObj->getStatusText()) ? $dataObj->getStatusText()
241
  : $dataObj->getStatusDesc();
242
  $helper->getCoresession()->addError($statusMessage);
243
  $status = false;
278
  }
279
  $payment->save();
280
 
281
+ $setOrderAfterStatus = $paymentObj->getNovalnetConfig('order_status_after_payment')
282
+ ? $paymentObj->getNovalnetConfig('order_status_after_payment')
283
  : Mage_Sales_Model_Order::STATE_PROCESSING; // If after status is empty set default status
284
  if ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_PAYPAL && $response['status']
285
  == Novalnet_Payment_Model_Config::PAYPAL_PENDING_CODE) {
286
+ $setOrderAfterStatus = $paymentObj->getNovalnetConfig('order_status')
287
+ ? $paymentObj->getNovalnetConfig('order_status') : Mage_Sales_Model_Order::STATE_PENDING_PAYMENT;
288
  }
289
  $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $setOrderAfterStatus, $helper->__('Customer successfully returned from Novalnet'), true
290
  )->save();
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 );
445
  return $testMode;
app/code/community/Novalnet/Payment/etc/adminhtml.xml CHANGED
@@ -34,12 +34,12 @@
34
  <sales_order module="novalnet_payment">
35
  <title>Orders</title>
36
  <sort_order>1</sort_order>
37
- <action>novalnet_payment/adminhtml_sales_order</action>
38
  </sales_order>
39
  <sales_recurring module="novalnet_payment">
40
  <title>Recurring Profiles</title>
41
  <sort_order>2</sort_order>
42
- <action>novalnet_payment/adminhtml_sales_recurring_profile</action>
43
  </sales_recurring>
44
  <transaction module="novalnet_payment">
45
  <title>Novalnet Transactions</title>
@@ -48,12 +48,12 @@
48
  <transactionStatus module="novalnet_payment">
49
  <title>Novalnet Transactions Overview</title>
50
  <sort_order>1</sort_order>
51
- <action>novalnet_payment/adminhtml_transaction</action>
52
  </transactionStatus>
53
  <transactionOverivew module="novalnet_payment">
54
  <title>Novalnet Transactions Log</title>
55
  <sort_order>2</sort_order>
56
- <action>novalnet_payment/adminhtml_transactionoverview</action>
57
  </transactionOverivew>
58
  </children>
59
  </transaction>
@@ -65,7 +65,7 @@
65
  <configuration_wizard module="novalnet_payment">
66
  <title>Configuration-wizard</title>
67
  <sort_order>5</sort_order>
68
- <action>novalnet_payment/adminhtml_configuration_wizard_page</action>
69
  </configuration_wizard>
70
  <configuration module="novalnet_payment">
71
  <title>Configuration</title>
@@ -90,19 +90,19 @@
90
  <novalnetmerchantadmin module="novalnet_payment">
91
  <title>Novalnet Merchant Admin</title>
92
  <sort_order>1</sort_order>
93
- <action>novalnet_payment/adminhtml_information_novalnetmerchantadmin/</action>
94
  </novalnetmerchantadmin>
95
  <information module="novalnet_payment">
96
  <title>Novalnet Magento Module</title>
97
  <sort_order>2</sort_order>
98
- <action>novalnet_payment/adminhtml_information_module/</action>
99
  </information>
100
  </children>
101
  </information>
102
  </children>
103
  </novalnet>
104
  </menu>
105
- <!-- Access control-->
106
  <acl>
107
  <resources>
108
  <admin>
34
  <sales_order module="novalnet_payment">
35
  <title>Orders</title>
36
  <sort_order>1</sort_order>
37
+ <action>adminhtml/novalnetpayment_sales_order</action>
38
  </sales_order>
39
  <sales_recurring module="novalnet_payment">
40
  <title>Recurring Profiles</title>
41
  <sort_order>2</sort_order>
42
+ <action>adminhtml/novalnetpayment_sales_recurring_profile</action>
43
  </sales_recurring>
44
  <transaction module="novalnet_payment">
45
  <title>Novalnet Transactions</title>
48
  <transactionStatus module="novalnet_payment">
49
  <title>Novalnet Transactions Overview</title>
50
  <sort_order>1</sort_order>
51
+ <action>adminhtml/novalnetpayment_transaction</action>
52
  </transactionStatus>
53
  <transactionOverivew module="novalnet_payment">
54
  <title>Novalnet Transactions Log</title>
55
  <sort_order>2</sort_order>
56
+ <action>adminhtml/novalnetpayment_transactionoverview</action>
57
  </transactionOverivew>
58
  </children>
59
  </transaction>
65
  <configuration_wizard module="novalnet_payment">
66
  <title>Configuration-wizard</title>
67
  <sort_order>5</sort_order>
68
+ <action>adminhtml/novalnetpayment_configuration_wizard_page</action>
69
  </configuration_wizard>
70
  <configuration module="novalnet_payment">
71
  <title>Configuration</title>
90
  <novalnetmerchantadmin module="novalnet_payment">
91
  <title>Novalnet Merchant Admin</title>
92
  <sort_order>1</sort_order>
93
+ <action>adminhtml/novalnetpayment_information_novalnetmerchantadmin/</action>
94
  </novalnetmerchantadmin>
95
  <information module="novalnet_payment">
96
  <title>Novalnet Magento Module</title>
97
  <sort_order>2</sort_order>
98
+ <action>adminhtml/novalnetpayment_information_module/</action>
99
  </information>
100
  </children>
101
  </information>
102
  </children>
103
  </novalnet>
104
  </menu>
105
+ <!-- Access control list-->
106
  <acl>
107
  <resources>
108
  <admin>
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.0.0</version>
33
  </Novalnet_Payment>
34
  </modules>
35
 
@@ -66,11 +66,6 @@
66
  <adminhtml_recurring_profile_view>Novalnet_Payment_Block_Sales_Adminhtml_Recurring_Profile_View</adminhtml_recurring_profile_view>
67
  </rewrite>
68
  </sales>
69
- <checkout>
70
- <rewrite>
71
- <cart_item_renderer>Novalnet_Payment_Block_Cart_Item_Renderer</cart_item_renderer>
72
- </rewrite>
73
- </checkout>
74
  </blocks>
75
 
76
  <!-- declare model group for new module -->
@@ -87,6 +82,7 @@
87
  <order_pdf_invoice>Novalnet_Payment_Model_Sales_Order_Pdf_Invoice</order_pdf_invoice>
88
  <order_pdf_creditmemo>Novalnet_Payment_Model_Sales_Order_Pdf_Creditmemo</order_pdf_creditmemo>
89
  <recurring_profile>Novalnet_Payment_Model_Recurring_Profile</recurring_profile>
 
90
  <quote_address_total_nominal>Novalnet_Payment_Model_Quote_Address_Total_Nominal</quote_address_total_nominal>
91
  </rewrite>
92
  </sales>
@@ -192,22 +188,6 @@
192
  <novalnet>Novalnet</novalnet>
193
  </groups>
194
  </payment>
195
- <sales>
196
- <order_creditmemo>
197
- <totals>
198
- <novalnet_payment>
199
- <class>novalnet_payment/sales_creditmemo_total</class>
200
- <after>subtotal,discount,shipping</after>
201
- <before>tax,grand_total</before>
202
- </novalnet_payment>
203
- <novalnet_payment_tax>
204
- <class>novalnet_payment/sales_creditmemo_tax</class>
205
- <after>subtotal,discount,shipping,tax</after>
206
- <before>grand_total</before>
207
- </novalnet_payment_tax>
208
- </totals>
209
- </order_creditmemo>
210
- </sales>
211
  <events>
212
  <core_block_abstract_prepare_layout_before>
213
  <observers>
@@ -244,6 +224,15 @@
244
  </novalnet_payment_order_observer_creditmemo_send_email>
245
  </observers>
246
  </sales_order_creditmemo_refund>
 
 
 
 
 
 
 
 
 
247
  </events>
248
  </global>
249
 
@@ -275,6 +264,13 @@
275
  <frontName>novalnet_payment</frontName>
276
  </args>
277
  </novalnet_payment>
 
 
 
 
 
 
 
278
  </routers>
279
  <translate>
280
  <modules>
@@ -296,13 +292,6 @@
296
 
297
  <admin>
298
  <routers>
299
- <novalnet_payment>
300
- <use>admin</use>
301
- <args>
302
- <module>Novalnet_Payment</module>
303
- <frontName>novalnet_payment</frontName>
304
- </args>
305
- </novalnet_payment>
306
  <adminhtml>
307
  <args>
308
  <modules>
@@ -316,8 +305,11 @@
316
  <default>
317
  <novalnet_global>
318
  <novalnet>
319
- <gateway_timeout>240</gateway_timeout>
320
  </novalnet>
 
 
 
321
  </novalnet_global>
322
  <!-- 'payment' configuration section (tab) -->
323
  <payment>
@@ -331,6 +323,9 @@
331
  <title>Novalnet Kauf auf Rechnung</title>
332
  <allowspecific>0</allowspecific>
333
  <group>novalnet</group>
 
 
 
334
  </novalnetInvoice>
335
  <novalnetPrepayment translate="title" module="novalnet_payment">
336
  <active>0</active>
@@ -338,6 +333,9 @@
338
  <title>Novalnet Vorauskasse</title>
339
  <allowspecific>0</allowspecific>
340
  <group>novalnet</group>
 
 
 
341
  </novalnetPrepayment>
342
  <novalnetCc translate="title" module="novalnet_payment">
343
  <cctypes>VI,MC</cctypes>
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
 
66
  <adminhtml_recurring_profile_view>Novalnet_Payment_Block_Sales_Adminhtml_Recurring_Profile_View</adminhtml_recurring_profile_view>
67
  </rewrite>
68
  </sales>
 
 
 
 
 
69
  </blocks>
70
 
71
  <!-- declare model group for new module -->
82
  <order_pdf_invoice>Novalnet_Payment_Model_Sales_Order_Pdf_Invoice</order_pdf_invoice>
83
  <order_pdf_creditmemo>Novalnet_Payment_Model_Sales_Order_Pdf_Creditmemo</order_pdf_creditmemo>
84
  <recurring_profile>Novalnet_Payment_Model_Recurring_Profile</recurring_profile>
85
+ <order_creditmemo_total_grand>Novalnet_Payment_Model_Sales_Order_Creditmemo_Total_Grand</order_creditmemo_total_grand>
86
  <quote_address_total_nominal>Novalnet_Payment_Model_Quote_Address_Total_Nominal</quote_address_total_nominal>
87
  </rewrite>
88
  </sales>
188
  <novalnet>Novalnet</novalnet>
189
  </groups>
190
  </payment>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
191
  <events>
192
  <core_block_abstract_prepare_layout_before>
193
  <observers>
224
  </novalnet_payment_order_observer_creditmemo_send_email>
225
  </observers>
226
  </sales_order_creditmemo_refund>
227
+ <checkout_cart_save_after>
228
+ <observers>
229
+ <novalnet_payment_cart_save_after>
230
+ <type>singleton</type>
231
+ <class>Novalnet_Payment_Model_Observer</class>
232
+ <method>getProfilePeriodValues</method>
233
+ </novalnet_payment_cart_save_after>
234
+ </observers>
235
+ </checkout_cart_save_after>
236
  </events>
237
  </global>
238
 
264
  <frontName>novalnet_payment</frontName>
265
  </args>
266
  </novalnet_payment>
267
+ <checkout>
268
+ <args>
269
+ <modules>
270
+ <Novalnet_Payment before="Mage_Checkout">Novalnet_Payment_Checkout</Novalnet_Payment>
271
+ </modules>
272
+ </args>
273
+ </checkout>
274
  </routers>
275
  <translate>
276
  <modules>
292
 
293
  <admin>
294
  <routers>
 
 
 
 
 
 
 
295
  <adminhtml>
296
  <args>
297
  <modules>
305
  <default>
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>
323
  <title>Novalnet Kauf auf Rechnung</title>
324
  <allowspecific>0</allowspecific>
325
  <group>novalnet</group>
326
+ <payment_ref_one>1</payment_ref_one>
327
+ <payment_ref_two>1</payment_ref_two>
328
+ <payment_ref_three>1</payment_ref_three>
329
  </novalnetInvoice>
330
  <novalnetPrepayment translate="title" module="novalnet_payment">
331
  <active>0</active>
333
  <title>Novalnet Vorauskasse</title>
334
  <allowspecific>0</allowspecific>
335
  <group>novalnet</group>
336
+ <payment_ref_one>1</payment_ref_one>
337
+ <payment_ref_two>1</payment_ref_two>
338
+ <payment_ref_three>1</payment_ref_three>
339
  </novalnetPrepayment>
340
  <novalnetCc translate="title" module="novalnet_payment">
341
  <cctypes>VI,MC</cctypes>
app/code/community/Novalnet/Payment/etc/system.xml CHANGED
@@ -98,15 +98,26 @@
98
  <comment>Enter Novalnet subscription tariff ID</comment>
99
  <frontend_type>text</frontend_type>
100
  <sort_order>5</sort_order>
 
101
  <show_in_default>1</show_in_default>
102
  <show_in_website>1</show_in_website>
103
  <show_in_store>1</show_in_store>
104
  </subscrib_tariff_id>
 
 
 
 
 
 
 
 
 
 
105
  <password translate="label">
106
  <label>Payment access key</label>
107
  <comment>Enter the Novalnet payment access key</comment>
108
  <frontend_type>text</frontend_type>
109
- <sort_order>6</sort_order>
110
  <show_in_default>1</show_in_default>
111
  <show_in_website>1</show_in_website>
112
  <show_in_store>1</show_in_store>
@@ -116,7 +127,7 @@
116
  <comment>Manual checking of order description</comment>
117
  <frontend_type>text</frontend_type>
118
  <validate>validate-greater-than-zero validate-digits</validate>
119
- <sort_order>7</sort_order>
120
  <show_in_default>1</show_in_default>
121
  <show_in_website>1</show_in_website>
122
  <show_in_store>1</show_in_store>
@@ -127,7 +138,7 @@
127
  <frontend_type>multiselect</frontend_type>
128
  <source_model>novalnet_payment/system_config_activemethods</source_model>
129
  <can_be_empty>1</can_be_empty>
130
- <sort_order>8</sort_order>
131
  <show_in_default>1</show_in_default>
132
  <show_in_website>1</show_in_website>
133
  <show_in_store>1</show_in_store>
@@ -136,7 +147,7 @@
136
  <label>Referrer ID</label>
137
  <comment>Referrer id description</comment>
138
  <frontend_type>text</frontend_type>
139
- <sort_order>9</sort_order>
140
  <validate>validate-digits</validate>
141
  <show_in_default>1</show_in_default>
142
  <show_in_website>1</show_in_website>
@@ -147,7 +158,7 @@
147
  <comment>Autofill description</comment>
148
  <frontend_type>select</frontend_type>
149
  <source_model>adminhtml/system_config_source_yesno</source_model>
150
- <sort_order>10</sort_order>
151
  <show_in_default>1</show_in_default>
152
  <show_in_website>1</show_in_website>
153
  <show_in_store>1</show_in_store>
@@ -157,14 +168,16 @@
157
  <comment>Payment last success description</comment>
158
  <frontend_type>select</frontend_type>
159
  <source_model>adminhtml/system_config_source_yesno</source_model>
160
- <sort_order>11</sort_order>
161
  <show_in_default>1</show_in_default>
162
- </payment_last_success>
163
- <use_proxy translate="label">
164
- <label>Use Proxy</label>
 
 
165
  <frontend_type>select</frontend_type>
166
  <source_model>adminhtml/system_config_source_yesno</source_model>
167
- <sort_order>12</sort_order>
168
  <show_in_default>1</show_in_default>
169
  <show_in_website>1</show_in_website>
170
  <shared>1</shared>
@@ -172,45 +185,49 @@
172
  <proxy_host translate="label">
173
  <label>Proxy Host</label>
174
  <frontend_type>text</frontend_type>
175
- <sort_order>13</sort_order>
176
  <show_in_default>1</show_in_default>
177
  <show_in_website>1</show_in_website>
178
- <depends><use_proxy>1</use_proxy></depends>
 
 
179
  <shared>1</shared>
180
  </proxy_host>
181
  <proxy_port translate="label">
182
  <label>Proxy Port</label>
183
  <frontend_type>text</frontend_type>
184
- <sort_order>14</sort_order>
185
  <show_in_default>1</show_in_default>
186
  <show_in_website>1</show_in_website>
187
- <depends><use_proxy>1</use_proxy></depends>
 
 
188
  <shared>1</shared>
189
  </proxy_port>
190
  <order_status translate="label">
191
  <label>OnHold transaction completion status</label>
192
  <frontend_type>select</frontend_type>
193
  <source_model>adminhtml/system_config_source_order_status</source_model>
194
- <sort_order>15</sort_order>
195
  <show_in_default>1</show_in_default>
196
  <show_in_website>1</show_in_website>
197
  <show_in_store>1</show_in_store>
198
- </order_status>
199
- <void_status translate="label">
200
  <label>OnHold cancellation / VOID Transaction status</label>
201
  <frontend_type>select</frontend_type>
202
  <source_model>adminhtml/system_config_source_order_status</source_model>
203
- <sort_order>16</sort_order>
204
  <show_in_default>1</show_in_default>
205
  <show_in_website>1</show_in_website>
206
  <show_in_store>1</show_in_store>
207
- </void_status>
208
  <gateway_timeout translate="label">
209
  <label>Gateway timeout</label>
210
  <comment>Gateway timeout description</comment>
211
  <frontend_type>text</frontend_type>
212
  <validate>validate-digits</validate>
213
- <sort_order>17</sort_order>
214
  <show_in_default>1</show_in_default>
215
  <show_in_website>1</show_in_website>
216
  <show_in_store>1</show_in_store>
@@ -229,16 +246,13 @@
229
  <label>Enable debug mode</label>
230
  <comment>Debug mode description</comment>
231
  <frontend_type>select</frontend_type>
232
- <config_path>payment/novalnetcallback/enabledebugmode</config_path>
233
  <source_model>adminhtml/system_config_source_yesno</source_model>
234
  <sort_order>1</sort_order>
235
  <show_in_default>1</show_in_default>
236
  </enabledebugmode>
237
  <enabletestmode translate="label">
238
  <label>Enable test mode</label>
239
- <comment>Test mode description</comment>
240
  <frontend_type>select</frontend_type>
241
- <config_path>payment/novalnetcallback/enabletestmode</config_path>
242
  <source_model>adminhtml/system_config_source_yesno</source_model>
243
  <sort_order>2</sort_order>
244
  <show_in_default>1</show_in_default>
@@ -246,7 +260,6 @@
246
  <emailsendoption translate="label">
247
  <label>Enable E-mail notification for callback</label>
248
  <frontend_type>select</frontend_type>
249
- <config_path>payment/novalnetcallback/emailsendoption</config_path>
250
  <source_model>adminhtml/system_config_source_yesno</source_model>
251
  <sort_order>3</sort_order>
252
  <show_in_default>1</show_in_default>
@@ -257,7 +270,6 @@
257
  <label>E-mail To Address</label>
258
  <comment>Email To address description</comment>
259
  <frontend_type>text</frontend_type>
260
- <config_path>payment/novalnetcallback/emailtoaddr</config_path>
261
  <sort_order>4</sort_order>
262
  <show_in_default>1</show_in_default>
263
  <show_in_website>1</show_in_website>
@@ -267,7 +279,6 @@
267
  <label>E-mail Bcc Address</label>
268
  <comment>Email Bcc address description</comment>
269
  <frontend_type>text</frontend_type>
270
- <config_path>payment/novalnetcallback/emailBcc</config_path>
271
  <sort_order>5</sort_order>
272
  <show_in_default>1</show_in_default>
273
  <show_in_website>1</show_in_website>
@@ -367,7 +378,7 @@
367
  </depends>
368
  </order_status_after_payment>
369
  <cctypes translate="label">
370
- <label>Credit Card Types</label>
371
  <frontend_type>multiselect</frontend_type>
372
  <config_path>payment/novalnetCc/cctypes</config_path>
373
  <source_model>novalnet_payment/novalnet_source_cctype</source_model>
@@ -752,12 +763,42 @@
752
  <show_in_website>1</show_in_website>
753
  <show_in_store>1</show_in_store>
754
  </payment_duration>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
755
  <user_group_excluded translate="label">
756
  <label>User Group Excluded</label>
757
  <comment>Excluded User Group description</comment>
758
  <frontend_type>text</frontend_type>
759
  <config_path>payment/novalnetInvoice/user_group_excluded</config_path>
760
- <sort_order>9</sort_order>
761
  <show_in_default>1</show_in_default>
762
  <show_in_website>1</show_in_website>
763
  <show_in_store>1</show_in_store>
@@ -766,7 +807,7 @@
766
  <label>Payment from applicable countries</label>
767
  <frontend_type>select</frontend_type>
768
  <config_path>payment/novalnetInvoice/allowspecific</config_path>
769
- <sort_order>10</sort_order>
770
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
771
  <show_in_default>1</show_in_default>
772
  <show_in_website>1</show_in_website>
@@ -776,7 +817,7 @@
776
  <label>Payment from Specific countries</label>
777
  <frontend_type>multiselect</frontend_type>
778
  <config_path>payment/novalnetInvoice/specificcountry</config_path>
779
- <sort_order>11</sort_order>
780
  <source_model>adminhtml/system_config_source_country</source_model>
781
  <show_in_default>1</show_in_default>
782
  <show_in_website>1</show_in_website>
@@ -790,7 +831,7 @@
790
  <frontend_type>text</frontend_type>
791
  <config_path>payment/novalnetInvoice/min_order_total</config_path>
792
  <validate>validate-number</validate>
793
- <sort_order>12</sort_order>
794
  <show_in_default>1</show_in_default>
795
  <show_in_website>1</show_in_website>
796
  <show_in_store>1</show_in_store>
@@ -800,7 +841,7 @@
800
  <frontend_type>text</frontend_type>
801
  <config_path>payment/novalnetInvoice/max_order_total</config_path>
802
  <validate>validate-number</validate>
803
- <sort_order>13</sort_order>
804
  <show_in_default>1</show_in_default>
805
  <show_in_website>1</show_in_website>
806
  <show_in_store>1</show_in_store>
@@ -811,7 +852,7 @@
811
  <frontend_type>text</frontend_type>
812
  <config_path>payment/novalnetInvoice/orderscount</config_path>
813
  <validate>validate-digits</validate>
814
- <sort_order>14</sort_order>
815
  <show_in_default>1</show_in_default>
816
  <show_in_website>1</show_in_website>
817
  <show_in_store>1</show_in_store>
@@ -822,7 +863,7 @@
822
  <frontend_type>text</frontend_type>
823
  <config_path>payment/novalnetInvoice/sort_order</config_path>
824
  <validate>validate-digits</validate>
825
- <sort_order>15</sort_order>
826
  <show_in_default>1</show_in_default>
827
  <show_in_website>1</show_in_website>
828
  <show_in_store>1</show_in_store>
@@ -908,12 +949,42 @@
908
  <show_in_website>1</show_in_website>
909
  <show_in_store>1</show_in_store>
910
  </reference_two>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
911
  <user_group_excluded translate="label">
912
  <label>User Group Excluded</label>
913
  <comment>Excluded User Group description</comment>
914
  <frontend_type>text</frontend_type>
915
  <config_path>payment/novalnetPrepayment/user_group_excluded</config_path>
916
- <sort_order>8</sort_order>
917
  <show_in_default>1</show_in_default>
918
  <show_in_website>1</show_in_website>
919
  <show_in_store>1</show_in_store>
@@ -923,7 +994,7 @@
923
  <frontend_type>select</frontend_type>
924
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
925
  <config_path>payment/novalnetPrepayment/allowspecific</config_path>
926
- <sort_order>9</sort_order>
927
  <show_in_default>1</show_in_default>
928
  <show_in_website>1</show_in_website>
929
  <show_in_store>1</show_in_store>
@@ -933,7 +1004,7 @@
933
  <frontend_type>multiselect</frontend_type>
934
  <source_model>adminhtml/system_config_source_country</source_model>
935
  <config_path>payment/novalnetPrepayment/specificcountry</config_path>
936
- <sort_order>10</sort_order>
937
  <show_in_default>1</show_in_default>
938
  <show_in_website>1</show_in_website>
939
  <show_in_store>1</show_in_store>
@@ -946,7 +1017,7 @@
946
  <frontend_type>text</frontend_type>
947
  <config_path>payment/novalnetPrepayment/min_order_total</config_path>
948
  <validate>validate-number</validate>
949
- <sort_order>11</sort_order>
950
  <show_in_default>1</show_in_default>
951
  <show_in_website>1</show_in_website>
952
  <show_in_store>1</show_in_store>
@@ -956,7 +1027,7 @@
956
  <frontend_type>text</frontend_type>
957
  <config_path>payment/novalnetPrepayment/max_order_total</config_path>
958
  <validate>validate-number</validate>
959
- <sort_order>12</sort_order>
960
  <show_in_default>1</show_in_default>
961
  <show_in_website>1</show_in_website>
962
  <show_in_store>1</show_in_store>
@@ -966,7 +1037,7 @@
966
  <frontend_type>text</frontend_type>
967
  <config_path>payment/novalnetPrepayment/orderscount</config_path>
968
  <validate>validate-digits</validate>
969
- <sort_order>13</sort_order>
970
  <comment>Novalnet Minimum Orders Count Desc</comment>
971
  <show_in_default>1</show_in_default>
972
  <show_in_website>1</show_in_website>
@@ -978,7 +1049,7 @@
978
  <frontend_type>text</frontend_type>
979
  <config_path>payment/novalnetPrepayment/sort_order</config_path>
980
  <validate>validate-digits</validate>
981
- <sort_order>14</sort_order>
982
  <show_in_default>1</show_in_default>
983
  <show_in_website>1</show_in_website>
984
  <show_in_store>1</show_in_store>
98
  <comment>Enter Novalnet subscription tariff ID</comment>
99
  <frontend_type>text</frontend_type>
100
  <sort_order>5</sort_order>
101
+ <validate>validate-digits</validate>
102
  <show_in_default>1</show_in_default>
103
  <show_in_website>1</show_in_website>
104
  <show_in_store>1</show_in_store>
105
  </subscrib_tariff_id>
106
+ <subsequent_period translate="label">
107
+ <label>Period for subsequent subscription cycle</label>
108
+ <comment>The period of the subsequent subscription cycle (E.g: 1d/1m/1y)</comment>
109
+ <frontend_type>text</frontend_type>
110
+ <sort_order>6</sort_order>
111
+ <validate>validate-alphanum</validate>
112
+ <show_in_default>1</show_in_default>
113
+ <show_in_website>1</show_in_website>
114
+ <show_in_store>1</show_in_store>
115
+ </subsequent_period>
116
  <password translate="label">
117
  <label>Payment access key</label>
118
  <comment>Enter the Novalnet payment access key</comment>
119
  <frontend_type>text</frontend_type>
120
+ <sort_order>7</sort_order>
121
  <show_in_default>1</show_in_default>
122
  <show_in_website>1</show_in_website>
123
  <show_in_store>1</show_in_store>
127
  <comment>Manual checking of order description</comment>
128
  <frontend_type>text</frontend_type>
129
  <validate>validate-greater-than-zero validate-digits</validate>
130
+ <sort_order>8</sort_order>
131
  <show_in_default>1</show_in_default>
132
  <show_in_website>1</show_in_website>
133
  <show_in_store>1</show_in_store>
138
  <frontend_type>multiselect</frontend_type>
139
  <source_model>novalnet_payment/system_config_activemethods</source_model>
140
  <can_be_empty>1</can_be_empty>
141
+ <sort_order>9</sort_order>
142
  <show_in_default>1</show_in_default>
143
  <show_in_website>1</show_in_website>
144
  <show_in_store>1</show_in_store>
147
  <label>Referrer ID</label>
148
  <comment>Referrer id description</comment>
149
  <frontend_type>text</frontend_type>
150
+ <sort_order>10</sort_order>
151
  <validate>validate-digits</validate>
152
  <show_in_default>1</show_in_default>
153
  <show_in_website>1</show_in_website>
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>
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>
175
+ </payment_last_success>
176
+ <use_proxy translate="label">
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
  <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>
192
+ <use_proxy>1</use_proxy>
193
+ </depends>
194
  <shared>1</shared>
195
  </proxy_host>
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>
203
+ <use_proxy>1</use_proxy>
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>
210
  <source_model>adminhtml/system_config_source_order_status</source_model>
211
+ <sort_order>16</sort_order>
212
  <show_in_default>1</show_in_default>
213
  <show_in_website>1</show_in_website>
214
  <show_in_store>1</show_in_store>
215
+ </order_status>
216
+ <void_status translate="label">
217
  <label>OnHold cancellation / VOID Transaction status</label>
218
  <frontend_type>select</frontend_type>
219
  <source_model>adminhtml/system_config_source_order_status</source_model>
220
+ <sort_order>17</sort_order>
221
  <show_in_default>1</show_in_default>
222
  <show_in_website>1</show_in_website>
223
  <show_in_store>1</show_in_store>
224
+ </void_status>
225
  <gateway_timeout translate="label">
226
  <label>Gateway timeout</label>
227
  <comment>Gateway timeout description</comment>
228
  <frontend_type>text</frontend_type>
229
  <validate>validate-digits</validate>
230
+ <sort_order>18</sort_order>
231
  <show_in_default>1</show_in_default>
232
  <show_in_website>1</show_in_website>
233
  <show_in_store>1</show_in_store>
246
  <label>Enable debug mode</label>
247
  <comment>Debug mode description</comment>
248
  <frontend_type>select</frontend_type>
 
249
  <source_model>adminhtml/system_config_source_yesno</source_model>
250
  <sort_order>1</sort_order>
251
  <show_in_default>1</show_in_default>
252
  </enabledebugmode>
253
  <enabletestmode translate="label">
254
  <label>Enable test mode</label>
 
255
  <frontend_type>select</frontend_type>
 
256
  <source_model>adminhtml/system_config_source_yesno</source_model>
257
  <sort_order>2</sort_order>
258
  <show_in_default>1</show_in_default>
260
  <emailsendoption translate="label">
261
  <label>Enable E-mail notification for callback</label>
262
  <frontend_type>select</frontend_type>
 
263
  <source_model>adminhtml/system_config_source_yesno</source_model>
264
  <sort_order>3</sort_order>
265
  <show_in_default>1</show_in_default>
270
  <label>E-mail To Address</label>
271
  <comment>Email To address description</comment>
272
  <frontend_type>text</frontend_type>
 
273
  <sort_order>4</sort_order>
274
  <show_in_default>1</show_in_default>
275
  <show_in_website>1</show_in_website>
279
  <label>E-mail Bcc Address</label>
280
  <comment>Email Bcc address description</comment>
281
  <frontend_type>text</frontend_type>
 
282
  <sort_order>5</sort_order>
283
  <show_in_default>1</show_in_default>
284
  <show_in_website>1</show_in_website>
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>
763
  <show_in_website>1</show_in_website>
764
  <show_in_store>1</show_in_store>
765
  </payment_duration>
766
+ <payment_ref_one translate="label">
767
+ <label>payment reference one</label>
768
+ <frontend_type>select</frontend_type>
769
+ <source_model>adminhtml/system_config_source_yesno</source_model>
770
+ <config_path>payment/novalnetInvoice/payment_ref_one</config_path>
771
+ <sort_order>9</sort_order>
772
+ <show_in_default>1</show_in_default>
773
+ <show_in_website>1</show_in_website>
774
+ <show_in_store>1</show_in_store>
775
+ </payment_ref_one>
776
+ <payment_ref_two translate="label">
777
+ <label>payment reference two</label>
778
+ <frontend_type>select</frontend_type>
779
+ <source_model>adminhtml/system_config_source_yesno</source_model>
780
+ <config_path>payment/novalnetInvoice/payment_ref_two</config_path>
781
+ <sort_order>10</sort_order>
782
+ <show_in_default>1</show_in_default>
783
+ <show_in_website>1</show_in_website>
784
+ <show_in_store>1</show_in_store>
785
+ </payment_ref_two>
786
+ <payment_ref_three translate="label">
787
+ <label>payment reference three</label>
788
+ <frontend_type>select</frontend_type>
789
+ <source_model>adminhtml/system_config_source_yesno</source_model>
790
+ <config_path>payment/novalnetInvoice/payment_ref_three</config_path>
791
+ <sort_order>11</sort_order>
792
+ <show_in_default>1</show_in_default>
793
+ <show_in_website>1</show_in_website>
794
+ <show_in_store>1</show_in_store>
795
+ </payment_ref_three>
796
  <user_group_excluded translate="label">
797
  <label>User Group Excluded</label>
798
  <comment>Excluded User Group description</comment>
799
  <frontend_type>text</frontend_type>
800
  <config_path>payment/novalnetInvoice/user_group_excluded</config_path>
801
+ <sort_order>12</sort_order>
802
  <show_in_default>1</show_in_default>
803
  <show_in_website>1</show_in_website>
804
  <show_in_store>1</show_in_store>
807
  <label>Payment from applicable countries</label>
808
  <frontend_type>select</frontend_type>
809
  <config_path>payment/novalnetInvoice/allowspecific</config_path>
810
+ <sort_order>13</sort_order>
811
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
812
  <show_in_default>1</show_in_default>
813
  <show_in_website>1</show_in_website>
817
  <label>Payment from Specific countries</label>
818
  <frontend_type>multiselect</frontend_type>
819
  <config_path>payment/novalnetInvoice/specificcountry</config_path>
820
+ <sort_order>14</sort_order>
821
  <source_model>adminhtml/system_config_source_country</source_model>
822
  <show_in_default>1</show_in_default>
823
  <show_in_website>1</show_in_website>
831
  <frontend_type>text</frontend_type>
832
  <config_path>payment/novalnetInvoice/min_order_total</config_path>
833
  <validate>validate-number</validate>
834
+ <sort_order>15</sort_order>
835
  <show_in_default>1</show_in_default>
836
  <show_in_website>1</show_in_website>
837
  <show_in_store>1</show_in_store>
841
  <frontend_type>text</frontend_type>
842
  <config_path>payment/novalnetInvoice/max_order_total</config_path>
843
  <validate>validate-number</validate>
844
+ <sort_order>16</sort_order>
845
  <show_in_default>1</show_in_default>
846
  <show_in_website>1</show_in_website>
847
  <show_in_store>1</show_in_store>
852
  <frontend_type>text</frontend_type>
853
  <config_path>payment/novalnetInvoice/orderscount</config_path>
854
  <validate>validate-digits</validate>
855
+ <sort_order>17</sort_order>
856
  <show_in_default>1</show_in_default>
857
  <show_in_website>1</show_in_website>
858
  <show_in_store>1</show_in_store>
863
  <frontend_type>text</frontend_type>
864
  <config_path>payment/novalnetInvoice/sort_order</config_path>
865
  <validate>validate-digits</validate>
866
+ <sort_order>18</sort_order>
867
  <show_in_default>1</show_in_default>
868
  <show_in_website>1</show_in_website>
869
  <show_in_store>1</show_in_store>
949
  <show_in_website>1</show_in_website>
950
  <show_in_store>1</show_in_store>
951
  </reference_two>
952
+ <payment_ref_one translate="label">
953
+ <label>payment reference one</label>
954
+ <frontend_type>select</frontend_type>
955
+ <source_model>adminhtml/system_config_source_yesno</source_model>
956
+ <config_path>payment/novalnetPrepayment/payment_ref_one</config_path>
957
+ <sort_order>8</sort_order>
958
+ <show_in_default>1</show_in_default>
959
+ <show_in_website>1</show_in_website>
960
+ <show_in_store>1</show_in_store>
961
+ </payment_ref_one>
962
+ <payment_ref_two translate="label">
963
+ <label>payment reference two</label>
964
+ <frontend_type>select</frontend_type>
965
+ <source_model>adminhtml/system_config_source_yesno</source_model>
966
+ <config_path>payment/novalnetPrepayment/payment_ref_two</config_path>
967
+ <sort_order>9</sort_order>
968
+ <show_in_default>1</show_in_default>
969
+ <show_in_website>1</show_in_website>
970
+ <show_in_store>1</show_in_store>
971
+ </payment_ref_two>
972
+ <payment_ref_three translate="label">
973
+ <label>payment reference three</label>
974
+ <frontend_type>select</frontend_type>
975
+ <source_model>adminhtml/system_config_source_yesno</source_model>
976
+ <config_path>payment/novalnetPrepayment/payment_ref_three</config_path>
977
+ <sort_order>10</sort_order>
978
+ <show_in_default>1</show_in_default>
979
+ <show_in_website>1</show_in_website>
980
+ <show_in_store>1</show_in_store>
981
+ </payment_ref_three>
982
  <user_group_excluded translate="label">
983
  <label>User Group Excluded</label>
984
  <comment>Excluded User Group description</comment>
985
  <frontend_type>text</frontend_type>
986
  <config_path>payment/novalnetPrepayment/user_group_excluded</config_path>
987
+ <sort_order>11</sort_order>
988
  <show_in_default>1</show_in_default>
989
  <show_in_website>1</show_in_website>
990
  <show_in_store>1</show_in_store>
994
  <frontend_type>select</frontend_type>
995
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
996
  <config_path>payment/novalnetPrepayment/allowspecific</config_path>
997
+ <sort_order>12</sort_order>
998
  <show_in_default>1</show_in_default>
999
  <show_in_website>1</show_in_website>
1000
  <show_in_store>1</show_in_store>
1004
  <frontend_type>multiselect</frontend_type>
1005
  <source_model>adminhtml/system_config_source_country</source_model>
1006
  <config_path>payment/novalnetPrepayment/specificcountry</config_path>
1007
+ <sort_order>13</sort_order>
1008
  <show_in_default>1</show_in_default>
1009
  <show_in_website>1</show_in_website>
1010
  <show_in_store>1</show_in_store>
1017
  <frontend_type>text</frontend_type>
1018
  <config_path>payment/novalnetPrepayment/min_order_total</config_path>
1019
  <validate>validate-number</validate>
1020
+ <sort_order>14</sort_order>
1021
  <show_in_default>1</show_in_default>
1022
  <show_in_website>1</show_in_website>
1023
  <show_in_store>1</show_in_store>
1027
  <frontend_type>text</frontend_type>
1028
  <config_path>payment/novalnetPrepayment/max_order_total</config_path>
1029
  <validate>validate-number</validate>
1030
+ <sort_order>15</sort_order>
1031
  <show_in_default>1</show_in_default>
1032
  <show_in_website>1</show_in_website>
1033
  <show_in_store>1</show_in_store>
1037
  <frontend_type>text</frontend_type>
1038
  <config_path>payment/novalnetPrepayment/orderscount</config_path>
1039
  <validate>validate-digits</validate>
1040
+ <sort_order>16</sort_order>
1041
  <comment>Novalnet Minimum Orders Count Desc</comment>
1042
  <show_in_default>1</show_in_default>
1043
  <show_in_website>1</show_in_website>
1049
  <frontend_type>text</frontend_type>
1050
  <config_path>payment/novalnetPrepayment/sort_order</config_path>
1051
  <validate>validate-digits</validate>
1052
+ <sort_order>17</sort_order>
1053
  <show_in_default>1</show_in_default>
1054
  <show_in_website>1</show_in_website>
1055
  <show_in_store>1</show_in_store>
app/code/community/Novalnet/Payment/sql/novalnet_setup/{mysql4-install-10.0.0.php → mysql4-install-10.1.0.php} RENAMED
File without changes
app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-5.0.2-10.0.0.php DELETED
@@ -1,134 +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
- /** magento table */
27
- $tableOrderPayment = $this->getTable('sales/order_payment');
28
-
29
- /** Novalnet tables */
30
- $tableSeparefill = $this->getTable('novalnet_payment/separefill');
31
- $tableAmountchanged = $this->getTable('novalnet_payment/amountchanged');
32
- $tableRecurring = $this->getTable('novalnet_payment/recurring');
33
- $tableAffAccountDetail = $this->getTable('novalnet_payment/aff_account_detail');
34
- $tableAffUserDetail = $this->getTable('novalnet_payment/aff_user_detail');
35
-
36
- $installer = $this;
37
-
38
- $installer->startSetup();
39
-
40
- $methodFields = array();
41
- $methodData = array(
42
- 'novalnetElvaustria' => 'novalnetSepa',
43
- 'novalnetElvgerman' => 'novalnetSepa',
44
- 'novalnetSofortueberweisung' => 'novalnetBanktransfer'
45
- );
46
-
47
- foreach ($methodData as $variableId => $value) {
48
- $methodFields['method'] = $value;
49
- $installer->getConnection()->update(
50
- $tableOrderPayment, $methodFields, array('method = ?' => $variableId)
51
- );
52
- }
53
- #-----------------------------------------------------------------
54
- #-- Create Table novalnet_order_separefill
55
- #-----------------------------------------------------------------
56
- $installer->run("
57
- CREATE TABLE IF NOT EXISTS `{$tableSeparefill}` (
58
- `id` int(11) UNSIGNED NOT NULL auto_increment,
59
- `customer_id` VARCHAR(50) NOT NULL DEFAULT '',
60
- `pan_hash` VARCHAR(50) NOT NULL,
61
- `sepa_datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
62
- PRIMARY KEY (`id`),
63
- INDEX `NOVALNET_SEPA_REFILL` (`customer_id` ASC)
64
- );
65
- ");
66
- #-----------------------------------------------------------------
67
- #-- Create Table novalnet_order_amountchanged
68
- #-----------------------------------------------------------------
69
- $installer->run("
70
- CREATE TABLE IF NOT EXISTS `{$tableAmountchanged}` (
71
- `id` int(11) UNSIGNED NOT NULL auto_increment,
72
- `order_id` VARCHAR(50) NOT NULL DEFAULT '',
73
- `amount_changed` VARCHAR(50) NOT NULL,
74
- `amount_datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
75
- PRIMARY KEY (`id`),
76
- INDEX `NOVALNET_AMOUNT_CHANGED` (`order_id` ASC)
77
- );
78
- ");
79
-
80
- #-----------------------------------------------------------------
81
- #-- Create Table novalnet_order_recurring
82
- #-----------------------------------------------------------------
83
- $installer->run("
84
- CREATE TABLE IF NOT EXISTS `{$tableRecurring}` (
85
- `id` int(11) UNSIGNED NOT NULL auto_increment,
86
- `profile_id` VARCHAR(50) NOT NULL DEFAULT '',
87
- `signup_tid` VARCHAR(50) NOT NULL DEFAULT '',
88
- `billingcycle` VARCHAR(50) NOT NULL,
89
- `callbackcycle` VARCHAR(50) NOT NULL,
90
- `cycle_datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
91
- PRIMARY KEY (`id`),
92
- INDEX `NOVALNET_RECURRING` (`profile_id` ASC)
93
- );
94
- ");
95
-
96
- #-----------------------------------------------------------------
97
- #-- Create Table novalnet_affiliate_account_info
98
- #-----------------------------------------------------------------
99
- $installer->run("
100
- CREATE TABLE IF NOT EXISTS `{$tableAffAccountDetail}` (
101
- `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
102
- `vendor_id` int(11) unsigned NOT NULL,
103
- `vendor_authcode` varchar(40) NOT NULL,
104
- `product_id` int(11) unsigned NOT NULL,
105
- `product_url` varchar(200) NOT NULL,
106
- `activation_date` datetime NOT NULL,
107
- `aff_id` int(11) unsigned DEFAULT NULL,
108
- `aff_authcode` varchar(40) DEFAULT NULL,
109
- `aff_accesskey` varchar(40) NOT NULL,
110
- PRIMARY KEY (`id`),
111
- KEY `vendor_id` (`vendor_id`),
112
- KEY `product_id` (`product_id`),
113
- KEY `aff_id` (`aff_id`),
114
- INDEX `NOVALNET_AFFILIATE` (`aff_id` ASC)
115
- );
116
- ");
117
-
118
- #-----------------------------------------------------------------
119
- #-- Create Table novalnet_aff_user_detail
120
- #-----------------------------------------------------------------
121
- $installer->run("
122
- CREATE TABLE IF NOT EXISTS `{$tableAffUserDetail}` (
123
- `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
124
- `aff_id` int(11) unsigned NULL,
125
- `customer_no` varchar(40) NULL,
126
- `aff_order_no` varchar(40) NULL,
127
- PRIMARY KEY (`id`),
128
- KEY `aff_id` (`aff_id`),
129
- KEY `customer_no` (`customer_no`),
130
- KEY `aff_order_no` (`aff_order_no`),
131
- INDEX `NOVALNET_AFFILIATE_USER` (`customer_no` ASC)
132
- );
133
- ");
134
- $installer->endSetup();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-5.0.3-10.0.0.php DELETED
@@ -1,128 +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
- /** magento table */
27
- $tableOrderPayment = $this->getTable('sales/order_payment');
28
-
29
- /** Novalnet tables */
30
- $tableSeparefill = $this->getTable('novalnet_payment/separefill');
31
- $tableAmountchanged = $this->getTable('novalnet_payment/amountchanged');
32
- $tableRecurring = $this->getTable('novalnet_payment/recurring');
33
- $tableAffAccountDetail = $this->getTable('novalnet_payment/aff_account_detail');
34
- $tableAffUserDetail = $this->getTable('novalnet_payment/aff_user_detail');
35
-
36
- $installer = $this;
37
-
38
- $installer->startSetup();
39
-
40
- $paymentMethod = array(
41
- 'method' => 'novalnetBanktransfer',
42
- );
43
- $installer->getConnection()->update(
44
- $tableOrderPayment, $paymentMethod, array('method = ?' => 'novalnetSofortueberweisung')
45
- );
46
-
47
- #-----------------------------------------------------------------
48
- #-- Create Table novalnet_order_separefill
49
- #-----------------------------------------------------------------
50
- $installer->run("
51
- CREATE TABLE IF NOT EXISTS `{$tableSeparefill}` (
52
- `id` int(11) UNSIGNED NOT NULL auto_increment,
53
- `customer_id` VARCHAR(50) NOT NULL DEFAULT '',
54
- `pan_hash` VARCHAR(50) NOT NULL,
55
- `sepa_datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
56
- PRIMARY KEY (`id`),
57
- INDEX `NOVALNET_SEPA_REFILL` (`customer_id` ASC)
58
- );
59
- ");
60
- #-----------------------------------------------------------------
61
- #-- Create Table novalnet_order_amountchanged
62
- #-----------------------------------------------------------------
63
- $installer->run("
64
- CREATE TABLE IF NOT EXISTS `{$tableAmountchanged}` (
65
- `id` int(11) UNSIGNED NOT NULL auto_increment,
66
- `order_id` VARCHAR(50) NOT NULL DEFAULT '',
67
- `amount_changed` VARCHAR(50) NOT NULL,
68
- `amount_datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
69
- PRIMARY KEY (`id`),
70
- INDEX `NOVALNET_AMOUNT_CHANGED` (`order_id` ASC)
71
- );
72
- ");
73
-
74
- #-----------------------------------------------------------------
75
- #-- Create Table novalnet_order_recurring
76
- #-----------------------------------------------------------------
77
- $installer->run("
78
- CREATE TABLE IF NOT EXISTS `{$tableRecurring}` (
79
- `id` int(11) UNSIGNED NOT NULL auto_increment,
80
- `profile_id` VARCHAR(50) NOT NULL DEFAULT '',
81
- `signup_tid` VARCHAR(50) NOT NULL DEFAULT '',
82
- `billingcycle` VARCHAR(50) NOT NULL,
83
- `callbackcycle` VARCHAR(50) NOT NULL,
84
- `cycle_datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
85
- PRIMARY KEY (`id`),
86
- INDEX `NOVALNET_RECURRING` (`profile_id` ASC)
87
- );
88
- ");
89
-
90
- #-----------------------------------------------------------------
91
- #-- Create Table novalnet_affiliate_account_info
92
- #-----------------------------------------------------------------
93
- $installer->run("
94
- CREATE TABLE IF NOT EXISTS `{$tableAffAccountDetail}` (
95
- `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
96
- `vendor_id` int(11) unsigned NOT NULL,
97
- `vendor_authcode` varchar(40) NOT NULL,
98
- `product_id` int(11) unsigned NOT NULL,
99
- `product_url` varchar(200) NOT NULL,
100
- `activation_date` datetime NOT NULL,
101
- `aff_id` int(11) unsigned DEFAULT NULL,
102
- `aff_authcode` varchar(40) DEFAULT NULL,
103
- `aff_accesskey` varchar(40) NOT NULL,
104
- PRIMARY KEY (`id`),
105
- KEY `vendor_id` (`vendor_id`),
106
- KEY `product_id` (`product_id`),
107
- KEY `aff_id` (`aff_id`),
108
- INDEX `NOVALNET_AFFILIATE` (`aff_id` ASC)
109
- );
110
- ");
111
-
112
- #-----------------------------------------------------------------
113
- #-- Create Table novalnet_aff_user_detail
114
- #-----------------------------------------------------------------
115
- $installer->run("
116
- CREATE TABLE IF NOT EXISTS `{$tableAffUserDetail}` (
117
- `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
118
- `aff_id` int(11) unsigned NULL,
119
- `customer_no` varchar(40) NULL,
120
- `aff_order_no` varchar(40) NULL,
121
- PRIMARY KEY (`id`),
122
- KEY `aff_id` (`aff_id`),
123
- KEY `customer_no` (`customer_no`),
124
- KEY `aff_order_no` (`aff_order_no`),
125
- INDEX `NOVALNET_AFFILIATE_USER` (`customer_no` ASC)
126
- );
127
- ");
128
- $installer->endSetup();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/layout/novalnet/configuration.xml CHANGED
@@ -50,17 +50,17 @@
50
  </reference>
51
  </adminhtml_sales_recurring_profile_view>
52
 
53
- <novalnet_payment_adminhtml_sales_order_index>
54
  <reference name="content">
55
  <block type="novalnet_payment/adminhtml_sales_order" name="novalnet_payment_sales_order" />
56
  </reference>
57
- </novalnet_payment_adminhtml_sales_order_index>
58
 
59
- <novalnet_payment_adminhtml_sales_recurring_profile_index>
60
  <reference name="content">
61
  <block type="novalnet_payment/adminhtml_recurring_profile" name="novalnet_payment_adminhtml_recurring_profile" />
62
  </reference>
63
- </novalnet_payment_adminhtml_sales_recurring_profile_index>
64
 
65
  <!--
66
  Sales Order View
@@ -100,62 +100,61 @@
100
  <!--
101
  Novalnet transaction
102
  -->
103
- <novalnet_payment_adminhtml_transaction_index>
104
  <reference name="content">
105
  <block type="novalnet_payment/adminhtml_transaction" name="novalnet_payment_transaction" />
106
  </reference>
107
- </novalnet_payment_adminhtml_transaction_index>
108
 
109
  <!--
110
  Novalnet transaction view
111
  -->
112
- <novalnet_payment_adminhtml_transaction_view>
113
  <reference name="content">
114
  <block type="novalnet_payment/adminhtml_transaction_view" name="novalnet_payment_transaction_view" template="novalnet/transaction/view/form.phtml">
115
  </block>
116
  </reference>
117
- </novalnet_payment_adminhtml_transaction_view>
118
 
119
  <!--
120
  Novalnet transaction overview
121
  -->
122
- <novalnet_payment_adminhtml_transactionoverview_index>
123
  <reference name="content">
124
  <block type="novalnet_payment/adminhtml_transactionoverview" name="novalnet_payment_transactionoverview" />
125
  </reference>
126
- </novalnet_payment_adminhtml_transactionoverview_index>
127
 
128
  <!--
129
  Novalnet transaction overview view form
130
  -->
131
- <novalnet_payment_adminhtml_transactionoverview_view>
132
  <reference name="content">
133
  <block type="novalnet_payment/adminhtml_transactionoverview_view" name="novalnet_payment_transactionoverview_view" template="novalnet/transaction/overview/view/form.phtml"/>
134
  </reference>
135
- </novalnet_payment_adminhtml_transactionoverview_view>
136
 
137
  <!-- Global Configuration -->
138
 
139
- <novalnet_payment_adminhtml_configuration_wizard_page_index>
140
- <update handle="novalnet_payment_adminhtml_configuration_wizard_page_view" />
141
  <reference name="novalnet.config.wizard.page.view">
142
  <block type="adminhtml/system_config_switcher"
143
  name="novalnet.config.wizard.page.switcher"
144
  before="-"
145
  template="novalnet/payment/configuration/store_switcher.phtml" />
146
-
147
  </reference>
148
- </novalnet_payment_adminhtml_configuration_wizard_page_index>
149
 
150
- <novalnet_payment_adminhtml_configuration_wizard_page_view>
151
  <reference name="content">
152
  <block type="novalnet_payment/adminhtml_configuration_wizard_page_view"
153
  name="novalnet.config.wizard.page.view"
154
  template="novalnet/payment/configuration/viewcontainer.phtml" />
155
  </reference>
156
- </novalnet_payment_adminhtml_configuration_wizard_page_view>
157
 
158
- <novalnet_payment_adminhtml_configuration_wizard_page_generalglobal>
159
  <reference name="content">
160
  <block type="novalnet_payment/adminhtml_configuration_wizard_page_edit"
161
  name="novalnet.config.wizard.page.edit" template="novalnet/payment/configuration/formcontainer.phtml">
@@ -164,9 +163,9 @@
164
  </block>
165
  </block>
166
  </reference>
167
- </novalnet_payment_adminhtml_configuration_wizard_page_generalglobal>
168
 
169
- <novalnet_payment_adminhtml_configuration_wizard_page_save>
170
  <reference name="content">
171
  <block type="novalnet_payment/adminhtml_configuration_wizard_page_save"
172
  name="novalnet.config.wizard.page.save" template="novalnet/payment/configuration/paymentcontainer.phtml">
@@ -175,25 +174,25 @@
175
  </block>
176
  </block>
177
  </reference>
178
- </novalnet_payment_adminhtml_configuration_wizard_page_save>
179
 
180
  <!--
181
  Novalnet information index overview
182
  -->
183
- <novalnet_payment_adminhtml_information_module_index>
184
  <reference name="content">
185
  <block type="novalnet_payment/adminhtml_information_module"
186
  name="novalnet_payment_information_module" />
187
  </reference>
188
- </novalnet_payment_adminhtml_information_module_index>
189
 
190
  <!--
191
  Novalnet merchant administration
192
  -->
193
- <novalnet_payment_adminhtml_information_novalnetmerchantadmin_index>
194
  <reference name="content">
195
  <block type="novalnet_payment/adminhtml_information_novalnetmerchantadmin"
196
  name="novalnet_payment_information_novalnetmerchantadmin" />
197
  </reference>
198
- </novalnet_payment_adminhtml_information_novalnetmerchantadmin_index>
199
  </layout>
50
  </reference>
51
  </adminhtml_sales_recurring_profile_view>
52
 
53
+ <adminhtml_novalnetpayment_sales_order_index>
54
  <reference name="content">
55
  <block type="novalnet_payment/adminhtml_sales_order" name="novalnet_payment_sales_order" />
56
  </reference>
57
+ </adminhtml_novalnetpayment_sales_order_index>
58
 
59
+ <adminhtml_novalnetpayment_sales_recurring_profile_index>
60
  <reference name="content">
61
  <block type="novalnet_payment/adminhtml_recurring_profile" name="novalnet_payment_adminhtml_recurring_profile" />
62
  </reference>
63
+ </adminhtml_novalnetpayment_sales_recurring_profile_index>
64
 
65
  <!--
66
  Sales Order View
100
  <!--
101
  Novalnet transaction
102
  -->
103
+ <adminhtml_novalnetpayment_transaction_index>
104
  <reference name="content">
105
  <block type="novalnet_payment/adminhtml_transaction" name="novalnet_payment_transaction" />
106
  </reference>
107
+ </adminhtml_novalnetpayment_transaction_index>
108
 
109
  <!--
110
  Novalnet transaction view
111
  -->
112
+ <adminhtml_novalnetpayment_transaction_view>
113
  <reference name="content">
114
  <block type="novalnet_payment/adminhtml_transaction_view" name="novalnet_payment_transaction_view" template="novalnet/transaction/view/form.phtml">
115
  </block>
116
  </reference>
117
+ </adminhtml_novalnetpayment_transaction_view>
118
 
119
  <!--
120
  Novalnet transaction overview
121
  -->
122
+ <adminhtml_novalnetpayment_transactionoverview_index>
123
  <reference name="content">
124
  <block type="novalnet_payment/adminhtml_transactionoverview" name="novalnet_payment_transactionoverview" />
125
  </reference>
126
+ </adminhtml_novalnetpayment_transactionoverview_index>
127
 
128
  <!--
129
  Novalnet transaction overview view form
130
  -->
131
+ <adminhtml_novalnetpayment_transactionoverview_view>
132
  <reference name="content">
133
  <block type="novalnet_payment/adminhtml_transactionoverview_view" name="novalnet_payment_transactionoverview_view" template="novalnet/transaction/overview/view/form.phtml"/>
134
  </reference>
135
+ </adminhtml_novalnetpayment_transactionoverview_view>
136
 
137
  <!-- Global Configuration -->
138
 
139
+ <adminhtml_novalnetpayment_configuration_wizard_page_index>
140
+ <update handle="adminhtml_novalnetpayment_configuration_wizard_page_view" />
141
  <reference name="novalnet.config.wizard.page.view">
142
  <block type="adminhtml/system_config_switcher"
143
  name="novalnet.config.wizard.page.switcher"
144
  before="-"
145
  template="novalnet/payment/configuration/store_switcher.phtml" />
 
146
  </reference>
147
+ </adminhtml_novalnetpayment_configuration_wizard_page_index>
148
 
149
+ <adminhtml_novalnetpayment_configuration_wizard_page_view>
150
  <reference name="content">
151
  <block type="novalnet_payment/adminhtml_configuration_wizard_page_view"
152
  name="novalnet.config.wizard.page.view"
153
  template="novalnet/payment/configuration/viewcontainer.phtml" />
154
  </reference>
155
+ </adminhtml_novalnetpayment_configuration_wizard_page_view>
156
 
157
+ <adminhtml_novalnetpayment_configuration_wizard_page_generalglobal>
158
  <reference name="content">
159
  <block type="novalnet_payment/adminhtml_configuration_wizard_page_edit"
160
  name="novalnet.config.wizard.page.edit" template="novalnet/payment/configuration/formcontainer.phtml">
163
  </block>
164
  </block>
165
  </reference>
166
+ </adminhtml_novalnetpayment_configuration_wizard_page_generalglobal>
167
 
168
+ <adminhtml_novalnetpayment_configuration_wizard_page_save>
169
  <reference name="content">
170
  <block type="novalnet_payment/adminhtml_configuration_wizard_page_save"
171
  name="novalnet.config.wizard.page.save" template="novalnet/payment/configuration/paymentcontainer.phtml">
174
  </block>
175
  </block>
176
  </reference>
177
+ </adminhtml_novalnetpayment_configuration_wizard_page_save>
178
 
179
  <!--
180
  Novalnet information index overview
181
  -->
182
+ <adminhtml_novalnetpayment_information_module_index>
183
  <reference name="content">
184
  <block type="novalnet_payment/adminhtml_information_module"
185
  name="novalnet_payment_information_module" />
186
  </reference>
187
+ </adminhtml_novalnetpayment_information_module_index>
188
 
189
  <!--
190
  Novalnet merchant administration
191
  -->
192
+ <adminhtml_novalnetpayment_information_novalnetmerchantadmin_index>
193
  <reference name="content">
194
  <block type="novalnet_payment/adminhtml_information_novalnetmerchantadmin"
195
  name="novalnet_payment_information_novalnetmerchantadmin" />
196
  </reference>
197
+ </adminhtml_novalnetpayment_information_novalnetmerchantadmin_index>
198
  </layout>
app/design/adminhtml/default/default/template/novalnet/information/novalnetmerchantadmin.phtml CHANGED
@@ -25,6 +25,7 @@
25
  */
26
  $url = $this->getNovalnetAdminUrl();
27
  ?>
 
28
  <div style="width:100%;">
29
  <iframe src="<?php echo $url ?>" width="100%" frameborder="0" border="0"
30
  style="min-height:900px; height: 100%; overflow: hidden;">
25
  */
26
  $url = $this->getNovalnetAdminUrl();
27
  ?>
28
+ <div style="background-color: #0080c9;color: #fff;font-family: calibri;font-size: 15px;font-weight: bold;padding: 5px;text-align: center;"><?php echo $this->__('Login here with Novalnet merchant credentials. For the activation of new payment methods please contact'); ?>&nbsp;<a href= "mailto:support@novalnet.de" style="color:white">support@novalnet.de</a></div>
29
  <div style="width:100%;">
30
  <iframe src="<?php echo $url ?>" width="100%" frameborder="0" border="0"
31
  style="min-height:900px; height: 100%; overflow: hidden;">
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Cc.phtml CHANGED
@@ -26,9 +26,9 @@
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
  $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
- $ccRefill = $this->getMethod()->_getConfigData('auto_refill', true);
30
  // get quote billing address
31
- $billingaddres = Mage::getSingleton('adminhtml/session_quote')->getQuote()->getBillingAddress();
32
  ?>
33
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
34
  <!--{{{ Payment Logo -->
@@ -52,34 +52,23 @@ $billingaddres = Mage::getSingleton('adminhtml/session_quote')->getQuote()->getB
52
  <?php echo $this->getUserInfo() ?>
53
  </li>
54
  <?php endif ?>
55
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('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_type"><?php echo $this->__('NN CC type') ?><span class="required">*</span></label><br />
65
- <select id="<?php echo $code ?>_cc_type" onchange="cchashcall()" class="required-entry validate-cc-type-select">
66
- <option value=""><?php echo $this->__('NN Select') ?></option>
67
- <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
68
- <option value="<?php echo $_typeCode ?>"><?php echo $_typeName ?></option>
69
- <?php endforeach; ?>
70
- </select>
71
- </div>
72
- </li>
73
  <li>
74
  <div class="input-box">
75
  <label for="<?php echo $code ?>_cc_owner"><?php echo $this->__('NN CC holder') ?><span class="required">*</span></label><br/>
76
- <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_cc_owner" autocomplete="off" onchange="cchashcall()" value="<?php echo $billingaddres->getFirstname() . ' ' . $billingaddres->getLastname(); ?>" />
77
  </div>
78
  </li>
79
  <li>
80
  <div class="input-box">
81
  <label for="<?php echo $code ?>_cc_number"><?php echo $this->__('NN CC number') ?><span class="required">*</span></label><br/>
82
- <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="" />
83
  </div>
84
  </li>
85
  <li>
@@ -107,8 +96,8 @@ $billingaddres = Mage::getSingleton('adminhtml/session_quote')->getQuote()->getB
107
  </li>
108
  </ul>
109
 
110
- <input type="hidden" id="original_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>" />
111
- <input type="hidden" id="original_vendor_authcode" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>" />
112
  <input type="hidden" id="novalnet_cc_pan_hash" value="<?php
113
  echo $ccRefill ? $assignDatahelper->getCheckout()->getCcPanHash() : '';
114
  ?>" />
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 -->
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>
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
  ?>" />
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Invoice.phtml CHANGED
@@ -45,7 +45,7 @@ $helper = Mage::helper('novalnet_payment');
45
  <?php echo $this->getUserInfo() ?>
46
  </li>
47
  <?php endif ?>
48
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
49
  <li>
50
  <div style="font-weight:bold;color:red;font-size:12px;">
51
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
45
  <?php echo $this->getUserInfo() ?>
46
  </li>
47
  <?php endif ?>
48
+ <?php if ($this->getMethod()->getNovalnetConfig('live_mode', true) == 0): ?>
49
  <li>
50
  <div style="font-weight:bold;color:red;font-size:12px;">
51
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Prepayment.phtml CHANGED
@@ -45,7 +45,7 @@ $helper = Mage::helper('novalnet_payment');
45
  <?php echo $this->getUserInfo() ?>
46
  </li>
47
  <?php endif ?>
48
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
49
  <li>
50
  <div style="font-weight:bold;color:red;font-size:12px;">
51
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
45
  <?php echo $this->getUserInfo() ?>
46
  </li>
47
  <?php endif ?>
48
+ <?php if ($this->getMethod()->getNovalnetConfig('live_mode', true) == 0): ?>
49
  <li>
50
  <div style="font-weight:bold;color:red;font-size:12px;">
51
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Sepa.phtml CHANGED
@@ -26,13 +26,13 @@
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
  $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
- $sepaRefill = $this->getMethod()->_getConfigData('auto_refill', true);
30
  $sepaPaymentRefill = $this->getMethod()->getConfigData('sepa_payment_refill');
31
  $refillValues = $assignDatahelper->getCheckout()->getRefilldatavalues();
32
- $refillMethod = ($sepaRefill && $refillValues != '' && $code == $refillValues->getMethod());
33
  // get quote billing address
34
- $billingaddres = Mage::getSingleton('adminhtml/session_quote')->getQuote()->getBillingAddress();
35
- $street = $billingaddres->getStreet();
36
  $customerlogin = Mage::getSingleton('customer/session')->isLoggedIn();
37
  $panhash = '';
38
 
@@ -41,6 +41,7 @@ if ($sepaPaymentRefill && $customerlogin) {
41
  } else if ($sepaRefill) {
42
  $panhash = $assignDatahelper->getCheckout()->getSepaHash();
43
  }
 
44
  ?>
45
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
46
  <!--{{{ Payment Logo -->
@@ -65,7 +66,7 @@ if ($sepaPaymentRefill && $customerlogin) {
65
  <?php echo $this->getUserInfo() ?>
66
  </li>
67
  <?php endif ?>
68
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('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') ?>
@@ -77,7 +78,7 @@ if ($sepaPaymentRefill && $customerlogin) {
77
  <div class="field">
78
  <label style="float:none;" for="<?php echo $code ?>_account_holder"><?php echo $this->__('Account Holder') ?><span class="required">*</span></label><br/>
79
  <div class="input-box">
80
- <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 $billingaddres->getFirstname() . ' ' . $billingaddres->getLastname(); ?>" />
81
  </div>
82
  </div>
83
  </li>
@@ -94,7 +95,7 @@ if ($sepaPaymentRefill && $customerlogin) {
94
  <select id="<?php echo $code ?>_bank_country" onchange="unsetHashRelatedElements()" class="required-entry">
95
  <?php
96
  foreach ($_countries as $_country):
97
- if (in_array($billingaddres->getCountryId(), $_country)) {
98
  ?>
99
  <option selected value="<?php echo $_country['value'] ?>"><?php echo $_country['label'] ?>
100
  </option>
@@ -135,102 +136,18 @@ if ($sepaPaymentRefill && $customerlogin) {
135
  </div>
136
  </div>
137
  </li>
138
- <!-- Mandate overlay START-->
139
- <li>
140
- <div class="bgCover">&nbsp;</div>
141
- <div id='sepa_mandate_overlay_block_first' style='display:none;' class='nnsepaloader'>
142
- </div>
143
- <div id='sepa_mandate_overlay_block' style='display:none;' class='overlay_window_block'>
144
- <div class='nn_header'>
145
- <h1><?php echo $this->__('SEPA Direct Debit Mandate Confirmation') ?></h1>
146
- </div>
147
- <div class='body_div' id='overlay_window_block_body' style="height: 400px;">
148
- <p>
149
- <table>
150
- <tr>
151
- <td><?php echo $this->__('Creditor') ?></td><td>:</td><td><span id='sepa_overlay_payee_span'>&nbsp;</span></td>
152
- </tr>
153
- <tr>
154
- <td><?php echo $this->__('Credit Identification Number') ?></td><td>:</td><td><span id='sepa_overlay_creditoridentificationnumber_span'>&nbsp;</span></td>
155
- </tr>
156
- <tr>
157
- <td><?php echo $this->__('Mandate Reference') ?></td><td>:</td><td><span id='sepa_overlay_mandatereference_span'>&nbsp;</span></td>
158
- </tr>
159
- </table><br/>
160
- <?php echo $this->__('SEPA Confirm paragraph') ?>
161
-
162
- <br/> <br/>
163
- <?php echo $this->__('SEPA Confirm note') ?>
164
- <br/> <br/>
165
- <table>
166
- <tr>
167
- <td><?php echo $this->__('Name of the payee') ?></td><td>:</td><td><span id='sepa_overlay_enduserfullname_span'>&nbsp;</span></td>
168
- </tr>
169
- <?php if($billingaddres->getCompany()) { ?>
170
- <tr>
171
- <td><?php echo $this->__('Company name') ?></td><td>:</td><td><?php echo $billingaddres->getCompany(); ?></td>
172
- </tr>
173
- <?php } ?>
174
- <tr>
175
- <td><?php echo $this->__('NN Address') ?></td><td>:</td><td><?php echo $street[0]; ?></td>
176
- </tr>
177
- <?php if(isset($street[1]) && $street[1]) { ?>
178
- <tr>
179
- <td><?php echo $this->__('NN Street') ?></td><td>:</td><td><?php echo $street[1]; ?></td>
180
- </tr>
181
- <?php }?>
182
- <tr>
183
- <td><?php echo $this->__('Zip Code And City') ?></td><td>:</td><td><?php echo $billingaddres->getPostcode(); ?><span id='sepa_overlay_enduserzipcode_span'>&nbsp;</span> <?php echo $billingaddres->getCity(); ?></td>
184
- </tr>
185
- <tr>
186
- <td><?php echo $this->__('Country') ?></td><td>:</td><td><span id='sepa_overlay_endusercountry_span'>&nbsp;</span></td>
187
- </tr>
188
- <?php if($billingaddres->getEmail()) { ?>
189
- <tr>
190
- <td><?php echo $this->__('Email') ?></td><td>:</td><td><?php echo $billingaddres->getEmail(); ?></td>
191
- </tr>
192
- <?php } ?>
193
- <tr id='nn_sepa_overlay_iban_tr'>
194
- <td><?php echo $this->__('IBAN') ?></td><td>:</td><td><span id='sepa_overlay_iban_span'>&nbsp;</span></td>
195
- </tr>
196
- <tr id='nn_sepa_overlay_bic_tr'>
197
- <td><?php echo $this->__('BIC') ?></td><td>:</td><td><span id='sepa_overlay_bic_span'>&nbsp;</span></td>
198
- </tr>
199
-
200
- </table>
201
- <br/>
202
- <?php echo $billingaddres->getCity(); ?>, <span id='sepa_overlay_mandatedate_span'>&nbsp;</span>, <span id='sepa_overlay_enduserfullname_span1'>&nbsp;</span>
203
- </p>
204
- </div>
205
- <div class='nn_footer'>
206
- <input style="width: 30%" type='button' id='mandate_confirm_btn' name='mandate_confirm_btn' onclick="mandate_confirm_btn_submit()" value=<?php echo $this->__('conirm_mandate') ?> class='mandate_confirm_btn' />
207
- <input style="width: 30%" type='button' id='mandate_cancel_btn' name='mandate_cancel_btn' onclick="mandate_cancel_btn_submit()" value=<?php echo $this->__('cancel') ?> class='mandate_confirm_btn' />
208
- <img src='<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>logo.png' width=120 alt='Novalnet AG' style='float:right;' />
209
- </div>
210
- </div>
211
- </li>
212
- <!-- Mandate overlay END-->
213
  </ul>
214
 
215
- <input type="hidden" id="process_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>"/>
216
- <input type="hidden" id="auth_code" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>"/>
217
  <input id="sepaiban" type="hidden" value="">
218
  <input id="sepabic" type="hidden" value="">
219
  <input id="sepa_payment_id" type="hidden" value="37">
220
- <input id="novalnet_sepa_owner" type="hidden" value="">
221
- <input id="result_mandate_date" type="hidden" value="">
222
- <input id="result_mandate_ref" type="hidden" value="">
223
  <input id="result_mandate_unique" type="hidden" value="" name="result_mandate_unique">
224
  <input id="nnsepa_iban_confirmed" type="hidden" value="0" name="nnsepa_iban_confirmed">
225
- <input type="hidden" id="nn_sepa_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
226
- <input type="hidden" id="nn_sepa_validate_error_message" value="<?php echo $this->__('Your account details are invalid') . '!'; ?>" />
227
- <input id="result_sepa_hash" type="hidden" value="<?php
228
- if (($sepaPaymentRefill || $sepaRefill) && $panhash != '') {
229
- echo $panhash;
230
- } else {
231
- $panhash = '';
232
- }
233
- ?>" name="result_sepa_hash">
234
  </fieldset>
235
  <style>
236
  .nnsepaloader {
@@ -242,82 +159,4 @@ if ($sepaPaymentRefill && $customerlogin) {
242
  z-index: 9999;
243
  background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
244
  }
245
-
246
- .bgCover { background:#878787; position:fixed; left:0; top:0; display:none; overflow:hidden; z-index:1000; }
247
- #sepa_mandate_overlay_block
248
- {
249
- font-size:12px;
250
- color:#555555;
251
- background-color:#fff;
252
- }
253
-
254
- .overlay_window_block {
255
- background-color:#ffffff;
256
- border-radius:5px;
257
- border:1px solid #a1a1a1;
258
- z-index:1000;
259
- }
260
- .overlay_window_block .nn_footer{
261
- bottom:0px;
262
- position:absolute;
263
- height:37px;
264
- width:100%;
265
- }
266
- .overlay_window_block .nn_header{
267
- top:0px;
268
- height:25px;
269
- border-bottom:1px solid #878787;
270
- padding:5px;
271
- }
272
- .overlay_window_block .body_div{
273
- padding:5px;
274
- overflow-y:scroll;
275
- }
276
- .mandate_confirm_btn{
277
- border:1px solid #0080C9;
278
- -webkit-border-radius: 3px;
279
- -moz-border-radius: 3px;
280
- border-radius: 3px;
281
- padding: 6px;
282
- text-decoration:none;
283
- display:inline-block;
284
- text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
285
- font-weight:bold;
286
- color: #FFFFFF;
287
- width:40%;
288
- cursor:pointer;
289
- margin-left:2px;
290
- margin-top:3px;
291
- float:left;
292
- margin-bottom:0px;
293
- background-color: #0080C9; background-image: -webkit-gradient(linear, left top, left bottom, from(#0080C9), to(#0080C9));
294
- background-image: -webkit-linear-gradient(top, #0080C9, #0080C9);
295
- background-image: -moz-linear-gradient(top, #0080C9, #0080C9);
296
- background-image: -ms-linear-gradient(top, #0080C9, #0080C9);
297
- background-image: -o-linear-gradient(top, #0080C9, #0080C9);
298
- background-image: linear-gradient(to bottom, #0080C9, #0080C9);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=#0080C9, endColorstr=#0080C9);
299
- }
300
-
301
- .mandate_confirm_btn:hover{
302
- border:1px solid #878787;
303
- background-color: #878787; background-image: -webkit-gradient(linear, left top, left bottom, from(#878787), to(#878787));
304
- background-image: -webkit-linear-gradient(top, #878787, #878787);
305
- background-image: -moz-linear-gradient(top, #878787, #878787);
306
- background-image: -ms-linear-gradient(top, #878787, #878787);
307
- background-image: -o-linear-gradient(top, #878787, #878787);
308
- background-image: linear-gradient(to bottom, #878787, #878787);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=#878787, endColorstr=#878787);
309
- }
310
-
311
- #sepa_mandate_overlay_block h1
312
- {
313
- color: #00669D;
314
- font-size:14px;
315
- font-weight:bold;
316
- text-transform:none;
317
- margin:0;
318
- }
319
-
320
- table td{
321
- padding : 2px;
322
- }
323
  </style>
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());
33
  // get quote billing address
34
+ $billingaddress = Mage::getSingleton('adminhtml/session_quote')->getQuote()->getBillingAddress();
35
+ $street = $billingaddress->getStreet();
36
  $customerlogin = Mage::getSingleton('customer/session')->isLoggedIn();
37
  $panhash = '';
38
 
41
  } else if ($sepaRefill) {
42
  $panhash = $assignDatahelper->getCheckout()->getSepaHash();
43
  }
44
+ $panhash = (($sepaPaymentRefill || $sepaRefill) && $panhash) ? $panhash : '';
45
  ?>
46
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
47
  <!--{{{ Payment Logo -->
66
  <?php echo $this->getUserInfo() ?>
67
  </li>
68
  <?php endif ?>
69
+ <?php if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->getNovalnetConfig('live_mode', true) == 0): ?>
70
  <li>
71
  <div style="font-weight:bold;color:red;font-size:12px;">
72
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
78
  <div class="field">
79
  <label style="float:none;" for="<?php echo $code ?>_account_holder"><?php echo $this->__('Account Holder') ?><span class="required">*</span></label><br/>
80
  <div class="input-box">
81
+ <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(); ?>" />
82
  </div>
83
  </div>
84
  </li>
95
  <select id="<?php echo $code ?>_bank_country" onchange="unsetHashRelatedElements()" class="required-entry">
96
  <?php
97
  foreach ($_countries as $_country):
98
+ if (in_array($billingaddress->getCountryId(), $_country)) {
99
  ?>
100
  <option selected value="<?php echo $_country['value'] ?>"><?php echo $_country['label'] ?>
101
  </option>
136
  </div>
137
  </div>
138
  </li>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
139
  </ul>
140
 
141
+ <input id="process_vendor_id" type="hidden" value="<?php echo trim($this->getMethod()->getNovalnetConfig('merchant_id', true)) ?>"/>
142
+ <input id="auth_code" type="hidden" value="<?php echo trim($this->getMethod()->getNovalnetConfig('auth_code', true)) ?>"/>
143
  <input id="sepaiban" type="hidden" value="">
144
  <input id="sepabic" type="hidden" value="">
145
  <input id="sepa_payment_id" type="hidden" value="37">
 
 
 
146
  <input id="result_mandate_unique" type="hidden" value="" name="result_mandate_unique">
147
  <input id="nnsepa_iban_confirmed" type="hidden" value="0" name="nnsepa_iban_confirmed">
148
+ <input id="nn_sepa_merchant_validate_error_message" type="hidden" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
149
+ <input id="nn_sepa_validate_error_message" type="hidden" value="<?php echo $this->__('Your account details are invalid') . '!'; ?>" />
150
+ <input id="result_sepa_hash" type="hidden" value="<?php echo $panhash; ?>" name="result_sepa_hash">
 
 
 
 
 
 
151
  </fieldset>
152
  <style>
153
  .nnsepaloader {
159
  z-index: 9999;
160
  background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
161
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
162
  </style>
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Banktransfer.phtml CHANGED
@@ -28,25 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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 if ($this->getAdditionalData('refunded_tid')):
40
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
41
- if ($this->getAdditionalData('fullRefund') == true):
42
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
43
- else:
44
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
45
- endif;
 
46
  endforeach;
47
- endif;
48
- ?>
49
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
50
  <?php else: ?>
51
  <?php echo $this->__('Error in getting payment method') ?>
52
  <?php endif; ?>
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/Cc.phtml CHANGED
@@ -31,28 +31,29 @@ $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
- ?>
35
- <?php
36
- if ($this->getAdditionalData('NnTestOrder'))
37
  echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
38
  ?>
39
- <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
40
- <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
41
- <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>
42
- <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>
43
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
44
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
45
- <?php if ($this->getAdditionalData('refunded_tid')):
46
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
47
- if ($this->getAdditionalData('fullRefund') == true):
48
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
49
- else:
50
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
51
- endif;
52
- endforeach;
53
- endif;
54
- ?>
55
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
56
  <?php else: ?>
57
  <?php echo $this->__('Error in getting payment method') ?>
58
  <?php endif; ?>
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
+ ?>
35
+ <?php
36
+ if ($this->getAdditionalData('NnTestOrder'))
37
  echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
38
+ ?>
39
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
40
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
41
+ <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>
42
+ <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>
43
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
44
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
45
+ <?php
46
+ if ($this->getAdditionalData('refunded_tid')):
47
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
48
+ if ($this->getAdditionalData('fullRefund') == true || preg_match("/-refund/i", $value['reftid'])):
49
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
50
+ else:
51
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s.Your new TID for the refund amount: %s', $helper->makeValidNumber($value['reqtid']), $value['refamount'], $helper->makeValidNumber($value['reftid'])) . '<br><br>';
52
+ endif;
53
+ endforeach;
54
+ endif;
55
  ?>
56
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
57
  <?php else: ?>
58
  <?php echo $this->__('Error in getting payment method') ?>
59
  <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Eps.phtml CHANGED
@@ -28,25 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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 if ($this->getAdditionalData('refunded_tid')):
40
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
41
- if ($this->getAdditionalData('fullRefund') == true):
42
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
43
- else:
44
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
45
- endif;
 
46
  endforeach;
47
- endif;
48
- ?>
49
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
50
  <?php else: ?>
51
  <?php echo $this->__('Error in getting payment method') ?>
52
  <?php endif; ?>
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/Ideal.phtml CHANGED
@@ -28,25 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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 if ($this->getAdditionalData('refunded_tid')):
40
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
41
- if ($this->getAdditionalData('fullRefund') == true):
42
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
43
- else:
44
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
45
- endif;
 
46
  endforeach;
47
- endif;
48
- ?>
49
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
50
  <?php else: ?>
51
  <?php echo $this->__('Error in getting payment method') ?>
52
  <?php endif; ?>
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
@@ -35,72 +35,72 @@ $nextCycleDate = $helper->getCycleDate($nextCycleId);
35
  <?php if ($_info): ?>
36
  <?php
37
  if ($this->getAdditionalData('NnTestOrder'))
38
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
39
- ?>
40
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
41
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
42
- <?php if ($nextCycleDate) echo '<br>' . $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br><br>' ?>
43
- <?php if ($this->getAdditionalData('captureTid')) echo '<br>' . $this->__('The transaction has been confirmed on %s', $captureTime) . '<br><br>' ?>
44
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
45
- <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('The transaction has been canceled on ') . $currentTime . '<br>' ?>
46
- <?php if ($this->getAdditionalData('refunded_tid')):
47
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
48
- if ($this->getAdditionalData('fullRefund') == true):
49
- echo '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
50
- else:
51
- echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
52
- endif;
53
- endforeach;
54
- endif;
55
- ?>
56
- <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl)): ?>
57
- <?php
58
- if (strlen($this->getAdditionalData('NnNote'))):
59
- if (strstr($this->getAdditionalData('NnNote'), 'br')):
60
- echo nl2br($this->getAdditionalData('NnNote'));
61
- else:
62
- $note = explode('|',$this->getAdditionalData('NnNote'));
63
- echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
64
- foreach($note as $noteValue):
65
- list($text, $value) = explode(':', $noteValue);
66
- echo $this->__($text) . ' : '. $value . '</br>';
67
- endforeach;
68
- endif;
69
- endif;
70
- ?>
71
  <?php
72
- if (strlen($this->getAdditionalData('NnNoteAmount'))):
73
- list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
74
- echo $this->__($text) . ' : '. $value;
 
75
  endif;
76
  ?>
77
- <?php
78
- if (strlen($this->getAdditionalData('NnNoteTID'))):
79
- if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
80
- echo nl2br($this->getAdditionalData('NnNoteTID'));
81
- else:
82
- $note = explode('|',$this->getAdditionalData('NnNoteTID'));
83
- echo "<br />";
84
- foreach($note as $noteValue):
85
- list($text, $value) = explode(':', $noteValue);
86
- if ($text == 'NN_Reference3'):
87
- list($referenceTxt, $value) = explode('&', $value);
88
- str_replace('&', '', $referenceTxt);
89
- echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
90
- else:
91
- echo $this->__($text) . ' : '. $value . '</br>';
92
- endif;
93
- endforeach;
94
  endif;
95
- endif;
96
- ?>
97
- <?php
98
- if (strlen($this->getAdditionalData('NnComments'))):
99
- echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
100
- endif;
101
- ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
102
  <?php endif; ?>
103
  <?php else: ?>
104
  <?php echo $this->__('Error in getting payment method') ?>
105
  <?php endif; ?>
106
-
35
  <?php if ($_info): ?>
36
  <?php
37
  if ($this->getAdditionalData('NnTestOrder'))
38
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
39
+ ?>
40
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
41
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
42
+ <?php if ($nextCycleDate) echo '<br>' . $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br>' ?>
43
+ <?php if ($this->getAdditionalData('captureTid')) echo '<br>' . $this->__('The transaction has been confirmed on %s', $captureTime) . '<br>' ?>
44
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo '<br>' . $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br>' ?>
45
+ <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('The transaction has been canceled on %s', $currentTime) . '<br>' ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
46
  <?php
47
+ if ($this->getAdditionalData('refunded_tid')):
48
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
49
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
50
+ endforeach;
51
  endif;
52
  ?>
53
+ <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl)): ?>
54
+ <?php
55
+ if (strlen($this->getAdditionalData('NnNote'))):
56
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
57
+ echo '<br>' . ($this->getAdditionalData('NnNote'));
58
+ else:
59
+ $note = explode('|', $this->getAdditionalData('NnNote'));
60
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b>';
61
+ foreach ($note as $noteValue):
62
+ list($text, $value) = explode(':', $noteValue);
63
+ echo '<br>' . $this->__($text) . ' : ' . $value;
64
+ endforeach;
65
+ endif;
 
 
 
 
66
  endif;
67
+ ?>
68
+ <?php
69
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
70
+ list ($text, $value) = explode(':', $this->getAdditionalData('NnNoteAmount'));
71
+ echo '<br>' . $this->__($text) . ' : ' . $value;
72
+ endif;
73
+ ?>
74
+ <?php
75
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
76
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
77
+ echo '<br>' . ($this->getAdditionalData('NnNoteTID'));
78
+ else:
79
+ $note = explode('|', $this->getAdditionalData('NnNoteTID'));
80
+ echo "<br />";
81
+ foreach ($note as $noteValue):
82
+ list($text, $value) = explode(':', $noteValue);
83
+ if (preg_match("/Order No&/i", $value)):
84
+ list($referenceTxt, $value) = explode('&', $value);
85
+ str_replace('&', '', $referenceTxt);
86
+ echo '<br>' . $this->__($text) . ' : ' . '<b>' . $this->__($referenceTxt) . ' ' . $value . '</b>';
87
+ else:
88
+ if ($text == 'NN_Reference_desc1' || $text == 'NN_Reference_desc2'):
89
+ echo '<br><b>' . $this->__($text) . '</b>';
90
+ else:
91
+ echo '<br>' . $this->__($text) . ' : ' . $value;
92
+ endif;
93
+ endif;
94
+ endforeach;
95
+ endif;
96
+ endif;
97
+ ?>
98
+ <?php
99
+ if (strlen($this->getAdditionalData('NnComments'))):
100
+ echo '<br>' . ($this->getAdditionalData('NnComments'));
101
+ endif;
102
+ ?>
103
  <?php endif; ?>
104
  <?php else: ?>
105
  <?php echo $this->__('Error in getting payment method') ?>
106
  <?php endif; ?>
 
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Paypal.phtml CHANGED
@@ -28,25 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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 if ($this->getAdditionalData('refunded_tid')):
40
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
41
- if ($this->getAdditionalData('fullRefund') == true):
42
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
43
- else:
44
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
45
- endif;
 
46
  endforeach;
47
- endif;
48
- ?>
49
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
50
  <?php else: ?>
51
  <?php echo $this->__('Error in getting payment method') ?>
52
  <?php endif; ?>
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/Prepayment.phtml CHANGED
@@ -35,72 +35,72 @@ $nextCycleDate = $helper->getCycleDate($nextCycleId);
35
  <?php if ($_info): ?>
36
  <?php
37
  if ($this->getAdditionalData('NnTestOrder'))
38
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
39
- ?>
40
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
41
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
42
- <?php if ($nextCycleDate) echo '<br>' . $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br><br>' ?>
43
- <?php if ($this->getAdditionalData('captureTid')) echo '<br>' . $this->__('The transaction has been confirmed on %s', $captureTime) . '<br><br>' ?>
44
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
45
- <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('The transaction has been canceled on ') . $currentTime . '<br>' ?>
46
- <?php if ($this->getAdditionalData('refunded_tid')):
47
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
48
- if ($this->getAdditionalData('fullRefund') == true):
49
- echo '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
50
- else:
51
- echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
52
- endif;
53
- endforeach;
54
- endif;
55
- ?>
56
- <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl)): ?>
57
  <?php
58
- if (strlen($this->getAdditionalData('NnNote'))):
59
- if (strstr($this->getAdditionalData('NnNote'), 'br')):
60
- echo nl2br($this->getAdditionalData('NnNote'));
61
- else:
62
- $note = explode('|',$this->getAdditionalData('NnNote'));
63
- echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
64
- foreach($note as $noteValue):
65
- list($text, $value) = explode(':', $noteValue);
66
- echo $this->__($text) . ' : '. $value . '</br>';
67
- endforeach;
68
- endif;
69
  endif;
70
  ?>
71
- <?php
72
- if (strlen($this->getAdditionalData('NnNoteAmount'))):
73
- list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
74
- echo $this->__($text) . ' : '. $value;
75
- endif;
76
- ?>
77
- <?php
78
- if (strlen($this->getAdditionalData('NnNoteTID'))):
79
- if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
80
- echo nl2br($this->getAdditionalData('NnNoteTID'));
81
- else:
82
- $note = explode('|',$this->getAdditionalData('NnNoteTID'));
83
- echo "<br />";
84
- foreach($note as $noteValue):
85
- list($text, $value) = explode(':', $noteValue);
86
- if ($text == 'NN_Reference3'):
87
- list($referenceTxt, $value) = explode('&', $value);
88
- str_replace('&', '', $referenceTxt);
89
- echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
90
- else:
91
- echo $this->__($text) . ' : '. $value . '</br>';
92
- endif;
93
- endforeach;
94
  endif;
95
- endif;
96
- ?>
97
- <?php
98
- if (strlen($this->getAdditionalData('NnComments'))):
99
- echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
100
- endif;
101
- ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
102
  <?php endif; ?>
103
  <?php else: ?>
104
  <?php echo $this->__('Error in getting payment method') ?>
105
  <?php endif; ?>
106
-
35
  <?php if ($_info): ?>
36
  <?php
37
  if ($this->getAdditionalData('NnTestOrder'))
38
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
39
+ ?>
40
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
41
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
42
+ <?php if ($nextCycleDate) echo '<br>' . $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br>' ?>
43
+ <?php if ($this->getAdditionalData('captureTid')) echo '<br>' . $this->__('The transaction has been confirmed on %s', $captureTime) . '<br>' ?>
44
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo '<br>' . $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br>' ?>
45
+ <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('The transaction has been canceled on %s', $currentTime) . '<br>' ?>
 
 
 
 
 
 
 
 
 
 
 
46
  <?php
47
+ if ($this->getAdditionalData('refunded_tid')):
48
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
49
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
50
+ endforeach;
 
 
 
 
 
 
 
51
  endif;
52
  ?>
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')):
57
+ echo '<br>' . ($this->getAdditionalData('NnNote'));
58
+ else:
59
+ $note = explode('|', $this->getAdditionalData('NnNote'));
60
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b>';
61
+ foreach ($note as $noteValue):
62
+ list($text, $value) = explode(':', $noteValue);
63
+ echo '<br>' . $this->__($text) . ' : ' . $value;
64
+ endforeach;
65
+ endif;
 
 
 
 
 
 
 
 
 
 
66
  endif;
67
+ ?>
68
+ <?php
69
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
70
+ list ($text, $value) = explode(':', $this->getAdditionalData('NnNoteAmount'));
71
+ echo '<br>' . $this->__($text) . ' : ' . $value;
72
+ endif;
73
+ ?>
74
+ <?php
75
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
76
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
77
+ echo '<br>' . ($this->getAdditionalData('NnNoteTID'));
78
+ else:
79
+ $note = explode('|', $this->getAdditionalData('NnNoteTID'));
80
+ echo "<br />";
81
+ foreach ($note as $noteValue):
82
+ list($text, $value) = explode(':', $noteValue);
83
+ if (preg_match("/Order No&/i", $value)):
84
+ list($referenceTxt, $value) = explode('&', $value);
85
+ str_replace('&', '', $referenceTxt);
86
+ echo '<br>' . $this->__($text) . ' : ' . '<b>' . $this->__($referenceTxt) . ' ' . $value . '</b>';
87
+ else:
88
+ if ($text == 'NN_Reference_desc1' || $text == 'NN_Reference_desc2'):
89
+ echo '<br><b>' . $this->__($text) . '</b>';
90
+ else:
91
+ echo '<br>' . $this->__($text) . ' : ' . $value;
92
+ endif;
93
+ endif;
94
+ endforeach;
95
+ endif;
96
+ endif;
97
+ ?>
98
+ <?php
99
+ if (strlen($this->getAdditionalData('NnComments'))):
100
+ echo '<br>' . ($this->getAdditionalData('NnComments'));
101
+ endif;
102
+ ?>
103
  <?php endif; ?>
104
  <?php else: ?>
105
  <?php echo $this->__('Error in getting payment method') ?>
106
  <?php endif; ?>
 
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Sepa.phtml CHANGED
@@ -31,30 +31,25 @@ $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
- ?>
35
- <?php
36
- if ($this->getAdditionalData('NnTestOrder'))
37
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
38
  ?>
39
- <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
40
- <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
41
- <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>
42
- <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>
43
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
44
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
45
- <?php if ($this->getAdditionalData('refunded_tid')):
46
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
47
- if ($this->getAdditionalData('fullRefund') == true):
48
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
49
- elseif(preg_match("/refund/i", $value['reftid'])):
50
- echo $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br><br>';
51
- else:
52
- echo $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('refund amount %s', $value['refamount']) . ', ' . $this->__('New Tid: %s', $value['reftid']) . ' ' . $this->__('for the balance amount.') . '<br><br>';
53
- endif;
54
  endforeach;
55
- endif;
56
- ?>
57
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
58
  <?php else: ?>
59
  <?php echo $this->__('Error in getting payment method') ?>
60
  <?php endif; ?>
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
 
 
 
 
34
  ?>
35
+ <?php
36
+ if ($this->getAdditionalData('NnTestOrder'))
37
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
38
+ ?>
39
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
40
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
41
+ <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>
42
+ <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>
43
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
44
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
45
+ <?php
46
+ if ($this->getAdditionalData('refunded_tid')):
47
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
48
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
 
49
  endforeach;
50
+ endif;
51
+ ?>
52
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
53
  <?php else: ?>
54
  <?php echo $this->__('Error in getting payment method') ?>
55
  <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Banktransfer.phtml CHANGED
@@ -28,22 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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>' ?>
35
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
36
- <?php if ($this->getAdditionalData('refunded_tid')):
37
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
38
- if ($this->getAdditionalData('fullRefund') == true):
39
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
40
- else:
41
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
42
- endif;
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; ?>
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/Cc.phtml CHANGED
@@ -31,31 +31,32 @@ $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}}
36
- <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?>{{pdf_row_separator}}
37
- <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>{{pdf_row_separator}}
38
- <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>{{pdf_row_separator}}
39
- <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>{{pdf_row_separator}}
40
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>{{pdf_row_separator}}
41
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>{{pdf_row_separator}}
42
- <?php if ($this->getAdditionalData('refunded_tid')):
43
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
44
- if ($this->getAdditionalData('fullRefund') == true):
45
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
46
- ?>
47
- {{pdf_row_separator}}
48
- <?php
49
- else:
50
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
51
- ?>
52
- {{pdf_row_separator}}
53
- <?php
54
- endif;
55
- endforeach;
56
- endif;
57
- ?>
58
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
 
59
  <?php else: ?>
60
  <?php echo $this->__('Error in getting payment method') ?>
61
  <?php endif; ?>
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}}
36
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?>{{pdf_row_separator}}
37
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>{{pdf_row_separator}}
38
+ <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>{{pdf_row_separator}}
39
+ <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>{{pdf_row_separator}}
40
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>{{pdf_row_separator}}
41
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>{{pdf_row_separator}}
42
+ <?php
43
+ if ($this->getAdditionalData('refunded_tid')):
44
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
45
+ if ($this->getAdditionalData('fullRefund') == true || preg_match("/-refund/i", $value['reftid'])):
46
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
47
+ ?>
48
+ {{pdf_row_separator}}
49
+ <?php
50
+ else:
51
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s.Your new TID for the refund amount: %s', $helper->makeValidNumber($value['reqtid']), $value['refamount'], $helper->makeValidNumber($value['reftid'])) . '<br><br>';
52
+ ?>
53
+ {{pdf_row_separator}}
54
+ <?php
55
+ endif;
56
+ endforeach;
57
+ endif;
58
+ ?>{{pdf_row_separator}}
59
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
60
  <?php else: ?>
61
  <?php echo $this->__('Error in getting payment method') ?>
62
  <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Eps.phtml CHANGED
@@ -28,22 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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>' ?>
35
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
36
- <?php if ($this->getAdditionalData('refunded_tid')):
37
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
38
- if ($this->getAdditionalData('fullRefund') == true):
39
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
40
- else:
41
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
42
- endif;
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; ?>
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/Ideal.phtml CHANGED
@@ -28,22 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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>' ?>
35
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
36
- <?php if ($this->getAdditionalData('refunded_tid')):
37
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
38
- if ($this->getAdditionalData('fullRefund') == true):
39
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
40
- else:
41
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
42
- endif;
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; ?>
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
@@ -35,64 +35,70 @@ $nextCycleDate = $helper->getCycleDate($nextCycleId);
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}}
37
  <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br>'; ?>{{pdf_row_separator}}
38
- <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br><br>' ?>{{pdf_row_separator}}
39
- <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>{{pdf_row_separator}}
40
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>{{pdf_row_separator}}
41
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>{{pdf_row_separator}}
42
- <?php if ($this->getAdditionalData('refunded_tid')):
43
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
44
- if ($this->getAdditionalData('fullRefund') == true):
45
- echo '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
46
  else:
47
- echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
 
 
 
 
 
48
  endif;
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')):
56
- echo nl2br($this->getAdditionalData('NnNote'));
57
- else:
58
- $note = explode('|',$this->getAdditionalData('NnNote'));
59
- echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
60
- foreach($note as $noteValue):
61
- list($text, $value) = explode(':', $noteValue);
62
- echo $this->__($text) . ' : '. $value ?> {{pdf_row_separator}} <?php
63
- endforeach;
64
  endif;
65
- endif;
66
- ?>{{pdf_row_separator}}
67
- <?php
68
- if (strlen($this->getAdditionalData('NnNoteAmount'))):
69
- list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
70
- echo $this->__($text) . ' : '. $value;
71
- endif;
72
- ?>{{pdf_row_separator}}
73
- <?php
74
- if (strlen($this->getAdditionalData('NnNoteTID'))):
75
- if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
76
- echo nl2br($this->getAdditionalData('NnNoteTID'));
77
- else:
78
- $note = explode('|',$this->getAdditionalData('NnNoteTID'));
79
- echo "<br />";
80
- foreach($note as $noteValue):
81
- list($text, $value) = explode(':', $noteValue);
82
- if ($text == 'NN_Reference3'):
83
- list($referenceTxt, $value) = explode('&', $value);
84
- str_replace('&', '', $referenceTxt);
85
- echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
86
- else:
87
- echo $this->__($text) . ' : '. $value ?> {{pdf_row_separator}} <?php
88
- endif;
89
- endforeach;
90
  endif;
91
- endif;
92
- ?>{{pdf_row_separator}}
93
- <?php
94
- if (strlen($this->getAdditionalData('NnComments'))):
95
- echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
96
- endif;
97
- ?>{{pdf_row_separator}}
98
  <?php endif; ?>
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}}
37
  <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br>'; ?>{{pdf_row_separator}}
38
+ <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br>' ?>{{pdf_row_separator}}
39
+ <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br>' ?>{{pdf_row_separator}}
40
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br>' ?>{{pdf_row_separator}}
41
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br>' ?>{{pdf_row_separator}}
42
+ <?php
43
+ if ($this->getAdditionalData('refunded_tid')):
44
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
45
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
46
+ ?>
47
+ {{pdf_row_separator}}
48
+ <?php
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')):
56
+ echo nl2br($this->getAdditionalData('NnNote'));
57
+ else:
58
+ $note = explode('|', $this->getAdditionalData('NnNote'));
59
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
60
+ foreach ($note as $noteValue):
61
+ list($text, $value) = explode(':', $noteValue);
62
+ echo $this->__($text) . ' : ' . $value
63
+ ?> {{pdf_row_separator}} <?php
64
+ endforeach;
65
+ endif;
66
+ endif;
67
+ ?>{{pdf_row_separator}}
68
+ <?php
69
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
70
+ list ($text, $value) = explode(':', $this->getAdditionalData('NnNoteAmount'));
71
+ echo $this->__($text) . ' : ' . $value;
72
+ endif;
73
+ ?>{{pdf_row_separator}}
74
+ <?php
75
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
76
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
77
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
78
+ else:
79
+ $note = explode('|', $this->getAdditionalData('NnNoteTID'));
80
+ echo "<br />";
81
+ foreach ($note as $noteValue):
82
+ list($text, $value) = explode(':', $noteValue);
83
+ if (preg_match("/Order No&/i", $value)):
84
+ list($referenceTxt, $value) = explode('&', $value);
85
+ str_replace('&', '', $referenceTxt);
86
+ echo $this->__($text) . ' : ' . '<b>' . $this->__($referenceTxt) . ' ' . $value . '</b></br>';
87
  else:
88
+ if ($text == 'NN_Reference_desc1' || $text == 'NN_Reference_desc2'):
89
+ echo '<b>' . $this->__($text) . '</b></br>';
90
+ else:
91
+ echo $this->__($text) . ' : ' . $value
92
+ ?> {{pdf_row_separator}} <?php
93
+ endif;
94
  endif;
95
  endforeach;
96
+ endif;
 
 
 
 
 
 
 
 
 
 
 
 
 
97
  endif;
98
+ ?>{{pdf_row_separator}}
99
+ <?php
100
+ if (strlen($this->getAdditionalData('NnComments'))):
101
+ echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
102
  endif;
103
+ ?>{{pdf_row_separator}}
 
 
 
 
 
 
104
  <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Paypal.phtml CHANGED
@@ -28,22 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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>' ?>
35
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
36
- <?php if ($this->getAdditionalData('refunded_tid')):
37
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
38
- if ($this->getAdditionalData('fullRefund') == true):
39
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
40
- else:
41
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
42
- endif;
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; ?>
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/Prepayment.phtml CHANGED
@@ -35,64 +35,70 @@ $nextCycleDate = $helper->getCycleDate($nextCycleId);
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}}
37
  <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br>'; ?>{{pdf_row_separator}}
38
- <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br><br>' ?>{{pdf_row_separator}}
39
- <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>{{pdf_row_separator}}
40
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>{{pdf_row_separator}}
41
  <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>{{pdf_row_separator}}
42
- <?php if ($this->getAdditionalData('refunded_tid')):
43
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
44
- if ($this->getAdditionalData('fullRefund') == true):
45
- echo '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
46
  else:
47
- echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
 
 
 
 
 
48
  endif;
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')):
56
- echo nl2br($this->getAdditionalData('NnNote'));
57
- else:
58
- $note = explode('|',$this->getAdditionalData('NnNote'));
59
- echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
60
- foreach($note as $noteValue):
61
- list($text, $value) = explode(':', $noteValue);
62
- echo $this->__($text) . ' : '. $value ?> {{pdf_row_separator}} <?php
63
- endforeach;
64
  endif;
65
- endif;
66
- ?>{{pdf_row_separator}}
67
- <?php
68
- if (strlen($this->getAdditionalData('NnNoteAmount'))):
69
- list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
70
- echo $this->__($text) . ' : '. $value;
71
- endif;
72
- ?>{{pdf_row_separator}}
73
- <?php
74
- if (strlen($this->getAdditionalData('NnNoteTID'))):
75
- if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
76
- echo nl2br($this->getAdditionalData('NnNoteTID'));
77
- else:
78
- $note = explode('|',$this->getAdditionalData('NnNoteTID'));
79
- echo "<br />";
80
- foreach($note as $noteValue):
81
- list($text, $value) = explode(':', $noteValue);
82
- if ($text == 'NN_Reference3'):
83
- list($referenceTxt, $value) = explode('&', $value);
84
- str_replace('&', '', $referenceTxt);
85
- echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
86
- else:
87
- echo $this->__($text) . ' : '. $value ?> {{pdf_row_separator}} <?php
88
- endif;
89
- endforeach;
90
  endif;
91
- endif;
92
- ?>{{pdf_row_separator}}
93
- <?php
94
- if (strlen($this->getAdditionalData('NnComments'))):
95
- echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
96
- endif;
97
- ?>{{pdf_row_separator}}
98
  <?php endif; ?>
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}}
37
  <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br>'; ?>{{pdf_row_separator}}
38
+ <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br>' ?>{{pdf_row_separator}}
39
+ <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br>' ?>{{pdf_row_separator}}
40
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br>' ?>{{pdf_row_separator}}
41
  <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>{{pdf_row_separator}}
42
+ <?php
43
+ if ($this->getAdditionalData('refunded_tid')):
44
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
45
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
46
+ ?>
47
+ {{pdf_row_separator}}
48
+ <?php
49
+ endforeach;
50
+ endif;
51
+ ?>{{pdf_row_separator}}
52
+ <?php if (!preg_match("/invoice|creditmemo|shipment|callback_novalnet2magento/i", $currentUrl)): ?>
53
+ <?php
54
+ if (strlen($this->getAdditionalData('NnNote'))):
55
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
56
+ echo nl2br($this->getAdditionalData('NnNote'));
57
+ else:
58
+ $note = explode('|', $this->getAdditionalData('NnNote'));
59
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
60
+ foreach ($note as $noteValue):
61
+ list($text, $value) = explode(':', $noteValue);
62
+ echo $this->__($text) . ' : ' . $value
63
+ ?> {{pdf_row_separator}} <?php
64
+ endforeach;
65
+ endif;
66
+ endif;
67
+ ?>{{pdf_row_separator}}
68
+ <?php
69
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
70
+ list ($text, $value) = explode(':', $this->getAdditionalData('NnNoteAmount'));
71
+ echo $this->__($text) . ' : ' . $value;
72
+ endif;
73
+ ?>{{pdf_row_separator}}
74
+ <?php
75
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
76
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
77
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
78
+ else:
79
+ $note = explode('|', $this->getAdditionalData('NnNoteTID'));
80
+ echo "<br />";
81
+ foreach ($note as $noteValue):
82
+ list($text, $value) = explode(':', $noteValue);
83
+ if (preg_match("/Order No&/i", $value)):
84
+ list($referenceTxt, $value) = explode('&', $value);
85
+ str_replace('&', '', $referenceTxt);
86
+ echo $this->__($text) . ' : ' . '<b>' . $this->__($referenceTxt) . ' ' . $value . '</b></br>';
87
  else:
88
+ if ($text == 'NN_Reference_desc1' || $text == 'NN_Reference_desc2'):
89
+ echo '<b>' . $this->__($text) . '</b></br>';
90
+ else:
91
+ echo $this->__($text) . ' : ' . $value
92
+ ?> {{pdf_row_separator}} <?php
93
+ endif;
94
  endif;
95
  endforeach;
96
+ endif;
 
 
 
 
 
 
 
 
 
 
 
 
 
97
  endif;
98
+ ?>{{pdf_row_separator}}
99
+ <?php
100
+ if (strlen($this->getAdditionalData('NnComments'))):
101
+ echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
102
  endif;
103
+ ?>{{pdf_row_separator}}
 
 
 
 
 
 
104
  <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Sepa.phtml CHANGED
@@ -31,36 +31,25 @@ $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}}
36
- <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?>{{pdf_row_separator}}
37
- <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>{{pdf_row_separator}}
38
- <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>{{pdf_row_separator}}
39
- <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>{{pdf_row_separator}}
40
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>{{pdf_row_separator}}
41
- <?php if ($this->getAdditionalData('voidTid')) $this->__('The transaction has been canceled on ') . $currentTime . '<br><br>' ?>{{pdf_row_separator}}
42
- <?php if ($this->getAdditionalData('refunded_tid')):
43
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
44
- if ($this->getAdditionalData('fullRefund') == true):
45
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
46
  ?>
47
  {{pdf_row_separator}}
48
  <?php
49
- elseif(preg_match("/refund/i", $value['reftid'])):
50
- echo $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br><br>';
51
- ?>
52
- {{pdf_row_separator}}
53
- <?php
54
- else:
55
- echo $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('refund amount %s', $value['refamount']) . ', ' . $this->__('New Tid: %s', $value['reftid']) . ' ' . $this->__('for the balance amount.') . '<br><br>';
56
- ?>
57
- {{pdf_row_separator}}
58
- <?php
59
- endif;
60
  endforeach;
61
- endif;
62
- ?>
63
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
64
  <?php else: ?>
65
  <?php echo $this->__('Error in getting payment method') ?>
66
  <?php endif; ?>
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}}
36
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?>{{pdf_row_separator}}
37
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>{{pdf_row_separator}}
38
+ <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>{{pdf_row_separator}}
39
+ <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>{{pdf_row_separator}}
40
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>{{pdf_row_separator}}
41
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>{{pdf_row_separator}}
42
+ <?php
43
+ if ($this->getAdditionalData('refunded_tid')):
44
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
45
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
46
  ?>
47
  {{pdf_row_separator}}
48
  <?php
 
 
 
 
 
 
 
 
 
 
 
49
  endforeach;
50
+ endif;
51
+ ?>
52
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
53
  <?php else: ?>
54
  <?php echo $this->__('Error in getting payment method') ?>
55
  <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/sales/order/view/info.phtml CHANGED
@@ -131,12 +131,18 @@ $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium',
131
  <td class="value"><strong><?php echo $_groupName ?></strong></td>
132
  </tr>
133
  <?php endif; ?>
134
- <?php foreach ($this->getCustomerAccountData() as $data):?>
135
  <tr>
136
- <td class="label"><label><?php echo $data['label'] ?></label></td>
137
- <td class="value"><strong><?php echo $data['value'] ?></strong></td>
138
  </tr>
139
- <?php endforeach;?>
 
 
 
 
 
 
140
  </table>
141
  </div>
142
  </div>
131
  <td class="value"><strong><?php echo $_groupName ?></strong></td>
132
  </tr>
133
  <?php endif; ?>
134
+ <?php if ($_dob=$this->getOrder()->getCustomerDob()) : ?>
135
  <tr>
136
+ <td class="label"><label><?php echo Mage::helper('sales')->__('Date of Birth') ?></label></td>
137
+ <td class="value"><strong><?php echo Mage::helper('core')->formatDate($_dob, 'medium') ?></strong></td>
138
  </tr>
139
+ <?php endif; ?>
140
+ <?php if ($_taxvat = $_order->getCustomerTaxvat()):?>
141
+ <tr>
142
+ <td class="label"><label><?php echo Mage::helper('sales')->__('TAX/VAT Number') ?></label></td>
143
+ <td class="value"><strong><?php echo $this->htmlEscape($_taxvat)?></strong></td>
144
+ </tr>
145
+ <?php endif;?>
146
  </table>
147
  </div>
148
  </div>
app/design/adminhtml/default/default/template/novalnet/sales/order/view/tab/info.phtml CHANGED
@@ -65,7 +65,7 @@ $sepaparentTid = isset($data['NnSepaParentTid']) ? $data['NnSepaParentTid'] : '
65
  //$paymentname
66
  $helper = Mage::helper('novalnet_payment');
67
  $checkTidExist = $sepaparentTid ? $sepaparentTid : $parentTid;
68
- if ($checkTidExist == '') {
69
  $checkTidExist = $payment->getLastTransId();
70
  }
71
  if (preg_match("/refund/i", $checkTidExist)) {
@@ -100,7 +100,7 @@ $sepaparentTid = isset($data['NnSepaParentTid']) ? $data['NnSepaParentTid'] : '
100
  <br />
101
  <div><?php echo $this->__('Novalnet transaction amount') ?>:&nbsp;<input class="validate-date required-entry" type="text" id="amount_changed" name="amount_changed" value="<?php echo $amount; ?>" onkeypress="return novalnetAllowNumeric(event)"; style="width:4em" /> &nbsp;&nbsp;
102
  <button type="button" title="<?php echo $this->__('Amount Changed button') ?>" class="button" onclick="amount_changed('<?php
103
- echo Mage::helper('adminhtml')->getUrl('*/*/amountupdate', array(
104
  'order_id' => $_order->getId()))
105
  ?>', 2,'<?php echo $this->__('Enter the valid amount'); ?>');"><span><span><?php echo $this->__('Amount Changed button') ?></span></span></button><br /><br />
106
 
@@ -110,7 +110,7 @@ $sepaparentTid = isset($data['NnSepaParentTid']) ? $data['NnSepaParentTid'] : '
110
  </div>
111
  <?php
112
  } else if ($status == 100 && in_array($paymentname, $invoicepayment)
113
- && ($paid == 1 || $paid == '')) {
114
  $amount = $statusCall->getAmount();
115
  $date = $statusCall->getInvoiceDueDate();
116
  ?>
@@ -128,9 +128,9 @@ $sepaparentTid = isset($data['NnSepaParentTid']) ? $data['NnSepaParentTid'] : '
128
 
129
  <tr><td colspan=2>
130
  <button type="button" title="<?php echo $this->__('Amount Changed button') ?>" class="button" onclick="amount_changed('<?php
131
- echo Mage::helper('adminhtml')->getUrl('*/*/amountupdate', array(
132
  'order_id' => $_order->getId()))
133
- ?>', '<?php echo $paid; ?>','<?php echo $this->__('Enter the valid amount'); ?>','<?php echo $this->__('Enter the amount or invoice duedate'); ?>','<?php echo $this->__('Invoice duedate is invalid'); ?>');"><span><span><?php echo $this->__('Amount Changed button') ?></span></span></button></td></tr>
134
  </table>
135
  </fieldset>
136
  </div>
@@ -266,7 +266,7 @@ $sepaparentTid = isset($data['NnSepaParentTid']) ? $data['NnSepaParentTid'] : '
266
  return dArr[2]+ "." +dArr[1]+ "." +dArr[0]; //ex out: "18/01/10"
267
  }
268
 
269
- function amount_changed(url, one,lang,lang1,lang2) {
270
 
271
  var amountchanged = document.getElementById('amount_changed').value;
272
  var paymentcode = '<?php echo $paymentname; ?>';
@@ -274,22 +274,38 @@ $sepaparentTid = isset($data['NnSepaParentTid']) ? $data['NnSepaParentTid'] : '
274
  if (one == 1 || paymentcode == 'novalnetPrepayment') {
275
  var invoice_duedate = document.getElementById('invoice_duedate').value;
276
  invoicedate = invoice_duedate.length;
 
 
 
 
 
277
  }
278
 
279
 
280
- if ((one == 1 || paymentcode == 'novalnetPrepayment') && invoice_duedate == '' && amountchanged == '') {
281
  alert(lang1);
282
  return false;
283
  }
284
  //return false;
285
- if (amountchanged == '' || amountchanged <= 0 || isNaN(amountchanged)) {
286
  alert(lang);
287
  return false;
288
  }
289
- if ((one == 1 || paymentcode == 'novalnetPrepayment') && invoice_duedate != '' && !invoice_duedate.match(/^[0-9]{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])/)) {
290
  Translator.add('Invoice duedate is invalid', '<?php echo $this->__('Invoice duedate is invalid'); ?>');
291
  alert(Translator.translate(lang2));
292
  return false;
 
 
 
 
 
 
 
 
 
 
 
293
  } else if ((one == 1 || paymentcode == 'novalnetPrepayment') && invoicedate > 10) {
294
  alert(Translator.translate(lang2));
295
  return false;
65
  //$paymentname
66
  $helper = Mage::helper('novalnet_payment');
67
  $checkTidExist = $sepaparentTid ? $sepaparentTid : $parentTid;
68
+ if (!$checkTidExist) {
69
  $checkTidExist = $payment->getLastTransId();
70
  }
71
  if (preg_match("/refund/i", $checkTidExist)) {
100
  <br />
101
  <div><?php echo $this->__('Novalnet transaction amount') ?>:&nbsp;<input class="validate-date required-entry" type="text" id="amount_changed" name="amount_changed" value="<?php echo $amount; ?>" onkeypress="return novalnetAllowNumeric(event)"; style="width:4em" /> &nbsp;&nbsp;
102
  <button type="button" title="<?php echo $this->__('Amount Changed button') ?>" class="button" onclick="amount_changed('<?php
103
+ echo Mage::helper('adminhtml')->getUrl('*/novalnetpayment_sales_order/amountupdate', array(
104
  'order_id' => $_order->getId()))
105
  ?>', 2,'<?php echo $this->__('Enter the valid amount'); ?>');"><span><span><?php echo $this->__('Amount Changed button') ?></span></span></button><br /><br />
106
 
110
  </div>
111
  <?php
112
  } else if ($status == 100 && in_array($paymentname, $invoicepayment)
113
+ && ($paid == 1 || !$paid)) {
114
  $amount = $statusCall->getAmount();
115
  $date = $statusCall->getInvoiceDueDate();
116
  ?>
128
 
129
  <tr><td colspan=2>
130
  <button type="button" title="<?php echo $this->__('Amount Changed button') ?>" class="button" onclick="amount_changed('<?php
131
+ echo Mage::helper('adminhtml')->getUrl('*/novalnetpayment_sales_order/amountupdate', array(
132
  'order_id' => $_order->getId()))
133
+ ?>', '<?php echo $paid; ?>','<?php echo $this->__('Enter the valid amount'); ?>','<?php echo $this->__('Enter the amount or invoice duedate'); ?>','<?php echo $this->__('Invoice duedate is invalid'); ?>','<?php echo $this->__('Invalid due date'); ?>');"><span><span><?php echo $this->__('Amount Changed button') ?></span></span></button></td></tr>
134
  </table>
135
  </fieldset>
136
  </div>
266
  return dArr[2]+ "." +dArr[1]+ "." +dArr[0]; //ex out: "18/01/10"
267
  }
268
 
269
+ function amount_changed(url, one,lang,lang1,lang2,lang3) {
270
 
271
  var amountchanged = document.getElementById('amount_changed').value;
272
  var paymentcode = '<?php echo $paymentname; ?>';
274
  if (one == 1 || paymentcode == 'novalnetPrepayment') {
275
  var invoice_duedate = document.getElementById('invoice_duedate').value;
276
  invoicedate = invoice_duedate.length;
277
+ var rx_date_pattern = /^(\d{4})(\/|-)(\d{1,2})(\/|-)(\d{1,2})$/;
278
+ var dt_array = invoice_duedate.match(rx_date_pattern);
279
+ var dt_month = dt_array[3];
280
+ var dt_day = dt_array[5];
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;
288
  }
289
  //return false;
290
+ if (!amountchanged || amountchanged <= 0 || isNaN(amountchanged)) {
291
  alert(lang);
292
  return false;
293
  }
294
+ if ((one == 1 || paymentcode == 'novalnetPrepayment') && invoice_duedate && !invoice_duedate.match(/^[0-9]{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])/)) {
295
  Translator.add('Invoice duedate is invalid', '<?php echo $this->__('Invoice duedate is invalid'); ?>');
296
  alert(Translator.translate(lang2));
297
  return false;
298
+ } else if ((dt_month==4 || dt_month==6 || dt_month==9 || dt_month==11) && dt_day ==31) {
299
+ Translator.add('Invalid due date', '<?php echo $this->__('Invalid due date'); ?>');
300
+ alert(Translator.translate(lang3));
301
+ return false;
302
+ } else if (dt_month == 2) {
303
+ var is_leap = (dt_year % 4 == 0 && (dt_year % 100 != 0 || dt_year % 400 == 0));
304
+ if (dt_day > 29 || (dt_day ==29 && !is_leap)) {
305
+ Translator.add('Invalid due date', '<?php echo $this->__('Invalid due date'); ?>');
306
+ alert(Translator.translate(lang3));
307
+ return false;
308
+ }
309
  } else if ((one == 1 || paymentcode == 'novalnetPrepayment') && invoicedate > 10) {
310
  alert(Translator.translate(lang2));
311
  return false;
app/design/adminhtml/default/default/template/novalnet/transaction/overview/view/form.phtml CHANGED
@@ -172,7 +172,7 @@ $data = $this->getNovalnetTransactionOverview();
172
  <td class="label">
173
  <label><?php echo $this->helper('novalnet_payment')->__('Response Data') ?></label><br>
174
  <div style="height:250px;overflow:scroll;width:600px;"><strong><?php
175
- $getresponseData = unserialize(base64_decode($data->getResponseData()));
176
  echo "<pre>";
177
  print_r($getresponseData);
178
  echo "</pre>";
172
  <td class="label">
173
  <label><?php echo $this->helper('novalnet_payment')->__('Response Data') ?></label><br>
174
  <div style="height:250px;overflow:scroll;width:600px;"><strong><?php
175
+ $getresponseData = unserialize(base64_decode($data->getResponseData()));
176
  echo "<pre>";
177
  print_r($getresponseData);
178
  echo "</pre>";
app/design/frontend/base/default/template/novalnet/payment/method/form/Banktransfer.phtml CHANGED
@@ -23,10 +23,10 @@
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
- <fieldset class="form-list">
30
  <!--{{{ Payment Logo -->
31
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
@@ -38,23 +38,24 @@ $helper = Mage::helper('novalnet_payment');
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
- <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
42
- <!--{{{ Payment Description -->
 
 
 
 
 
 
43
  <li>
44
- <?php echo $this->__('redirect payment description') ?>
45
  </li>
46
- <?php if ($this->getUserInfo()): ?>
47
- <li>
48
- <?php echo $this->getUserInfo() ?>
49
- </li>
50
- <?php endif; ?>
51
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
52
- <li>
53
- <div style="font-weight:bold;color:red;font-size:12px;">
54
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
55
- </div>
56
- </li>
57
- <?php endif ?>
58
- <!--{{{ Payment Description -->
59
- </ul>
60
- </fieldset>
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
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
+ <!--{{{ Payment Description -->
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()): ?>
49
  <li>
50
+ <?php echo $this->getUserInfo() ?>
51
  </li>
52
+ <?php endif; ?>
53
+ <?php if ($this->getMethod()->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
+ <!--{{{ Payment Description -->
61
+ </ul>
 
 
 
 
 
app/design/frontend/base/default/template/novalnet/payment/method/form/Cc.phtml CHANGED
@@ -28,13 +28,18 @@ $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()->_getConfigData('auto_refill', true);
32
  // get quote billing address
33
- $billingaddress = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
 
34
  $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
35
- ? $billingaddress->getTelephone() : '' ;
 
 
 
 
36
  ?>
37
- <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
38
  <!--{{{ Payment Logo -->
39
  <div>
40
  <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;float:none;">
@@ -46,148 +51,120 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
46
  </div>
47
  <!--}}} Payment Logo -->
48
  <!--{{{ Novalnet Cc Form -->
49
-
50
- <ul id="payment_form_<?php echo $code ?>" style="display:none;">
51
- <div class="nnccloader" id='cc_loading' style='display:none;'></div>
 
 
 
 
 
 
 
52
  <li>
53
- <?php echo $this->__('The amount will be debited from your credit card once the order is submitted'); ?>
54
  </li>
55
- <?php if ($this->getUserInfo()): ?>
56
- <li>
57
- <?php echo $this->getUserInfo() ?>
58
- </li>
59
- <?php endif ?>
60
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('live_mode', true) == 0): ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
61
  <li>
62
- <div style="font-weight:bold;color:red;font-size:12px;">
63
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
 
 
 
 
 
 
 
64
  </div>
65
  </li>
66
- <?php endif ?>
67
- <li class="fields">
68
- <div class="field">
69
- <label style="float:none;" for="<?php echo $code ?>_cc_type"><?php echo $this->__('NN CC type') ?><span class="required">*</span></label><br />
70
- <div class="input-box">
71
- <select id="<?php echo $code ?>_cc_type" onchange="cchashcall()" class="required-entry validate-cc-type-select">
72
- <option value=""><?php echo $this->__('NN Select') ?></option>
73
- <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
74
- <option value="<?php echo $_typeCode ?>"><?php echo $_typeName ?></option>
75
- <?php endforeach; ?>
76
- </select>
77
  </div>
78
- </div>
79
- </li>
80
- <li class="fields">
81
- <div class="field">
82
- <label style="float:none;" for="<?php echo $code ?>_cc_owner"><?php echo $this->__('NN CC holder') ?><span class="required">*</span></label><br/>
83
- <div class="input-box">
84
- <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_cc_owner" autocomplete="off" onchange="cchashcall()" value="<?php echo $billingaddress->getFirstname() . ' ' . $billingaddress->getLastname(); ?>" /></div>
85
- </div>
86
- </li>
87
- <li class="fields">
88
- <div class="field">
89
- <label style="float:none;" for="<?php echo $code ?>_cc_number"><?php echo $this->__('NN CC number') ?><span class="required">*</span></label><br/>
90
  <div class="input-box">
91
- <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="" />
 
 
92
  </div>
93
- </div>
94
- </li>
95
- <li class="fields">
96
- <div class="field">
97
- <label style="float:none;" for="<?php echo $code ?>_expiration"><?php echo $this->__('NN Expiration Date') ?><span class="required">*</span></label><br />
 
98
  <div class="input-box">
99
- <div class="v-fix">
100
- <select id="<?php echo $code ?>_expiration" style="width:140px;" onchange="cchashcall()" class="required-entry">
101
- <option value=""><?php echo $this->__('Month'); ?></option>
102
- <?php foreach ($this->getCcMonths() as $k => $v): ?>
103
- <option value="<?php echo $k ?>"><?php echo $v ?></option>
104
- <?php endforeach; ?>
105
- </select>
106
- </div>
107
- <div class="v-fix" style="padding-left:5px;">
108
- <select id="<?php echo $code ?>_expiration_yr" style="width:103px;" onchange="cchashcall()" class="required-entry">
109
- <option value=""><?php echo $this->__('Year'); ?></option>
110
- <?php foreach ($this->getCcYears() as $k => $v): ?>
111
- <option value="<?php echo $k ?>"><?php echo $v ?></option>
112
- <?php endforeach; ?>
113
- </select>
114
- </div>
115
  </div>
116
- </div>
117
- </li>
118
- <li class="fields">
119
- <div class="field">
120
- <label style="float:none;" for="<?php echo $code ?>_cc_cid"><?php echo $this->__('NN CVC') ?><span class="required"></span></label><br />
121
- <div class="input-box">
122
- <div class="v-fix"><input style="width: 35px" 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" /></div>
123
- &nbsp;
124
- <a href="#"><img src='<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>cvc_hint.png' border="0" alt="CCV/CVC?" id="nn_cc_hint"></a>
125
- <img src="<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>creditcard_cvc.jpg" style="display:none;float:left;" border="0" id="nn_cvc_hover"/>
126
- </div>
127
- </div>
128
- </li>
129
- <!--{{{ CallbackType-->
130
- <?php if (!$creditCardSecure && $this->isCallbackTypeCall()): ?>
131
- <!--{{{ PIN by Callback-->
132
- <?php
133
- if ($this->getCallbackConfigData() != 3):
134
- ?>
135
- <li>
136
- <div class="input-box">
137
- <label style="float:none;" for="<?php echo $code ?>_callback_tel">
138
- <?php
139
- if ($this->getCallbackConfigData() == 2):
140
- ?>
141
- <?php echo $this->__('Mobile phone number'); ?>
142
- <?php else: ?>
143
- <?php echo $this->__('NN Mobile Number'); ?>
144
- <?php endif; ?>
145
- <span class="required">*</span></label><br/>
146
- <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
147
- echo $telephoneNumber; ?>"/>
148
- </div>
149
- </li>
150
- <li>
151
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
152
- <?php echo $this->__('Note for pin by sms and callback') ?>
153
- </div>
154
- <div class="input-box">
155
- <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
156
- <input onchange="document.getElementById('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/>
157
- <input id="new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
158
- <label style="float:none;" for="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
164
- elseif ($this->getCallbackConfigData() == 3):
165
- ?>
166
- <li>
167
- <div class="input-box">
168
- <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
169
- <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
170
- echo $billingaddress->getEmail(); ?>"/>
171
- </div>
172
- </li>
173
- <?php endif ?>
174
- <!--}}} Reply by Email-->
175
  <?php endif ?>
176
- <!--}}} CallbackType-->
177
- </ul>
178
-
179
- <input type="hidden" id="original_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>" />
180
- <input type="hidden" id="original_vendor_authcode" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>" />
181
- <input type="hidden" id="novalnet_cc_pan_hash" value="<?php
182
- echo $ccRefill ? $assignDatahelper->getCheckout()->getCcPanHash() : '';
183
- ?>" />
184
  <input type="hidden" name="novalnet_cc_hash" id="novalnet_cc_hash" value="" />
185
- <input type="hidden" name="novalnet_cc_unique_id" id="novalnet_cc_unique_id" value="<?php echo $ccRefill ? $assignDatahelper->getCheckout()->getCcUniqueId() : '';
186
- ?>" />
187
  <input type="hidden" id="nn_cc_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
188
  <input type="hidden" id="nn_cc_validate_error_message" value="<?php echo $this->__('Your credit card details are invalid') . '!'; ?>" />
189
  <!--}}} Novalnet Cc Form -->
190
- </fieldset>
191
  <style>
192
  .nnccloader {
193
  position: fixed;
@@ -198,12 +175,14 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
198
  z-index: 9999;
199
  background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
200
  }
 
 
 
 
 
 
 
 
 
 
201
  </style>
202
- <script type="text/javascript">
203
- jQuery('#nn_cc_hint').hover(function(){
204
- jQuery('#nn_cvc_hover').show();
205
- });
206
- jQuery('#nn_cc_hint').mouseleave(function(){
207
- jQuery('#nn_cvc_hover').hide();
208
- });
209
- </script>
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;">
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()): ?>
64
  <li>
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;
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>
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/novalnet/payment/method/form/Eps.phtml CHANGED
@@ -23,11 +23,10 @@
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
- <fieldset class="form-list">
30
-
31
  <!--{{{ Payment Logo -->
32
  <div>
33
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
@@ -39,23 +38,24 @@ $helper = Mage::helper('novalnet_payment');
39
  </a>
40
  </div>
41
  <!--}}} Payment Logo -->
42
- <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
43
- <!--{{{ Payment Description -->
 
 
 
 
 
 
44
  <li>
45
- <?php echo $this->__('redirect payment description') ?>
46
  </li>
47
- <?php if ($this->getUserInfo()): ?>
48
- <li>
49
- <?php echo $this->getUserInfo() ?>
50
- </li>
51
- <?php endif; ?>
52
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
53
- <li>
54
- <div style="font-weight:bold;color:red;font-size:12px;">
55
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
56
- </div>
57
- </li>
58
- <?php endif ?>
59
- <!--}}} Payment Description -->
60
- </ul>
61
- </fieldset>
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
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
+ <!--{{{ Payment Description -->
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()): ?>
49
  <li>
50
+ <?php echo $this->getUserInfo() ?>
51
  </li>
52
+ <?php endif; ?>
53
+ <?php if ($this->getMethod()->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
+ <!--}}} Payment Description -->
61
+ </ul>
 
 
 
 
 
app/design/frontend/base/default/template/novalnet/payment/method/form/Ideal.phtml CHANGED
@@ -23,11 +23,10 @@
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
- <fieldset class="form-list">
30
-
31
  <!--{{{ Payment Logo -->
32
  <div>
33
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
@@ -39,23 +38,24 @@ $helper = Mage::helper('novalnet_payment');
39
  </a>
40
  </div>
41
  <!--}}} Payment Logo -->
42
- <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
43
- <!--{{{ Payment Description -->
 
 
 
 
 
 
44
  <li>
45
- <?php echo $this->__('redirect payment description') ?>
46
  </li>
47
- <?php if ($this->getUserInfo()): ?>
48
- <li>
49
- <?php echo $this->getUserInfo() ?>
50
- </li>
51
- <?php endif; ?>
52
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
53
- <li>
54
- <div style="font-weight:bold;color:red;font-size:12px;">
55
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
56
- </div>
57
- </li>
58
- <?php endif ?>
59
- <!--{{{ Payment Description -->
60
- </ul>
61
- </fieldset>
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
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
+ <!--{{{ Payment Description -->
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()): ?>
49
  <li>
50
+ <?php echo $this->getUserInfo() ?>
51
  </li>
52
+ <?php endif; ?>
53
+ <?php if ($this->getMethod()->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
+ <!--{{{ Payment Description -->
61
+ </ul>
 
 
 
 
 
app/design/frontend/base/default/template/novalnet/payment/method/form/Invoice.phtml CHANGED
@@ -27,9 +27,9 @@ $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
  $billingaddress = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
29
  $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
30
- ? $billingaddress->getTelephone() : '' ;
31
  ?>
32
- <fieldset class="form-list">
33
  <!-- PAYMENT LOGO -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
@@ -38,65 +38,73 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
38
  </a>
39
  </div>
40
  <!-- PAYMENT LOGO -->
41
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
42
- <!--{{{ PAYMENT DESCRIPTION -->
 
 
 
43
  <li>
44
- <?php echo $this->__('Invoice/Prepayment payment description') ?>
45
  </li>
46
- <?php if ($this->getUserInfo()): ?>
 
 
 
 
 
 
 
 
 
 
 
 
47
  <li>
48
- <?php echo $this->getUserInfo() ?>
 
 
 
 
 
 
 
 
 
49
  </li>
50
- <?php endif ?>
51
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
52
  <li>
53
- <div style="font-weight:bold;color:red;font-size:12px;">
54
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
55
  </div>
56
  </li>
57
  <?php endif ?>
58
- <!--}}} PAYMENT DESCRIPTION -->
59
- <!--{{{ CallbackType-->
60
- <?php if ($this->isCallbackTypeCall()): ?>
61
- <!--{{{ PIN by Callback-->
62
- <?php if ($this->getCallbackConfigData() != 3): ?>
63
- <li>
64
- <div class="input-box">
65
- <label style="float:none;" for="<?php echo $code ?>_callback_tel">
66
- <?php
67
- if ($this->getCallbackConfigData() == 2):
68
- ?>
69
- <?php echo $this->__('Mobile phone number'); ?>
70
- <?php else: ?>
71
- <?php echo $this->__('NN Mobile Number'); ?>
72
- <?php endif; ?>
73
- <span class="required"></span></label><br/>
74
- <input type="text" value="<?php echo $telephoneNumber; ?>" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" />
75
- </div>
76
- </li>
77
- <li>
78
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
79
- <?php echo $this->__('Note for pin by sms and callback') ?>
80
- </div>
81
- <div class="input-box">
82
- <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required"></span></label><br/>
83
- <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/>
84
- <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
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
- <!--{{{ Reply by Email-->
90
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
91
- <li>
92
- <div class="input-box">
93
- <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required"></span></label><br/>
94
- <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" />
95
- </div>
96
- </li>
97
- <?php endif ?>
98
- <!--}}} Reply by Email-->
99
- <?php endif ?>
100
- <!--}}} CallbackType-->
101
- </ul>
102
- </fieldset>
27
  $helper = Mage::helper('novalnet_payment');
28
  $billingaddress = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
29
  $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
30
+ ? $billingaddress->getTelephone() : '' ;
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;">
38
  </a>
39
  </div>
40
  <!-- PAYMENT LOGO -->
41
+ <!--{{{ PAYMENT DESCRIPTION -->
42
+ <li>
43
+ <?php echo $this->__('Invoice/Prepayment payment description') ?>
44
+ </li>
45
+ <?php if ($this->getUserInfo()): ?>
46
  <li>
47
+ <?php echo $this->getUserInfo() ?>
48
  </li>
49
+ <?php endif ?>
50
+ <?php if ($this->getMethod()->getNovalnetConfig('live_mode', true) == 0): ?>
51
+ <li>
52
+ <div style="font-weight:bold;color:red;font-size:12px;">
53
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
54
+ </div>
55
+ </li>
56
+ <?php endif ?>
57
+ <!--}}} PAYMENT DESCRIPTION -->
58
+ <!--{{{ CallbackType-->
59
+ <?php if ($this->isCallbackTypeCall()): ?>
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'); ?>
66
+ <?php else: ?>
67
+ <?php echo $this->__('NN Mobile Number'); ?>
68
+ <?php endif; ?>
69
+ </label>
70
+ <div class="input-box">
71
+ <input type="text" value="<?php echo $telephoneNumber; ?>" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" />
72
+ </div>
73
  </li>
 
 
74
  <li>
75
+ <div class="nncallbacknote">
76
+ <?php echo $this->__('Note for pin by sms and callback') ?>
77
+ </div>
78
+ <label for="<?php echo $code ?>_callback_pin" class="required"><em>*</em><?php echo $this->__('PIN') ?></label>
79
+ <div class="input-box">
80
+ <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/>
81
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
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>
99
+ <style>
100
+ .nncallbacknote {
101
+ font-weight:bold;
102
+ font-size:11px;
103
+ color:gray;
104
+ border:1px solid #BFBFBF;
105
+ background:#FEFFBF;
106
+ padding:10px;
107
+ margin-top:10px;
108
+ width:400px;
109
+ }
110
+ </style>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/novalnet/payment/method/form/Paypal.phtml CHANGED
@@ -23,11 +23,10 @@
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
- <fieldset class="form-list">
30
-
31
  <!--{{{ Payment Logo -->
32
  <div>
33
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
@@ -39,23 +38,25 @@ $helper = Mage::helper('novalnet_payment');
39
  </a>
40
  </div>
41
  <!--}}} Payment Logo -->
42
- <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
43
- <!--{{{ Payment Description -->
 
 
 
 
 
 
 
 
 
 
 
44
  <li>
45
- <?php echo $this->__('redirect payment description') ?>
 
 
46
  </li>
47
- <?php if ($this->getUserInfo()): ?>
48
- <li>
49
- <?php echo $this->getUserInfo() ?>
50
- </li>
51
- <?php endif; ?>
52
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
53
- <li>
54
- <div style="font-weight:bold;color:red;font-size:12px;">
55
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
56
- </div>
57
- </li>
58
- <?php endif ?>
59
- <!--{{{ Payment Description -->
60
- </ul>
61
- </fieldset>
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
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
+ <!--{{{ Payment Description -->
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()): ?>
49
+ <li>
50
+ <?php echo $this->getUserInfo() ?>
51
+ </li>
52
+ <?php endif; ?>
53
+ <?php if ($this->getMethod()->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
+ <!--{{{ Payment Description -->
61
+ </ul>
62
+
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/novalnet/payment/method/form/Prepayment.phtml CHANGED
@@ -26,7 +26,7 @@
26
  $code = $this->getMethodCode();
27
  $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;">
@@ -35,23 +35,21 @@ $helper = Mage::helper('novalnet_payment');
35
  </a>
36
  </div>
37
  <!-- PAYMENT LOGO -->
38
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
39
- <!--{{{ PAYMENT DESCRIPTION -->
 
 
 
40
  <li>
41
- <?php echo $this->__('Invoice/Prepayment payment description') ?>
42
  </li>
43
- <?php if ($this->getUserInfo()): ?>
44
- <li>
45
- <?php echo $this->getUserInfo() ?>
46
- </li>
47
- <?php endif ?>
48
- <?php if ($this->getLiveMode() == 0): ?>
49
- <li>
50
- <div style="font-weight:bold;color:red;font-size:12px;">
51
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
52
- </div>
53
- </li>
54
- <?php endif ?>
55
- <!--}}} PAYMENT DESCRIPTION -->
56
- </ul>
57
- </fieldset>
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
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
35
  </a>
36
  </div>
37
  <!-- PAYMENT LOGO -->
38
+ <!--{{{ PAYMENT DESCRIPTION -->
39
+ <li>
40
+ <?php echo $this->__('Invoice/Prepayment payment description') ?>
41
+ </li>
42
+ <?php if ($this->getUserInfo()): ?>
43
  <li>
44
+ <?php echo $this->getUserInfo() ?>
45
  </li>
46
+ <?php endif ?>
47
+ <?php if ($this->getLiveMode() == 0): ?>
48
+ <li>
49
+ <div style="font-weight:bold;color:red;font-size:12px;">
50
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
51
+ </div>
52
+ </li>
53
+ <?php endif ?>
54
+ <!--}}} PAYMENT DESCRIPTION -->
55
+ </ul>
 
 
 
 
 
app/design/frontend/base/default/template/novalnet/payment/method/form/Sepa.phtml CHANGED
@@ -26,12 +26,13 @@
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
  $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
- $sepaRefill = $this->getMethod()->_getConfigData('auto_refill', true);
30
  $sepaPaymentRefill = $this->getMethod()->getConfigData('sepa_payment_refill');
31
  $refillValues = $assignDatahelper->getCheckout()->getRefilldatavalues();
32
- $refillMethod = ($sepaRefill && $refillValues != '' && $code == $refillValues->getMethod());
33
  // get quote billing address
34
- $billingaddress = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
 
35
  $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
36
  ? $billingaddress->getTelephone() : '' ;
37
  $street = $billingaddress->getStreet();
@@ -43,8 +44,12 @@ if ($sepaPaymentRefill && $customerlogin) {
43
  } else if ($sepaRefill) {
44
  $panhash = $assignDatahelper->getCheckout()->getSepaHash();
45
  }
 
 
 
 
46
  ?>
47
- <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
48
  <!--{{{ Payment Logo -->
49
  <div>
50
  <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
@@ -57,231 +62,126 @@ if ($sepaPaymentRefill && $customerlogin) {
57
  </div>
58
  <!--}}} Payment Logo -->
59
  <!--{{{ Novalnet SEPA Form -->
60
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
61
- <div class="nnsepaloader" id='sepa_loading' style='display:none;'></div>
 
 
 
62
  <li>
63
- <?php echo $this->__('Your account will be debited upon the order submission'); ?>
64
  </li>
65
- <?php if ($this->getUserInfo()): ?>
66
- <li>
67
- <?php echo $this->getUserInfo() ?>
68
- </li>
69
- <?php endif ?>
70
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('live_mode', true) == 0): ?>
71
- <li>
72
- <div style="font-weight:bold;color:red;font-size:12px;">
73
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
74
- </div>
75
- </li>
76
- <?php endif ?>
77
-
78
- <li class="fields">
79
- <div class="field">
80
- <label style="float:none;" for="<?php echo $code ?>_account_holder"><?php echo $this->__('Account Holder') ?><span class="required">*</span></label><br/>
81
- <div class="input-box">
82
- <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(); ?>" />
83
- </div>
84
  </div>
85
  </li>
86
- <li class="fields">
87
- <div class="field">
88
- <label style="float:none;" for="<?php echo $code ?>_bank_country"><?php echo $this->__('NN Country') ?><span class="required">*</span></label><br />
89
- <div class="input-box">
 
 
 
 
 
 
 
 
 
 
 
 
 
 
90
  <?php
91
- $_countries = Mage::getResourceModel('directory/country_collection')
92
- ->loadData()
93
- ->toOptionArray(false)
94
- ?>
95
- <?php if (count($_countries) > 0): ?>
96
- <select id="<?php echo $code ?>_bank_country" onchange="unsetHashRelatedElements()" class="required-entry">
97
- <?php
98
- foreach ($_countries as $_country):
99
- if (in_array($billingaddress->getCountryId(), $_country)) {
100
- ?>
101
- <option selected value="<?php echo $_country['value'] ?>"><?php echo $_country['label'] ?>
102
- </option>
103
- <?php } else { ?>
104
- <option value="<?php echo $_country['value'] ?>">
105
- <?php echo $_country['label'] ?>
106
- </option>
107
- <?php } ?>
108
- <?php endforeach; ?>
109
- </select><br/>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
110
  <?php endif; ?>
111
- </div>
112
- </div>
113
- </li>
114
- <li class="fields">
115
- <div class="field">
116
- <label style="float:none;" for="<?php echo $code ?>_account_number"><?php echo $this->__('IBAN or Account number') ?><span class="required">*</span></label><br/>
117
  <div class="input-box">
118
- <input type="text" id="<?php echo $code ?>_account_number" onkeypress="return ibanbicValidate(event)" onchange="unsetHashRelatedElements();" title="<?php echo $this->__('IBAN or Account number') ?>" class="required-entry input-text" autocomplete="off" value="" />
119
  </div>
120
- </div>
121
- </li>
122
-
123
- <li class="fields">
124
- <div class="field">
125
- <label style="float:none;" for="<?php echo $code ?>_bank_code"><?php echo $this->__('BIC or Bank code') ?><span class="required">*</span></label><br/>
126
  <div class="input-box">
127
- <input type="text" id="<?php echo $code ?>_bank_code" title="<?php echo $this->__('BIC or Bank code') ?>" class="input-text" autocomplete="off" onkeypress="return ibanbicValidate(event)" onchange="unsetHashRelatedElements()" value="" />
 
 
128
  </div>
129
- </div>
130
- </li>
131
-
132
- <li class="fields">
133
- <div class="field">
 
134
  <div class="input-box">
135
- <input type="checkbox" id="<?php echo $code ?>_mandate_confirm" title="<?php echo $this->__('confirm') ?>" class="required-entry" onclick="generate_sepa_iban_bic(this, '<?php echo $this->__('Your account details are invalid') ?>', '<?php echo $this->__('Basic parameter not valid') ?>')"/>
136
- <label style="float:none;" ><?php echo $this->__('NN Confirm') ?><span class="required"></span></label><br/>
137
  </div>
138
- </div>
139
- </li>
140
- <!--{{{ CallbackType-->
141
- <?php if ($this->isCallbackTypeCall()): ?>
142
- <!--{{{ PIN by Callback-->
143
- <?php
144
- if ($this->getCallbackConfigData() != 3):
145
- ?>
146
- <li>
147
- <label style="float:none;" for="<?php echo $code ?>_callback_tel">
148
- <div class="input-box">
149
- <?php
150
- if ($this->getCallbackConfigData() == 2):
151
- ?>
152
- <?php echo $this->__('Mobile phone number'); ?>
153
- <?php else: ?>
154
- <?php echo $this->__('NN Mobile Number'); ?>
155
- <?php endif; ?>
156
- <span class="required"></span></label><br/>
157
- <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
158
- echo $telephoneNumber; ?>"/>
159
- </div>
160
- </li>
161
- <li>
162
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
163
- <?php echo $this->__('Note for pin by sms and callback') ?>
164
- </div>
165
- <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
166
- <div class="input-box">
167
- <input onchange="document.getElementById('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/>
168
- <input id="new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
169
- <label style="float:none;" for="new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
170
- </div>
171
- </li>
172
- <!--}}} PIN by Callback-->
173
- <!--{{{ Reply by Email-->
174
- <?php
175
- elseif ($this->getCallbackConfigData() == 3):
176
- ?>
177
- <li>
178
- <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
179
- <div class="input-box">
180
- <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
181
- echo $billingaddress->getEmail(); ?>"/>
182
- </div>
183
- </li>
184
- <?php endif ?>
185
- <!--}}} Reply by Email-->
186
  <?php endif ?>
187
- <!--}}} CallbackType-->
188
- <!-- Mandate overlay START-->
189
- <li>
190
- <div class="bgCover">&nbsp;</div>
191
- <div id='sepa_mandate_overlay_block_first' style='display:none;' class='nnsepaloader'>
192
- </div>
193
- <div id='sepa_mandate_overlay_block' style='display:none;' class='overlay_window_block'>
194
- <div class='nn_header'>
195
- <h1><?php echo $this->__('SEPA Direct Debit Mandate Confirmation') ?></h1>
196
- </div>
197
- <div class='body_div' id='overlay_window_block_body' style="height: 400px;">
198
- <p>
199
- <table>
200
- <tr>
201
- <td><?php echo $this->__('Creditor') ?></td><td>:</td><td><span id='sepa_overlay_payee_span'>&nbsp;</span></td>
202
- </tr>
203
- <tr>
204
- <td><?php echo $this->__('Credit Identification Number') ?></td><td>:</td><td><span id='sepa_overlay_creditoridentificationnumber_span'>&nbsp;</span></td>
205
- </tr>
206
- <tr>
207
- <td><?php echo $this->__('Mandate Reference') ?></td><td>:</td><td><span id='sepa_overlay_mandatereference_span'>&nbsp;</span></td>
208
- </tr>
209
- </table><br/>
210
- <?php echo $this->__('SEPA Confirm paragraph') ?>
211
-
212
- <br/> <br/>
213
- <?php echo $this->__('SEPA Confirm note') ?>
214
- <br/> <br/>
215
- <table>
216
- <tr>
217
- <td><?php echo $this->__('Name of the payee') ?></td><td>:</td><td><span id='sepa_overlay_enduserfullname_span'>&nbsp;</span></td>
218
- </tr>
219
- <?php if($billingaddress->getCompany()) { ?>
220
- <tr>
221
- <td><?php echo $this->__('Company name') ?></td><td>:</td><td><?php echo $billingaddress->getCompany(); ?></td>
222
- </tr>
223
- <?php } ?>
224
- <tr>
225
- <td><?php echo $this->__('NN Address') ?></td><td>:</td><td><?php echo $street[0]; ?></td>
226
- </tr>
227
- <?php if(isset($street[1]) && $street[1]) { ?>
228
- <tr>
229
- <td><?php echo $this->__('NN Street') ?></td><td>:</td><td><?php echo $street[1]; ?></td>
230
- </tr>
231
- <?php }?>
232
- <tr>
233
- <td><?php echo $this->__('Zip Code And City') ?></td><td>:</td><td><?php echo $billingaddress->getPostcode(); ?><span id='sepa_overlay_enduserzipcode_span'>&nbsp;</span> <?php echo $billingaddress->getCity(); ?></td>
234
- </tr>
235
- <tr>
236
- <td><?php echo $this->__('Country') ?></td><td>:</td><td><span id='sepa_overlay_endusercountry_span'>&nbsp;</span></td>
237
- </tr>
238
- <?php if($billingaddress->getEmail()) { ?>
239
- <tr>
240
- <td><?php echo $this->__('Email') ?></td><td>:</td><td><?php echo $billingaddress->getEmail(); ?></td>
241
- </tr>
242
- <?php } ?>
243
- <tr id='nn_sepa_overlay_iban_tr'>
244
- <td><?php echo $this->__('IBAN') ?></td><td>:</td><td><span id='sepa_overlay_iban_span'>&nbsp;</span></td>
245
- </tr>
246
- <tr id='nn_sepa_overlay_bic_tr'>
247
- <td><?php echo $this->__('BIC') ?></td><td>:</td><td><span id='sepa_overlay_bic_span'>&nbsp;</span></td>
248
- </tr>
249
-
250
- </table>
251
- <br/>
252
- <?php echo $billingaddress->getCity(); ?>, <span id='sepa_overlay_mandatedate_span'>&nbsp;</span>, <span id='sepa_overlay_enduserfullname_span1'>&nbsp;</span>
253
- </p>
254
- </div>
255
- <div class='nn_footer'>
256
- <input style="width: 30%" type='button' id='mandate_confirm_btn' name='mandate_confirm_btn' onclick="mandate_confirm_btn_submit()" value=<?php echo $this->__('conirm_mandate') ?> class='mandate_confirm_btn' />
257
- <input style="width: 30%" type='button' id='mandate_cancel_btn' name='mandate_cancel_btn' onclick="mandate_cancel_btn_submit()" value=<?php echo $this->__('cancel') ?> class='mandate_confirm_btn' />
258
- <img src='<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>logo.png' width=120 alt='Novalnet AG' style='float:right;' />
259
- </div>
260
- </div>
261
- </li>
262
- <!-- Mandate overlay END-->
263
- </ul>
264
-
265
- <input type="hidden" id="process_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>"/>
266
- <input type="hidden" id="auth_code" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>"/>
267
  <input id="sepaiban" type="hidden" value="">
268
  <input id="sepabic" type="hidden" value="">
269
  <input id="sepa_payment_id" type="hidden" value="37">
270
- <input id="novalnet_sepa_owner" type="hidden" value="">
271
- <input id="result_mandate_date" type="hidden" value="">
272
- <input id="result_mandate_ref" type="hidden" value="">
273
  <input id="result_mandate_unique" type="hidden" value="" name="result_mandate_unique">
274
  <input id="nnsepa_iban_confirmed" type="hidden" value="0" name="nnsepa_iban_confirmed">
275
- <input type="hidden" id="nn_sepa_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
276
- <input type="hidden" id="nn_sepa_validate_error_message" value="<?php echo $this->__('Your account details are invalid') . '!'; ?>" />
277
- <input id="result_sepa_hash" type="hidden" value="<?php
278
- if (($sepaPaymentRefill || $sepaRefill) && $panhash != '') {
279
- echo $panhash;
280
- } else {
281
- $panhash = '';
282
- }
283
- ?>" name="result_sepa_hash">
284
- </fieldset>
285
  <style>
286
  .nnsepaloader {
287
  position: fixed;
@@ -293,81 +193,14 @@ if ($sepaPaymentRefill && $customerlogin) {
293
  background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
294
  }
295
 
296
- .bgCover { background:#878787; position:fixed; left:0; top:0; display:none; overflow:hidden; z-index:1000; }
297
- #sepa_mandate_overlay_block
298
- {
299
- font-size:12px;
300
- color:#555555;
301
- background-color:#fff;
302
- }
303
-
304
- .overlay_window_block {
305
- background-color:#ffffff;
306
- border-radius:5px;
307
- border:1px solid #a1a1a1;
308
- z-index:1000;
309
- }
310
- .overlay_window_block .nn_footer{
311
- bottom:0px;
312
- position:absolute;
313
- height:37px;
314
- width:100%;
315
- }
316
- .overlay_window_block .nn_header{
317
- top:0px;
318
- height:25px;
319
- border-bottom:1px solid #878787;
320
- padding:5px;
321
- }
322
- .overlay_window_block .body_div{
323
- padding:5px;
324
- overflow-y:scroll;
325
- }
326
- .mandate_confirm_btn{
327
- border:1px solid #0080C9;
328
- -webkit-border-radius: 3px;
329
- -moz-border-radius: 3px;
330
- border-radius: 3px;
331
- padding: 6px;
332
- text-decoration:none;
333
- display:inline-block;
334
- text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
335
- font-weight:bold;
336
- color: #FFFFFF;
337
- width:40%;
338
- cursor:pointer;
339
- margin-left:2px;
340
- margin-top:3px;
341
- float:left;
342
- margin-bottom:0px;
343
- background-color: #0080C9; background-image: -webkit-gradient(linear, left top, left bottom, from(#0080C9), to(#0080C9));
344
- background-image: -webkit-linear-gradient(top, #0080C9, #0080C9);
345
- background-image: -moz-linear-gradient(top, #0080C9, #0080C9);
346
- background-image: -ms-linear-gradient(top, #0080C9, #0080C9);
347
- background-image: -o-linear-gradient(top, #0080C9, #0080C9);
348
- background-image: linear-gradient(to bottom, #0080C9, #0080C9);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=#0080C9, endColorstr=#0080C9);
349
- }
350
-
351
- .mandate_confirm_btn:hover{
352
- border:1px solid #878787;
353
- background-color: #878787; background-image: -webkit-gradient(linear, left top, left bottom, from(#878787), to(#878787));
354
- background-image: -webkit-linear-gradient(top, #878787, #878787);
355
- background-image: -moz-linear-gradient(top, #878787, #878787);
356
- background-image: -ms-linear-gradient(top, #878787, #878787);
357
- background-image: -o-linear-gradient(top, #878787, #878787);
358
- background-image: linear-gradient(to bottom, #878787, #878787);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=#878787, endColorstr=#878787);
359
- }
360
-
361
- #sepa_mandate_overlay_block h1
362
- {
363
- color: #00669D;
364
- font-size:14px;
365
- font-weight:bold;
366
- text-transform:none;
367
- margin:0;
368
- }
369
-
370
- table td{
371
- padding : 2px;
372
  }
373
  </style>
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());
33
  // get quote billing address
34
+ $checkoutSession = Mage::getSingleton('checkout/session');
35
+ $billingaddress = $checkoutSession->getQuote()->getBillingAddress();
36
  $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
37
  ? $billingaddress->getTelephone() : '' ;
38
  $street = $billingaddress->getStreet();
44
  } else if ($sepaRefill) {
45
  $panhash = $assignDatahelper->getCheckout()->getSepaHash();
46
  }
47
+
48
+ $panhash = (($sepaPaymentRefill || $sepaRefill) && $panhash) ? $panhash : '';
49
+ $vendorId = $checkoutSession->getNnVendor() ? $checkoutSession->getNnVendor() : trim($this->getMethod()->getNovalnetConfig('merchant_id', true));
50
+ $authCode = $checkoutSession->getNnAuthcode() ? $checkoutSession->getNnAuthcode() : trim($this->getMethod()->getNovalnetConfig('auth_code', true));
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;">
62
  </div>
63
  <!--}}} Payment Logo -->
64
  <!--{{{ Novalnet SEPA Form -->
65
+ <div class="nnsepaloader" id='sepa_loading' style='display:none;'></div>
66
+ <li>
67
+ <?php echo $this->__('Your account will be debited upon the order submission'); ?>
68
+ </li>
69
+ <?php if ($this->getUserInfo()): ?>
70
  <li>
71
+ <?php echo $this->getUserInfo() ?>
72
  </li>
73
+ <?php endif ?>
74
+ <?php if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->getNovalnetConfig('live_mode', true) == 0): ?>
75
+ <li>
76
+ <div style="font-weight:bold;color:red;font-size:12px;">
77
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
78
  </div>
79
  </li>
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(); ?>" />
86
+ </div>
87
+ </li>
88
+ <li>
89
+ <label for="<?php echo $code ?>_bank_country" class="required"><em>*</em><?php echo $this->__('NN Country') ?></label>
90
+ <div class="input-box">
91
+ <?php
92
+ $_countries = Mage::getResourceModel('directory/country_collection')
93
+ ->loadData()
94
+ ->toOptionArray(false)
95
+ ?>
96
+ <?php if (count($_countries) > 0): ?>
97
+ <select id="<?php echo $code ?>_bank_country" onchange="unsetHashRelatedElements()" class="required-entry">
98
  <?php
99
+ foreach ($_countries as $_country):
100
+ if (in_array($billingaddress->getCountryId(), $_country)) {
101
+ ?>
102
+ <option selected value="<?php echo $_country['value'] ?>"><?php echo $_country['label'] ?>
103
+ </option>
104
+ <?php } else { ?>
105
+ <option value="<?php echo $_country['value'] ?>">
106
+ <?php echo $_country['label'] ?>
107
+ </option>
108
+ <?php } ?>
109
+ <?php endforeach; ?>
110
+ </select><br/>
111
+ <?php endif; ?>
112
+ </div>
113
+ </li>
114
+ <li>
115
+ <label for="<?php echo $code ?>_account_number" class="required"><em>*</em><?php echo $this->__('IBAN or Account number') ?></label>
116
+ <div class="input-box">
117
+ <input type="text" id="<?php echo $code ?>_account_number" onkeypress="return ibanbicValidate(event)" onchange="unsetHashRelatedElements();" title="<?php echo $this->__('IBAN or Account number') ?>" class="required-entry input-text" autocomplete="off" value="" />
118
+ </div>
119
+ </li>
120
+
121
+ <li>
122
+ <label for="<?php echo $code ?>_bank_code" class="required"><em>*</em><?php echo $this->__('BIC or Bank code') ?></label>
123
+ <div class="input-box">
124
+ <input type="text" id="<?php echo $code ?>_bank_code" title="<?php echo $this->__('BIC or Bank code') ?>" class="input-text" autocomplete="off" onkeypress="return ibanbicValidate(event)" onchange="unsetHashRelatedElements()" value="" />
125
+ </div>
126
+ </li>
127
+
128
+ <li>
129
+ <div class="input-box">
130
+ <input type="checkbox" id="<?php echo $code ?>_mandate_confirm" title="<?php echo $this->__('confirm') ?>" class="required-entry" onclick="generate_sepa_iban_bic(this, '<?php echo $this->__('Your account details are invalid') ?>', '<?php echo $this->__('Basic parameter not valid') ?>')"/>
131
+ <label class="required" style="float:none;"><?php echo $this->__('NN Confirm') ?></label>
132
+ </div>
133
+ </li>
134
+ <!--{{{ CallbackType-->
135
+ <?php if ($this->isCallbackTypeCall()): ?>
136
+ <!--{{{ PIN by Callback-->
137
+ <?php if ($this->getCallbackConfigData() != 3): ?>
138
+ <li>
139
+ <label for="<?php echo $code ?>_callback_tel" class="required"><em>*</em>
140
+ <?php if ($this->getCallbackConfigData() == 2): ?>
141
+ <?php echo $this->__('Mobile phone number'); ?>
142
+ <?php else: ?>
143
+ <?php echo $this->__('NN Mobile Number'); ?>
144
  <?php endif; ?>
145
+ </label>
 
 
 
 
 
146
  <div class="input-box">
147
+ <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; ?>"/>
148
  </div>
149
+ </li>
150
+ <li>
151
+ <div class="nncallbacknote">
152
+ <?php echo $this->__('Note for pin by sms and callback') ?>
153
+ </div>
154
+ <label for="<?php echo $code ?>_callback_pin" class="required"><em>*</em><?php echo $this->__('PIN') ?></label>
155
  <div class="input-box">
156
+ <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/>
157
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
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 ?>"/>
175
+ <input id="auth_code" type="hidden" value="<?php echo $authCode ?>"/>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
176
  <input id="sepaiban" type="hidden" value="">
177
  <input id="sepabic" type="hidden" value="">
178
  <input id="sepa_payment_id" type="hidden" value="37">
 
 
 
179
  <input id="result_mandate_unique" type="hidden" value="" name="result_mandate_unique">
180
  <input id="nnsepa_iban_confirmed" type="hidden" value="0" name="nnsepa_iban_confirmed">
181
+ <input id="nn_sepa_merchant_validate_error_message" type="hidden" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
182
+ <input id="nn_sepa_validate_error_message" type="hidden" value="<?php echo $this->__('Your account details are invalid') . '!'; ?>" />
183
+ <input id="result_sepa_hash" type="hidden" value="<?php echo $panhash; ?>" name="result_sepa_hash">
184
+ </ul>
 
 
 
 
 
 
185
  <style>
186
  .nnsepaloader {
187
  position: fixed;
193
  background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
194
  }
195
 
196
+ .nncallbacknote {
197
+ font-weight:bold;
198
+ font-size:11px;
199
+ color:gray;
200
+ border:1px solid #BFBFBF;
201
+ background:#FEFFBF;
202
+ padding:10px;
203
+ margin-top:10px;
204
+ width:400px;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
205
  }
206
  </style>
app/design/frontend/base/default/template/novalnet/payment/method/info/Banktransfer.phtml CHANGED
@@ -28,25 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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 if ($this->getAdditionalData('refunded_tid')):
40
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
41
- if ($this->getAdditionalData('fullRefund') == true):
42
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
43
- else:
44
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
45
- endif;
 
46
  endforeach;
47
- endif;
48
- ?>
49
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
50
  <?php else: ?>
51
  <?php echo $this->__('Error in getting payment method') ?>
52
  <?php endif; ?>
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/Cc.phtml CHANGED
@@ -31,28 +31,29 @@ $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
- ?>
35
- <?php
36
- if ($this->getAdditionalData('NnTestOrder'))
37
  echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
38
  ?>
39
- <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
40
- <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
41
- <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>
42
- <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>
43
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
44
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
45
- <?php if ($this->getAdditionalData('refunded_tid')):
46
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
47
- if ($this->getAdditionalData('fullRefund') == true):
48
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
49
- else:
50
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
51
- endif;
52
- endforeach;
53
- endif;
54
- ?>
55
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
56
  <?php else: ?>
57
  <?php echo $this->__('Error in getting payment method') ?>
58
  <?php endif; ?>
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
+ ?>
35
+ <?php
36
+ if ($this->getAdditionalData('NnTestOrder'))
37
  echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
38
+ ?>
39
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
40
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
41
+ <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>
42
+ <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>
43
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
44
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
45
+ <?php
46
+ if ($this->getAdditionalData('refunded_tid')):
47
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
48
+ if ($this->getAdditionalData('fullRefund') == true || preg_match("/-refund/i", $value['reftid'])):
49
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
50
+ else:
51
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s.Your new TID for the refund amount: %s', $helper->makeValidNumber($value['reqtid']), $value['refamount'], $helper->makeValidNumber($value['reftid'])) . '<br><br>';
52
+ endif;
53
+ endforeach;
54
+ endif;
55
  ?>
56
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
57
  <?php else: ?>
58
  <?php echo $this->__('Error in getting payment method') ?>
59
  <?php endif; ?>
app/design/frontend/base/default/template/novalnet/payment/method/info/Eps.phtml CHANGED
@@ -28,25 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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 if ($this->getAdditionalData('refunded_tid')):
40
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
41
- if ($this->getAdditionalData('fullRefund') == true):
42
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
43
- else:
44
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
45
- endif;
 
46
  endforeach;
47
- endif;
48
- ?>
49
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
50
  <?php else: ?>
51
  <?php echo $this->__('Error in getting payment method') ?>
52
  <?php endif; ?>
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/Ideal.phtml CHANGED
@@ -28,25 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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 if ($this->getAdditionalData('refunded_tid')):
40
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
41
- if ($this->getAdditionalData('fullRefund') == true):
42
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
43
- else:
44
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
45
- endif;
 
46
  endforeach;
47
- endif;
48
- ?>
49
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
50
  <?php else: ?>
51
  <?php echo $this->__('Error in getting payment method') ?>
52
  <?php endif; ?>
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
@@ -31,76 +31,77 @@ $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
37
  if ($this->getAdditionalData('NnTestOrder'))
38
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
39
- ?>
40
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
41
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
42
- <?php if ($nextCycleDate) echo '<br>' . $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br><br>' ?>
43
- <?php if ($this->getAdditionalData('captureTid')) echo '<br>' . $this->__('The transaction has been confirmed on %s', $captureTime) . '<br><br>' ?>
44
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
45
- <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('The transaction has been canceled on ') . $currentTime . '<br>' ?>
46
- <?php if ($this->getAdditionalData('refunded_tid')):
47
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
48
- if ($this->getAdditionalData('fullRefund') == true):
49
- echo '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
50
- else:
51
- echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
52
- endif;
53
- endforeach;
54
- endif;
55
- ?>
56
- <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl)): ?>
57
  <?php
58
- if (strlen($this->getAdditionalData('NnNote'))):
59
- if (strstr($this->getAdditionalData('NnNote'), 'br')):
60
- echo nl2br($this->getAdditionalData('NnNote'));
61
- else:
62
- $note = explode('|',$this->getAdditionalData('NnNote'));
63
- echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
64
- foreach($note as $noteValue):
65
- list($text, $value) = explode(':', $noteValue);
66
- echo $this->__($text) . ' : '. $value . '</br>';
67
- endforeach;
68
- endif;
69
  endif;
70
  ?>
71
- <?php
72
- if (strlen($this->getAdditionalData('NnNoteAmount'))):
73
- list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
74
- echo $this->__($text) . ' : '. $value;
75
- endif;
76
- ?>
77
- <?php
78
- if (strlen($this->getAdditionalData('NnNoteTID'))):
79
- if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
80
- echo nl2br($this->getAdditionalData('NnNoteTID'));
81
- else:
82
- $note = explode('|',$this->getAdditionalData('NnNoteTID'));
83
- echo "<br />";
84
- foreach($note as $noteValue):
85
- list($text, $value) = explode(':', $noteValue);
86
- if ($text == 'NN_Reference3'):
87
- list($referenceTxt, $value) = explode('&', $value);
88
- str_replace('&', '', $referenceTxt);
89
- echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
90
- else:
91
- echo $this->__($text) . ' : '. $value . '</br>';
92
- endif;
93
- endforeach;
94
  endif;
95
- endif;
96
- ?>
97
- <?php
98
- if (strlen($this->getAdditionalData('NnComments'))):
99
- echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
100
- endif;
101
- ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
102
  <?php endif; ?>
103
  <?php else: ?>
104
  <?php echo $this->__('Error in getting payment method') ?>
105
  <?php endif; ?>
106
-
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): ?>
37
  <?php
38
  if ($this->getAdditionalData('NnTestOrder'))
39
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
40
+ ?>
41
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
42
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
43
+ <?php if ($nextCycleDate) echo '<br>' . $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br>' ?>
44
+ <?php if ($this->getAdditionalData('captureTid')) echo '<br>' . $this->__('The transaction has been confirmed on %s', $captureTime) . '<br>' ?>
45
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo '<br>' . $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br>' ?>
46
+ <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('The transaction has been canceled on %s', $currentTime) . '<br>' ?>
 
 
 
 
 
 
 
 
 
 
 
47
  <?php
48
+ if ($this->getAdditionalData('refunded_tid')):
49
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
50
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
51
+ endforeach;
 
 
 
 
 
 
 
52
  endif;
53
  ?>
54
+ <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl) || $recurringOrder): ?>
55
+ <?php
56
+ if (strlen($this->getAdditionalData('NnNote'))):
57
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
58
+ echo '<br>' . ($this->getAdditionalData('NnNote'));
59
+ else:
60
+ $note = explode('|', $this->getAdditionalData('NnNote'));
61
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b>';
62
+ foreach ($note as $noteValue):
63
+ list($text, $value) = explode(':', $noteValue);
64
+ echo '<br>' . $this->__($text) . ' : ' . $value;
65
+ endforeach;
66
+ endif;
 
 
 
 
 
 
 
 
 
 
67
  endif;
68
+ ?>
69
+ <?php
70
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
71
+ list ($text, $value) = explode(':', $this->getAdditionalData('NnNoteAmount'));
72
+ echo '<br>' . $this->__($text) . ' : ' . $value;
73
+ endif;
74
+ ?>
75
+ <?php
76
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
77
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
78
+ echo '<br>' . ($this->getAdditionalData('NnNoteTID'));
79
+ else:
80
+ $note = explode('|', $this->getAdditionalData('NnNoteTID'));
81
+ echo "<br />";
82
+ foreach ($note as $noteValue):
83
+ list($text, $value) = explode(':', $noteValue);
84
+ if (preg_match("/Order No&/i", $value)):
85
+ list($referenceTxt, $value) = explode('&', $value);
86
+ str_replace('&', '', $referenceTxt);
87
+ echo '<br>' . $this->__($text) . ' : ' . '<b>' . $this->__($referenceTxt) . ' ' . $value . '</b>';
88
+ else:
89
+ if ($text == 'NN_Reference_desc1' || $text == 'NN_Reference_desc2'):
90
+ echo '<br><b>' . $this->__($text) . '</b>';
91
+ else:
92
+ echo '<br>' . $this->__($text) . ' : ' . $value;
93
+ endif;
94
+ endif;
95
+ endforeach;
96
+ endif;
97
+ endif;
98
+ ?>
99
+ <?php
100
+ if (strlen($this->getAdditionalData('NnComments'))):
101
+ echo '<br>' . ($this->getAdditionalData('NnComments'));
102
+ endif;
103
+ ?>
104
  <?php endif; ?>
105
  <?php else: ?>
106
  <?php echo $this->__('Error in getting payment method') ?>
107
  <?php endif; ?>
 
app/design/frontend/base/default/template/novalnet/payment/method/info/Paypal.phtml CHANGED
@@ -28,25 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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 if ($this->getAdditionalData('refunded_tid')):
40
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
41
- if ($this->getAdditionalData('fullRefund') == true):
42
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
43
- else:
44
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
45
- endif;
 
46
  endforeach;
47
- endif;
48
- ?>
49
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
50
  <?php else: ?>
51
  <?php echo $this->__('Error in getting payment method') ?>
52
  <?php endif; ?>
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/Prepayment.phtml CHANGED
@@ -31,76 +31,77 @@ $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
37
  if ($this->getAdditionalData('NnTestOrder'))
38
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
39
- ?>
40
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
41
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
42
- <?php if ($nextCycleDate) echo '<br>' . $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br><br>' ?>
43
- <?php if ($this->getAdditionalData('captureTid')) echo '<br>' . $this->__('The transaction has been confirmed on %s', $captureTime) . '<br><br>' ?>
44
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
45
- <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('The transaction has been canceled on ') . $currentTime . '<br>' ?>
46
- <?php if ($this->getAdditionalData('refunded_tid')):
47
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
48
- if ($this->getAdditionalData('fullRefund') == true):
49
- echo '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
50
- else:
51
- echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
52
- endif;
53
- endforeach;
54
- endif;
55
- ?>
56
- <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl)): ?>
57
  <?php
58
- if (strlen($this->getAdditionalData('NnNote'))):
59
- if (strstr($this->getAdditionalData('NnNote'), 'br')):
60
- echo nl2br($this->getAdditionalData('NnNote'));
61
- else:
62
- $note = explode('|',$this->getAdditionalData('NnNote'));
63
- echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
64
- foreach($note as $noteValue):
65
- list($text, $value) = explode(':', $noteValue);
66
- echo $this->__($text) . ' : '. $value . '</br>';
67
- endforeach;
68
- endif;
69
  endif;
70
  ?>
71
- <?php
72
- if (strlen($this->getAdditionalData('NnNoteAmount'))):
73
- list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
74
- echo $this->__($text) . ' : '. $value;
75
- endif;
76
- ?>
77
- <?php
78
- if (strlen($this->getAdditionalData('NnNoteTID'))):
79
- if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
80
- echo nl2br($this->getAdditionalData('NnNoteTID'));
81
- else:
82
- $note = explode('|',$this->getAdditionalData('NnNoteTID'));
83
- echo "<br />";
84
- foreach($note as $noteValue):
85
- list($text, $value) = explode(':', $noteValue);
86
- if ($text == 'NN_Reference3'):
87
- list($referenceTxt, $value) = explode('&', $value);
88
- str_replace('&', '', $referenceTxt);
89
- echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
90
- else:
91
- echo $this->__($text) . ' : '. $value . '</br>';
92
- endif;
93
- endforeach;
94
  endif;
95
- endif;
96
- ?>
97
- <?php
98
- if (strlen($this->getAdditionalData('NnComments'))):
99
- echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
100
- endif;
101
- ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
102
  <?php endif; ?>
103
  <?php else: ?>
104
  <?php echo $this->__('Error in getting payment method') ?>
105
  <?php endif; ?>
106
-
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): ?>
37
  <?php
38
  if ($this->getAdditionalData('NnTestOrder'))
39
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
40
+ ?>
41
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
42
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
43
+ <?php if ($nextCycleDate) echo '<br>' . $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br>' ?>
44
+ <?php if ($this->getAdditionalData('captureTid')) echo '<br>' . $this->__('The transaction has been confirmed on %s', $captureTime) . '<br>' ?>
45
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo '<br>' . $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br>' ?>
46
+ <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('The transaction has been canceled on %s', $currentTime) . '<br>' ?>
 
 
 
 
 
 
 
 
 
 
 
47
  <?php
48
+ if ($this->getAdditionalData('refunded_tid')):
49
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
50
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
51
+ endforeach;
 
 
 
 
 
 
 
52
  endif;
53
  ?>
54
+ <?php if (!preg_match("/invoice|creditmemo|shipment|callback_novalnet2magento/i", $currentUrl) || $recurringOrder): ?>
55
+ <?php
56
+ if (strlen($this->getAdditionalData('NnNote'))):
57
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
58
+ echo '<br>' . ($this->getAdditionalData('NnNote'));
59
+ else:
60
+ $note = explode('|', $this->getAdditionalData('NnNote'));
61
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b>';
62
+ foreach ($note as $noteValue):
63
+ list($text, $value) = explode(':', $noteValue);
64
+ echo '<br>' . $this->__($text) . ' : ' . $value;
65
+ endforeach;
66
+ endif;
 
 
 
 
 
 
 
 
 
 
67
  endif;
68
+ ?>
69
+ <?php
70
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
71
+ list ($text, $value) = explode(':', $this->getAdditionalData('NnNoteAmount'));
72
+ echo '<br>' . $this->__($text) . ' : ' . $value;
73
+ endif;
74
+ ?>
75
+ <?php
76
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
77
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
78
+ echo '<br>' . ($this->getAdditionalData('NnNoteTID'));
79
+ else:
80
+ $note = explode('|', $this->getAdditionalData('NnNoteTID'));
81
+ echo "<br />";
82
+ foreach ($note as $noteValue):
83
+ list($text, $value) = explode(':', $noteValue);
84
+ if (preg_match("/Order No&/i", $value)):
85
+ list($referenceTxt, $value) = explode('&', $value);
86
+ str_replace('&', '', $referenceTxt);
87
+ echo '<br>' . $this->__($text) . ' : ' . '<b>' . $this->__($referenceTxt) . ' ' . $value . '</b>';
88
+ else:
89
+ if ($text == 'NN_Reference_desc1' || $text == 'NN_Reference_desc2'):
90
+ echo '<br><b>' . $this->__($text) . '</b>';
91
+ else:
92
+ echo '<br>' . $this->__($text) . ' : ' . $value;
93
+ endif;
94
+ endif;
95
+ endforeach;
96
+ endif;
97
+ endif;
98
+ ?>
99
+ <?php
100
+ if (strlen($this->getAdditionalData('NnComments'))):
101
+ echo '<br>' . ($this->getAdditionalData('NnComments'));
102
+ endif;
103
+ ?>
104
  <?php endif; ?>
105
  <?php else: ?>
106
  <?php echo $this->__('Error in getting payment method') ?>
107
  <?php endif; ?>
 
app/design/frontend/base/default/template/novalnet/payment/method/info/Sepa.phtml CHANGED
@@ -31,30 +31,25 @@ $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
- ?>
35
- <?php
36
- if ($this->getAdditionalData('NnTestOrder'))
37
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
38
  ?>
39
- <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
40
- <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
41
- <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>
42
- <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>
43
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
44
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
45
- <?php if ($this->getAdditionalData('refunded_tid')):
46
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
47
- if ($this->getAdditionalData('fullRefund') == true):
48
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
49
- elseif(preg_match("/refund/i", $value['reftid'])):
50
- echo $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br><br>';
51
- else:
52
- echo $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('refund amount %s', $value['refamount']) . ', ' . $this->__('New Tid: %s', $value['reftid']) . ' ' . $this->__('for the balance amount.') . '<br><br>';
53
- endif;
54
  endforeach;
55
- endif;
56
- ?>
57
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
58
  <?php else: ?>
59
  <?php echo $this->__('Error in getting payment method') ?>
60
  <?php endif; ?>
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
 
 
 
 
34
  ?>
35
+ <?php
36
+ if ($this->getAdditionalData('NnTestOrder'))
37
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
38
+ ?>
39
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
40
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
41
+ <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>
42
+ <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>
43
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
44
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
45
+ <?php
46
+ if ($this->getAdditionalData('refunded_tid')):
47
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
48
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
 
49
  endforeach;
50
+ endif;
51
+ ?>
52
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
53
  <?php else: ?>
54
  <?php echo $this->__('Error in getting payment method') ?>
55
  <?php endif; ?>
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Banktransfer.phtml CHANGED
@@ -28,22 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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>' ?>
35
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
36
- <?php if ($this->getAdditionalData('refunded_tid')):
37
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
38
- if ($this->getAdditionalData('fullRefund') == true):
39
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
40
- else:
41
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
42
- endif;
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; ?>
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/Cc.phtml CHANGED
@@ -31,31 +31,32 @@ $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}}
36
- <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?>{{pdf_row_separator}}
37
- <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>{{pdf_row_separator}}
38
- <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>{{pdf_row_separator}}
39
- <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>{{pdf_row_separator}}
40
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>{{pdf_row_separator}}
41
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>{{pdf_row_separator}}
42
- <?php if ($this->getAdditionalData('refunded_tid')):
43
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
44
- if ($this->getAdditionalData('fullRefund') == true):
45
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
46
- ?>
47
- {{pdf_row_separator}}
48
- <?php
49
- else:
50
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
51
- ?>
52
- {{pdf_row_separator}}
53
- <?php
54
- endif;
55
- endforeach;
56
- endif;
57
- ?>
58
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
 
59
  <?php else: ?>
60
  <?php echo $this->__('Error in getting payment method') ?>
61
  <?php endif; ?>
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}}
36
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?>{{pdf_row_separator}}
37
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>{{pdf_row_separator}}
38
+ <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>{{pdf_row_separator}}
39
+ <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>{{pdf_row_separator}}
40
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>{{pdf_row_separator}}
41
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>{{pdf_row_separator}}
42
+ <?php
43
+ if ($this->getAdditionalData('refunded_tid')):
44
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
45
+ if ($this->getAdditionalData('fullRefund') == true || preg_match("/-refund/i", $value['reftid'])):
46
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
47
+ ?>
48
+ {{pdf_row_separator}}
49
+ <?php
50
+ else:
51
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s.Your new TID for the refund amount: %s', $helper->makeValidNumber($value['reqtid']), $value['refamount'], $helper->makeValidNumber($value['reftid'])) . '<br><br>';
52
+ ?>
53
+ {{pdf_row_separator}}
54
+ <?php
55
+ endif;
56
+ endforeach;
57
+ endif;
58
+ ?>{{pdf_row_separator}}
59
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
60
  <?php else: ?>
61
  <?php echo $this->__('Error in getting payment method') ?>
62
  <?php endif; ?>
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Eps.phtml CHANGED
@@ -28,22 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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>' ?>
35
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
36
- <?php if ($this->getAdditionalData('refunded_tid')):
37
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
38
- if ($this->getAdditionalData('fullRefund') == true):
39
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
40
- else:
41
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
42
- endif;
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; ?>
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/Ideal.phtml CHANGED
@@ -28,22 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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>' ?>
35
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
36
- <?php if ($this->getAdditionalData('refunded_tid')):
37
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
38
- if ($this->getAdditionalData('fullRefund') == true):
39
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
40
- else:
41
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
42
- endif;
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; ?>
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
@@ -31,68 +31,75 @@ $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}}
37
  <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br>'; ?>{{pdf_row_separator}}
38
- <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>{{pdf_row_separator}}
39
- <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>{{pdf_row_separator}}
40
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>{{pdf_row_separator}}
41
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>{{pdf_row_separator}}
42
- <?php if ($this->getAdditionalData('refunded_tid')):
43
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
44
- if ($this->getAdditionalData('fullRefund') == true):
45
- echo '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
46
  else:
47
- echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
 
 
 
 
 
48
  endif;
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')):
56
- echo nl2br($this->getAdditionalData('NnNote'));
57
- else:
58
- $note = explode('|',$this->getAdditionalData('NnNote'));
59
- echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
60
- foreach($note as $noteValue):
61
- list($text, $value) = explode(':', $noteValue);
62
- echo $this->__($text) . ' : '. $value ?> {{pdf_row_separator}} <?php
63
- endforeach;
64
  endif;
65
- endif;
66
- ?>{{pdf_row_separator}}
67
- <?php
68
- if (strlen($this->getAdditionalData('NnNoteAmount'))):
69
- list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
70
- echo $this->__($text) . ' : '. $value;
71
- endif;
72
- ?>{{pdf_row_separator}}
73
- <?php
74
- if (strlen($this->getAdditionalData('NnNoteTID'))):
75
- if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
76
- echo nl2br($this->getAdditionalData('NnNoteTID'));
77
- else:
78
- $note = explode('|',$this->getAdditionalData('NnNoteTID'));
79
- echo "<br />";
80
- foreach($note as $noteValue):
81
- list($text, $value) = explode(':', $noteValue);
82
- if ($text == 'NN_Reference3'):
83
- list($referenceTxt, $value) = explode('&', $value);
84
- str_replace('&', '', $referenceTxt);
85
- echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
86
- else:
87
- echo $this->__($text) . ' : '. $value ?> {{pdf_row_separator}} <?php
88
- endif;
89
- endforeach;
90
  endif;
91
- endif;
92
- ?>{{pdf_row_separator}}
93
- <?php
94
- if (strlen($this->getAdditionalData('NnComments'))):
95
- echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
96
- endif;
97
- ?>{{pdf_row_separator}}
98
  <?php endif; ?>
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}}
38
  <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br>'; ?>{{pdf_row_separator}}
39
+ <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br>' ?>{{pdf_row_separator}}
40
+ <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br>' ?>{{pdf_row_separator}}
41
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br>' ?>{{pdf_row_separator}}
42
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br>' ?>{{pdf_row_separator}}
43
+ <?php
44
+ if ($this->getAdditionalData('refunded_tid')):
45
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
46
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
47
+ ?>
48
+ {{pdf_row_separator}}
49
+ <?php
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')):
57
+ echo nl2br($this->getAdditionalData('NnNote'));
58
+ else:
59
+ $note = explode('|', $this->getAdditionalData('NnNote'));
60
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
61
+ foreach ($note as $noteValue):
62
+ list($text, $value) = explode(':', $noteValue);
63
+ echo $this->__($text) . ' : ' . $value
64
+ ?> {{pdf_row_separator}} <?php
65
+ endforeach;
66
+ endif;
67
+ endif;
68
+ ?>{{pdf_row_separator}}
69
+ <?php
70
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
71
+ list ($text, $value) = explode(':', $this->getAdditionalData('NnNoteAmount'));
72
+ echo $this->__($text) . ' : ' . $value;
73
+ endif;
74
+ ?>{{pdf_row_separator}}
75
+ <?php
76
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
77
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
78
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
79
+ else:
80
+ $note = explode('|', $this->getAdditionalData('NnNoteTID'));
81
+ echo "<br />";
82
+ foreach ($note as $noteValue):
83
+ list($text, $value) = explode(':', $noteValue);
84
+ if (preg_match("/Order No&/i", $value)):
85
+ list($referenceTxt, $value) = explode('&', $value);
86
+ str_replace('&', '', $referenceTxt);
87
+ echo $this->__($text) . ' : ' . '<b>' . $this->__($referenceTxt) . ' ' . $value . '</b></br>';
88
  else:
89
+ if ($text == 'NN_Reference_desc1' || $text == 'NN_Reference_desc2'):
90
+ echo '<b>' . $this->__($text) . '</b></br>';
91
+ else:
92
+ echo $this->__($text) . ' : ' . $value
93
+ ?> {{pdf_row_separator}} <?php
94
+ endif;
95
  endif;
96
  endforeach;
97
+ endif;
 
 
 
 
 
 
 
 
 
 
 
 
 
98
  endif;
99
+ ?>{{pdf_row_separator}}
100
+ <?php
101
+ if (strlen($this->getAdditionalData('NnComments'))):
102
+ echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
103
  endif;
104
+ ?>{{pdf_row_separator}}
 
 
 
 
 
 
105
  <?php endif; ?>
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Paypal.phtml CHANGED
@@ -28,22 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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>' ?>
35
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
36
- <?php if ($this->getAdditionalData('refunded_tid')):
37
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
38
- if ($this->getAdditionalData('fullRefund') == true):
39
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
40
- else:
41
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
42
- endif;
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; ?>
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/Prepayment.phtml CHANGED
@@ -31,68 +31,75 @@ $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}}
37
  <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br>'; ?>{{pdf_row_separator}}
38
- <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>{{pdf_row_separator}}
39
- <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>{{pdf_row_separator}}
40
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>{{pdf_row_separator}}
41
  <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>{{pdf_row_separator}}
42
- <?php if ($this->getAdditionalData('refunded_tid')):
43
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
44
- if ($this->getAdditionalData('fullRefund') == true):
45
- echo '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
46
  else:
47
- echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
 
 
 
 
 
48
  endif;
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')):
56
- echo nl2br($this->getAdditionalData('NnNote'));
57
- else:
58
- $note = explode('|',$this->getAdditionalData('NnNote'));
59
- echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
60
- foreach($note as $noteValue):
61
- list($text, $value) = explode(':', $noteValue);
62
- echo $this->__($text) . ' : '. $value ?> {{pdf_row_separator}} <?php
63
- endforeach;
64
  endif;
65
- endif;
66
- ?>{{pdf_row_separator}}
67
- <?php
68
- if (strlen($this->getAdditionalData('NnNoteAmount'))):
69
- list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
70
- echo $this->__($text) . ' : '. $value;
71
- endif;
72
- ?>{{pdf_row_separator}}
73
- <?php
74
- if (strlen($this->getAdditionalData('NnNoteTID'))):
75
- if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
76
- echo nl2br($this->getAdditionalData('NnNoteTID'));
77
- else:
78
- $note = explode('|',$this->getAdditionalData('NnNoteTID'));
79
- echo "<br />";
80
- foreach($note as $noteValue):
81
- list($text, $value) = explode(':', $noteValue);
82
- if ($text == 'NN_Reference3'):
83
- list($referenceTxt, $value) = explode('&', $value);
84
- str_replace('&', '', $referenceTxt);
85
- echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
86
- else:
87
- echo $this->__($text) . ' : '. $value ?> {{pdf_row_separator}} <?php
88
- endif;
89
- endforeach;
90
  endif;
91
- endif;
92
- ?>{{pdf_row_separator}}
93
- <?php
94
- if (strlen($this->getAdditionalData('NnComments'))):
95
- echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
96
- endif;
97
- ?>{{pdf_row_separator}}
98
  <?php endif; ?>
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}}
38
  <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br>'; ?>{{pdf_row_separator}}
39
+ <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br>' ?>{{pdf_row_separator}}
40
+ <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br>' ?>{{pdf_row_separator}}
41
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br>' ?>{{pdf_row_separator}}
42
  <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>{{pdf_row_separator}}
43
+ <?php
44
+ if ($this->getAdditionalData('refunded_tid')):
45
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
46
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
47
+ ?>
48
+ {{pdf_row_separator}}
49
+ <?php
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')):
57
+ echo nl2br($this->getAdditionalData('NnNote'));
58
+ else:
59
+ $note = explode('|', $this->getAdditionalData('NnNote'));
60
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
61
+ foreach ($note as $noteValue):
62
+ list($text, $value) = explode(':', $noteValue);
63
+ echo $this->__($text) . ' : ' . $value
64
+ ?> {{pdf_row_separator}} <?php
65
+ endforeach;
66
+ endif;
67
+ endif;
68
+ ?>{{pdf_row_separator}}
69
+ <?php
70
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
71
+ list ($text, $value) = explode(':', $this->getAdditionalData('NnNoteAmount'));
72
+ echo $this->__($text) . ' : ' . $value;
73
+ endif;
74
+ ?>{{pdf_row_separator}}
75
+ <?php
76
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
77
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
78
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
79
+ else:
80
+ $note = explode('|', $this->getAdditionalData('NnNoteTID'));
81
+ echo "<br />";
82
+ foreach ($note as $noteValue):
83
+ list($text, $value) = explode(':', $noteValue);
84
+ if (preg_match("/Order No&/i", $value)):
85
+ list($referenceTxt, $value) = explode('&', $value);
86
+ str_replace('&', '', $referenceTxt);
87
+ echo $this->__($text) . ' : ' . '<b>' . $this->__($referenceTxt) . ' ' . $value . '</b></br>';
88
  else:
89
+ if ($text == 'NN_Reference_desc1' || $text == 'NN_Reference_desc2'):
90
+ echo '<b>' . $this->__($text) . '</b></br>';
91
+ else:
92
+ echo $this->__($text) . ' : ' . $value
93
+ ?> {{pdf_row_separator}} <?php
94
+ endif;
95
  endif;
96
  endforeach;
97
+ endif;
 
 
 
 
 
 
 
 
 
 
 
 
 
98
  endif;
99
+ ?>{{pdf_row_separator}}
100
+ <?php
101
+ if (strlen($this->getAdditionalData('NnComments'))):
102
+ echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
103
  endif;
104
+ ?>{{pdf_row_separator}}
 
 
 
 
 
 
105
  <?php endif; ?>
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Sepa.phtml CHANGED
@@ -31,36 +31,25 @@ $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}}
36
- <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?>{{pdf_row_separator}}
37
- <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>{{pdf_row_separator}}
38
- <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>{{pdf_row_separator}}
39
- <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>{{pdf_row_separator}}
40
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>{{pdf_row_separator}}
41
- <?php if ($this->getAdditionalData('voidTid')) $this->__('The transaction has been canceled on ') . $currentTime . '<br><br>' ?>{{pdf_row_separator}}
42
- <?php if ($this->getAdditionalData('refunded_tid')):
43
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
44
- if ($this->getAdditionalData('fullRefund') == true):
45
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
46
  ?>
47
  {{pdf_row_separator}}
48
  <?php
49
- elseif(preg_match("/refund/i", $value['reftid'])):
50
- echo $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br><br>';
51
- ?>
52
- {{pdf_row_separator}}
53
- <?php
54
- else:
55
- echo $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('refund amount %s', $value['refamount']) . ', ' . $this->__('New Tid: %s', $value['reftid']) . ' ' . $this->__('for the balance amount.') . '<br><br>';
56
- ?>
57
- {{pdf_row_separator}}
58
- <?php
59
- endif;
60
  endforeach;
61
- endif;
62
- ?>
63
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
64
  <?php else: ?>
65
  <?php echo $this->__('Error in getting payment method') ?>
66
  <?php endif; ?>
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}}
36
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?>{{pdf_row_separator}}
37
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>{{pdf_row_separator}}
38
+ <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>{{pdf_row_separator}}
39
+ <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>{{pdf_row_separator}}
40
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>{{pdf_row_separator}}
41
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>{{pdf_row_separator}}
42
+ <?php
43
+ if ($this->getAdditionalData('refunded_tid')):
44
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
45
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
46
  ?>
47
  {{pdf_row_separator}}
48
  <?php
 
 
 
 
 
 
 
 
 
 
 
49
  endforeach;
50
+ endif;
51
+ ?>
52
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
53
  <?php else: ?>
54
  <?php echo $this->__('Error in getting payment method') ?>
55
  <?php endif; ?>
app/design/frontend/default/default/template/novalnet/payment/method/form/Banktransfer.phtml CHANGED
@@ -23,10 +23,10 @@
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
- <fieldset class="form-list">
30
  <!--{{{ Payment Logo -->
31
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
@@ -38,23 +38,24 @@ $helper = Mage::helper('novalnet_payment');
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
- <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
42
- <!--{{{ Payment Description -->
 
 
 
 
 
 
43
  <li>
44
- <?php echo $this->__('redirect payment description') ?>
45
  </li>
46
- <?php if ($this->getUserInfo()): ?>
47
- <li>
48
- <?php echo $this->getUserInfo() ?>
49
- </li>
50
- <?php endif; ?>
51
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
52
- <li>
53
- <div style="font-weight:bold;color:red;font-size:12px;">
54
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
55
- </div>
56
- </li>
57
- <?php endif ?>
58
- <!--{{{ Payment Description -->
59
- </ul>
60
- </fieldset>
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
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
+ <!--{{{ Payment Description -->
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()): ?>
49
  <li>
50
+ <?php echo $this->getUserInfo() ?>
51
  </li>
52
+ <?php endif; ?>
53
+ <?php if ($this->getMethod()->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
+ <!--{{{ Payment Description -->
61
+ </ul>
 
 
 
 
 
app/design/frontend/default/default/template/novalnet/payment/method/form/Cc.phtml CHANGED
@@ -28,13 +28,18 @@ $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()->_getConfigData('auto_refill', true);
32
  // get quote billing address
33
- $billingaddress = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
 
34
  $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
35
- ? $billingaddress->getTelephone() : '' ;
 
 
 
 
36
  ?>
37
- <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
38
  <!--{{{ Payment Logo -->
39
  <div>
40
  <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;float:none;">
@@ -46,148 +51,120 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
46
  </div>
47
  <!--}}} Payment Logo -->
48
  <!--{{{ Novalnet Cc Form -->
49
-
50
- <ul id="payment_form_<?php echo $code ?>" style="display:none;">
51
- <div class="nnccloader" id='cc_loading' style='display:none;'></div>
 
 
 
 
 
 
 
52
  <li>
53
- <?php echo $this->__('The amount will be debited from your credit card once the order is submitted'); ?>
54
  </li>
55
- <?php if ($this->getUserInfo()): ?>
56
- <li>
57
- <?php echo $this->getUserInfo() ?>
58
- </li>
59
- <?php endif ?>
60
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('live_mode', true) == 0): ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
61
  <li>
62
- <div style="font-weight:bold;color:red;font-size:12px;">
63
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
 
 
 
 
 
 
 
64
  </div>
65
  </li>
66
- <?php endif ?>
67
- <li class="fields">
68
- <div class="field">
69
- <label style="float:none;" for="<?php echo $code ?>_cc_type"><?php echo $this->__('NN CC type') ?><span class="required">*</span></label><br />
70
- <div class="input-box">
71
- <select id="<?php echo $code ?>_cc_type" onchange="cchashcall()" class="required-entry validate-cc-type-select">
72
- <option value=""><?php echo $this->__('NN Select') ?></option>
73
- <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
74
- <option value="<?php echo $_typeCode ?>"><?php echo $_typeName ?></option>
75
- <?php endforeach; ?>
76
- </select>
77
  </div>
78
- </div>
79
- </li>
80
- <li class="fields">
81
- <div class="field">
82
- <label style="float:none;" for="<?php echo $code ?>_cc_owner"><?php echo $this->__('NN CC holder') ?><span class="required">*</span></label><br/>
83
- <div class="input-box">
84
- <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_cc_owner" autocomplete="off" onchange="cchashcall()" value="<?php echo $billingaddress->getFirstname() . ' ' . $billingaddress->getLastname(); ?>" /></div>
85
- </div>
86
- </li>
87
- <li class="fields">
88
- <div class="field">
89
- <label style="float:none;" for="<?php echo $code ?>_cc_number"><?php echo $this->__('NN CC number') ?><span class="required">*</span></label><br/>
90
  <div class="input-box">
91
- <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="" />
 
 
92
  </div>
93
- </div>
94
- </li>
95
- <li class="fields">
96
- <div class="field">
97
- <label style="float:none;" for="<?php echo $code ?>_expiration"><?php echo $this->__('NN Expiration Date') ?><span class="required">*</span></label><br />
 
98
  <div class="input-box">
99
- <div class="v-fix">
100
- <select id="<?php echo $code ?>_expiration" style="width:140px;" onchange="cchashcall()" class="required-entry">
101
- <option value=""><?php echo $this->__('Month'); ?></option>
102
- <?php foreach ($this->getCcMonths() as $k => $v): ?>
103
- <option value="<?php echo $k ?>"><?php echo $v ?></option>
104
- <?php endforeach; ?>
105
- </select>
106
- </div>
107
- <div class="v-fix" style="padding-left:5px;">
108
- <select id="<?php echo $code ?>_expiration_yr" style="width:103px;" onchange="cchashcall()" class="required-entry">
109
- <option value=""><?php echo $this->__('Year'); ?></option>
110
- <?php foreach ($this->getCcYears() as $k => $v): ?>
111
- <option value="<?php echo $k ?>"><?php echo $v ?></option>
112
- <?php endforeach; ?>
113
- </select>
114
- </div>
115
  </div>
116
- </div>
117
- </li>
118
- <li class="fields">
119
- <div class="field">
120
- <label style="float:none;" for="<?php echo $code ?>_cc_cid"><?php echo $this->__('NN CVC') ?><span class="required"></span></label><br />
121
- <div class="input-box">
122
- <div class="v-fix"><input style="width: 35px" 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" /></div>
123
- &nbsp;
124
- <a href="#"><img src='<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>cvc_hint.png' border="0" alt="CCV/CVC?" id="nn_cc_hint"></a>
125
- <img src="<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>creditcard_cvc.jpg" style="display:none;float:left;" border="0" id="nn_cvc_hover"/>
126
- </div>
127
- </div>
128
- </li>
129
- <!--{{{ CallbackType-->
130
- <?php if (!$creditCardSecure && $this->isCallbackTypeCall()): ?>
131
- <!--{{{ PIN by Callback-->
132
- <?php
133
- if ($this->getCallbackConfigData() != 3):
134
- ?>
135
- <li>
136
- <div class="input-box">
137
- <label style="float:none;" for="<?php echo $code ?>_callback_tel">
138
- <?php
139
- if ($this->getCallbackConfigData() == 2):
140
- ?>
141
- <?php echo $this->__('Mobile phone number'); ?>
142
- <?php else: ?>
143
- <?php echo $this->__('NN Mobile Number'); ?>
144
- <?php endif; ?>
145
- <span class="required">*</span></label><br/>
146
- <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
147
- echo $telephoneNumber; ?>"/>
148
- </div>
149
- </li>
150
- <li>
151
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
152
- <?php echo $this->__('Note for pin by sms and callback') ?>
153
- </div>
154
- <div class="input-box">
155
- <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
156
- <input onchange="document.getElementById('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/>
157
- <input id="new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
158
- <label style="float:none;" for="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
164
- elseif ($this->getCallbackConfigData() == 3):
165
- ?>
166
- <li>
167
- <div class="input-box">
168
- <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
169
- <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
170
- echo $billingaddress->getEmail(); ?>"/>
171
- </div>
172
- </li>
173
- <?php endif ?>
174
- <!--}}} Reply by Email-->
175
  <?php endif ?>
176
- <!--}}} CallbackType-->
177
- </ul>
178
-
179
- <input type="hidden" id="original_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>" />
180
- <input type="hidden" id="original_vendor_authcode" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>" />
181
- <input type="hidden" id="novalnet_cc_pan_hash" value="<?php
182
- echo $ccRefill ? $assignDatahelper->getCheckout()->getCcPanHash() : '';
183
- ?>" />
184
  <input type="hidden" name="novalnet_cc_hash" id="novalnet_cc_hash" value="" />
185
- <input type="hidden" name="novalnet_cc_unique_id" id="novalnet_cc_unique_id" value="<?php echo $ccRefill ? $assignDatahelper->getCheckout()->getCcUniqueId() : '';
186
- ?>" />
187
  <input type="hidden" id="nn_cc_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
188
  <input type="hidden" id="nn_cc_validate_error_message" value="<?php echo $this->__('Your credit card details are invalid') . '!'; ?>" />
189
  <!--}}} Novalnet Cc Form -->
190
- </fieldset>
191
  <style>
192
  .nnccloader {
193
  position: fixed;
@@ -198,12 +175,14 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
198
  z-index: 9999;
199
  background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
200
  }
 
 
 
 
 
 
 
 
 
 
201
  </style>
202
- <script type="text/javascript">
203
- jQuery('#nn_cc_hint').hover(function(){
204
- jQuery('#nn_cvc_hover').show();
205
- });
206
- jQuery('#nn_cc_hint').mouseleave(function(){
207
- jQuery('#nn_cvc_hover').hide();
208
- });
209
- </script>
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;">
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()): ?>
64
  <li>
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;
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>
 
 
 
 
 
 
 
 
app/design/frontend/default/default/template/novalnet/payment/method/form/Eps.phtml CHANGED
@@ -23,11 +23,10 @@
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
- <fieldset class="form-list">
30
-
31
  <!--{{{ Payment Logo -->
32
  <div>
33
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
@@ -39,23 +38,24 @@ $helper = Mage::helper('novalnet_payment');
39
  </a>
40
  </div>
41
  <!--}}} Payment Logo -->
42
- <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
43
- <!--{{{ Payment Description -->
 
 
 
 
 
 
44
  <li>
45
- <?php echo $this->__('redirect payment description') ?>
46
  </li>
47
- <?php if ($this->getUserInfo()): ?>
48
- <li>
49
- <?php echo $this->getUserInfo() ?>
50
- </li>
51
- <?php endif; ?>
52
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
53
- <li>
54
- <div style="font-weight:bold;color:red;font-size:12px;">
55
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
56
- </div>
57
- </li>
58
- <?php endif ?>
59
- <!--}}} Payment Description -->
60
- </ul>
61
- </fieldset>
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
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
+ <!--{{{ Payment Description -->
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()): ?>
49
  <li>
50
+ <?php echo $this->getUserInfo() ?>
51
  </li>
52
+ <?php endif; ?>
53
+ <?php if ($this->getMethod()->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
+ <!--}}} Payment Description -->
61
+ </ul>
 
 
 
 
 
app/design/frontend/default/default/template/novalnet/payment/method/form/Ideal.phtml CHANGED
@@ -23,11 +23,10 @@
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
- <fieldset class="form-list">
30
-
31
  <!--{{{ Payment Logo -->
32
  <div>
33
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
@@ -39,23 +38,24 @@ $helper = Mage::helper('novalnet_payment');
39
  </a>
40
  </div>
41
  <!--}}} Payment Logo -->
42
- <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
43
- <!--{{{ Payment Description -->
 
 
 
 
 
 
44
  <li>
45
- <?php echo $this->__('redirect payment description') ?>
46
  </li>
47
- <?php if ($this->getUserInfo()): ?>
48
- <li>
49
- <?php echo $this->getUserInfo() ?>
50
- </li>
51
- <?php endif; ?>
52
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
53
- <li>
54
- <div style="font-weight:bold;color:red;font-size:12px;">
55
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
56
- </div>
57
- </li>
58
- <?php endif ?>
59
- <!--{{{ Payment Description -->
60
- </ul>
61
- </fieldset>
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
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
+ <!--{{{ Payment Description -->
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()): ?>
49
  <li>
50
+ <?php echo $this->getUserInfo() ?>
51
  </li>
52
+ <?php endif; ?>
53
+ <?php if ($this->getMethod()->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
+ <!--{{{ Payment Description -->
61
+ </ul>
 
 
 
 
 
app/design/frontend/default/default/template/novalnet/payment/method/form/Invoice.phtml CHANGED
@@ -27,9 +27,9 @@ $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
  $billingaddress = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
29
  $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
30
- ? $billingaddress->getTelephone() : '' ;
31
  ?>
32
- <fieldset class="form-list">
33
  <!-- PAYMENT LOGO -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
@@ -38,65 +38,73 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
38
  </a>
39
  </div>
40
  <!-- PAYMENT LOGO -->
41
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
42
- <!--{{{ PAYMENT DESCRIPTION -->
 
 
 
43
  <li>
44
- <?php echo $this->__('Invoice/Prepayment payment description') ?>
45
  </li>
46
- <?php if ($this->getUserInfo()): ?>
 
 
 
 
 
 
 
 
 
 
 
 
47
  <li>
48
- <?php echo $this->getUserInfo() ?>
 
 
 
 
 
 
 
 
 
49
  </li>
50
- <?php endif ?>
51
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
52
  <li>
53
- <div style="font-weight:bold;color:red;font-size:12px;">
54
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
55
  </div>
56
  </li>
57
  <?php endif ?>
58
- <!--}}} PAYMENT DESCRIPTION -->
59
- <!--{{{ CallbackType-->
60
- <?php if ($this->isCallbackTypeCall()): ?>
61
- <!--{{{ PIN by Callback-->
62
- <?php if ($this->getCallbackConfigData() != 3): ?>
63
- <li>
64
- <div class="input-box">
65
- <label style="float:none;" for="<?php echo $code ?>_callback_tel">
66
- <?php
67
- if ($this->getCallbackConfigData() == 2):
68
- ?>
69
- <?php echo $this->__('Mobile phone number'); ?>
70
- <?php else: ?>
71
- <?php echo $this->__('NN Mobile Number'); ?>
72
- <?php endif; ?>
73
- <span class="required"></span></label><br/>
74
- <input type="text" value="<?php echo $telephoneNumber; ?>" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" />
75
- </div>
76
- </li>
77
- <li>
78
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
79
- <?php echo $this->__('Note for pin by sms and callback') ?>
80
- </div>
81
- <div class="input-box">
82
- <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required"></span></label><br/>
83
- <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/>
84
- <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
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
- <!--{{{ Reply by Email-->
90
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
91
- <li>
92
- <div class="input-box">
93
- <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required"></span></label><br/>
94
- <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" />
95
- </div>
96
- </li>
97
- <?php endif ?>
98
- <!--}}} Reply by Email-->
99
- <?php endif ?>
100
- <!--}}} CallbackType-->
101
- </ul>
102
- </fieldset>
27
  $helper = Mage::helper('novalnet_payment');
28
  $billingaddress = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
29
  $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
30
+ ? $billingaddress->getTelephone() : '' ;
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;">
38
  </a>
39
  </div>
40
  <!-- PAYMENT LOGO -->
41
+ <!--{{{ PAYMENT DESCRIPTION -->
42
+ <li>
43
+ <?php echo $this->__('Invoice/Prepayment payment description') ?>
44
+ </li>
45
+ <?php if ($this->getUserInfo()): ?>
46
  <li>
47
+ <?php echo $this->getUserInfo() ?>
48
  </li>
49
+ <?php endif ?>
50
+ <?php if ($this->getMethod()->getNovalnetConfig('live_mode', true) == 0): ?>
51
+ <li>
52
+ <div style="font-weight:bold;color:red;font-size:12px;">
53
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
54
+ </div>
55
+ </li>
56
+ <?php endif ?>
57
+ <!--}}} PAYMENT DESCRIPTION -->
58
+ <!--{{{ CallbackType-->
59
+ <?php if ($this->isCallbackTypeCall()): ?>
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'); ?>
66
+ <?php else: ?>
67
+ <?php echo $this->__('NN Mobile Number'); ?>
68
+ <?php endif; ?>
69
+ </label>
70
+ <div class="input-box">
71
+ <input type="text" value="<?php echo $telephoneNumber; ?>" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" />
72
+ </div>
73
  </li>
 
 
74
  <li>
75
+ <div class="nncallbacknote">
76
+ <?php echo $this->__('Note for pin by sms and callback') ?>
77
+ </div>
78
+ <label for="<?php echo $code ?>_callback_pin" class="required"><em>*</em><?php echo $this->__('PIN') ?></label>
79
+ <div class="input-box">
80
+ <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/>
81
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
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>
99
+ <style>
100
+ .nncallbacknote {
101
+ font-weight:bold;
102
+ font-size:11px;
103
+ color:gray;
104
+ border:1px solid #BFBFBF;
105
+ background:#FEFFBF;
106
+ padding:10px;
107
+ margin-top:10px;
108
+ width:400px;
109
+ }
110
+ </style>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/default/default/template/novalnet/payment/method/form/Paypal.phtml CHANGED
@@ -23,11 +23,10 @@
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
- <fieldset class="form-list">
30
-
31
  <!--{{{ Payment Logo -->
32
  <div>
33
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
@@ -39,23 +38,25 @@ $helper = Mage::helper('novalnet_payment');
39
  </a>
40
  </div>
41
  <!--}}} Payment Logo -->
42
- <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
43
- <!--{{{ Payment Description -->
 
 
 
 
 
 
 
 
 
 
 
44
  <li>
45
- <?php echo $this->__('redirect payment description') ?>
 
 
46
  </li>
47
- <?php if ($this->getUserInfo()): ?>
48
- <li>
49
- <?php echo $this->getUserInfo() ?>
50
- </li>
51
- <?php endif; ?>
52
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
53
- <li>
54
- <div style="font-weight:bold;color:red;font-size:12px;">
55
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
56
- </div>
57
- </li>
58
- <?php endif ?>
59
- <!--{{{ Payment Description -->
60
- </ul>
61
- </fieldset>
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
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
+ <!--{{{ Payment Description -->
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()): ?>
49
+ <li>
50
+ <?php echo $this->getUserInfo() ?>
51
+ </li>
52
+ <?php endif; ?>
53
+ <?php if ($this->getMethod()->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
+ <!--{{{ Payment Description -->
61
+ </ul>
62
+
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/default/default/template/novalnet/payment/method/form/Prepayment.phtml CHANGED
@@ -26,7 +26,7 @@
26
  $code = $this->getMethodCode();
27
  $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;">
@@ -35,23 +35,21 @@ $helper = Mage::helper('novalnet_payment');
35
  </a>
36
  </div>
37
  <!-- PAYMENT LOGO -->
38
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
39
- <!--{{{ PAYMENT DESCRIPTION -->
 
 
 
40
  <li>
41
- <?php echo $this->__('Invoice/Prepayment payment description') ?>
42
  </li>
43
- <?php if ($this->getUserInfo()): ?>
44
- <li>
45
- <?php echo $this->getUserInfo() ?>
46
- </li>
47
- <?php endif ?>
48
- <?php if ($this->getLiveMode() == 0): ?>
49
- <li>
50
- <div style="font-weight:bold;color:red;font-size:12px;">
51
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
52
- </div>
53
- </li>
54
- <?php endif ?>
55
- <!--}}} PAYMENT DESCRIPTION -->
56
- </ul>
57
- </fieldset>
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
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
35
  </a>
36
  </div>
37
  <!-- PAYMENT LOGO -->
38
+ <!--{{{ PAYMENT DESCRIPTION -->
39
+ <li>
40
+ <?php echo $this->__('Invoice/Prepayment payment description') ?>
41
+ </li>
42
+ <?php if ($this->getUserInfo()): ?>
43
  <li>
44
+ <?php echo $this->getUserInfo() ?>
45
  </li>
46
+ <?php endif ?>
47
+ <?php if ($this->getLiveMode() == 0): ?>
48
+ <li>
49
+ <div style="font-weight:bold;color:red;font-size:12px;">
50
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
51
+ </div>
52
+ </li>
53
+ <?php endif ?>
54
+ <!--}}} PAYMENT DESCRIPTION -->
55
+ </ul>
 
 
 
 
 
app/design/frontend/default/default/template/novalnet/payment/method/form/Sepa.phtml CHANGED
@@ -26,12 +26,13 @@
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
  $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
- $sepaRefill = $this->getMethod()->_getConfigData('auto_refill', true);
30
  $sepaPaymentRefill = $this->getMethod()->getConfigData('sepa_payment_refill');
31
  $refillValues = $assignDatahelper->getCheckout()->getRefilldatavalues();
32
- $refillMethod = ($sepaRefill && $refillValues != '' && $code == $refillValues->getMethod());
33
  // get quote billing address
34
- $billingaddress = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
 
35
  $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
36
  ? $billingaddress->getTelephone() : '' ;
37
  $street = $billingaddress->getStreet();
@@ -43,8 +44,12 @@ if ($sepaPaymentRefill && $customerlogin) {
43
  } else if ($sepaRefill) {
44
  $panhash = $assignDatahelper->getCheckout()->getSepaHash();
45
  }
 
 
 
 
46
  ?>
47
- <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
48
  <!--{{{ Payment Logo -->
49
  <div>
50
  <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
@@ -57,231 +62,126 @@ if ($sepaPaymentRefill && $customerlogin) {
57
  </div>
58
  <!--}}} Payment Logo -->
59
  <!--{{{ Novalnet SEPA Form -->
60
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
61
- <div class="nnsepaloader" id='sepa_loading' style='display:none;'></div>
 
 
 
62
  <li>
63
- <?php echo $this->__('Your account will be debited upon the order submission'); ?>
64
  </li>
65
- <?php if ($this->getUserInfo()): ?>
66
- <li>
67
- <?php echo $this->getUserInfo() ?>
68
- </li>
69
- <?php endif ?>
70
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('live_mode', true) == 0): ?>
71
- <li>
72
- <div style="font-weight:bold;color:red;font-size:12px;">
73
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
74
- </div>
75
- </li>
76
- <?php endif ?>
77
-
78
- <li class="fields">
79
- <div class="field">
80
- <label style="float:none;" for="<?php echo $code ?>_account_holder"><?php echo $this->__('Account Holder') ?><span class="required">*</span></label><br/>
81
- <div class="input-box">
82
- <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(); ?>" />
83
- </div>
84
  </div>
85
  </li>
86
- <li class="fields">
87
- <div class="field">
88
- <label style="float:none;" for="<?php echo $code ?>_bank_country"><?php echo $this->__('NN Country') ?><span class="required">*</span></label><br />
89
- <div class="input-box">
 
 
 
 
 
 
 
 
 
 
 
 
 
 
90
  <?php
91
- $_countries = Mage::getResourceModel('directory/country_collection')
92
- ->loadData()
93
- ->toOptionArray(false)
94
- ?>
95
- <?php if (count($_countries) > 0): ?>
96
- <select id="<?php echo $code ?>_bank_country" onchange="unsetHashRelatedElements()" class="required-entry">
97
- <?php
98
- foreach ($_countries as $_country):
99
- if (in_array($billingaddress->getCountryId(), $_country)) {
100
- ?>
101
- <option selected value="<?php echo $_country['value'] ?>"><?php echo $_country['label'] ?>
102
- </option>
103
- <?php } else { ?>
104
- <option value="<?php echo $_country['value'] ?>">
105
- <?php echo $_country['label'] ?>
106
- </option>
107
- <?php } ?>
108
- <?php endforeach; ?>
109
- </select><br/>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
110
  <?php endif; ?>
111
- </div>
112
- </div>
113
- </li>
114
- <li class="fields">
115
- <div class="field">
116
- <label style="float:none;" for="<?php echo $code ?>_account_number"><?php echo $this->__('IBAN or Account number') ?><span class="required">*</span></label><br/>
117
  <div class="input-box">
118
- <input type="text" id="<?php echo $code ?>_account_number" onkeypress="return ibanbicValidate(event)" onchange="unsetHashRelatedElements();" title="<?php echo $this->__('IBAN or Account number') ?>" class="required-entry input-text" autocomplete="off" value="" />
119
  </div>
120
- </div>
121
- </li>
122
-
123
- <li class="fields">
124
- <div class="field">
125
- <label style="float:none;" for="<?php echo $code ?>_bank_code"><?php echo $this->__('BIC or Bank code') ?><span class="required">*</span></label><br/>
126
  <div class="input-box">
127
- <input type="text" id="<?php echo $code ?>_bank_code" title="<?php echo $this->__('BIC or Bank code') ?>" class="input-text" autocomplete="off" onkeypress="return ibanbicValidate(event)" onchange="unsetHashRelatedElements()" value="" />
 
 
128
  </div>
129
- </div>
130
- </li>
131
-
132
- <li class="fields">
133
- <div class="field">
 
134
  <div class="input-box">
135
- <input type="checkbox" id="<?php echo $code ?>_mandate_confirm" title="<?php echo $this->__('confirm') ?>" class="required-entry" onclick="generate_sepa_iban_bic(this, '<?php echo $this->__('Your account details are invalid') ?>', '<?php echo $this->__('Basic parameter not valid') ?>')"/>
136
- <label style="float:none;" ><?php echo $this->__('NN Confirm') ?><span class="required"></span></label><br/>
137
  </div>
138
- </div>
139
- </li>
140
- <!--{{{ CallbackType-->
141
- <?php if ($this->isCallbackTypeCall()): ?>
142
- <!--{{{ PIN by Callback-->
143
- <?php
144
- if ($this->getCallbackConfigData() != 3):
145
- ?>
146
- <li>
147
- <label style="float:none;" for="<?php echo $code ?>_callback_tel">
148
- <div class="input-box">
149
- <?php
150
- if ($this->getCallbackConfigData() == 2):
151
- ?>
152
- <?php echo $this->__('Mobile phone number'); ?>
153
- <?php else: ?>
154
- <?php echo $this->__('NN Mobile Number'); ?>
155
- <?php endif; ?>
156
- <span class="required"></span></label><br/>
157
- <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
158
- echo $telephoneNumber; ?>"/>
159
- </div>
160
- </li>
161
- <li>
162
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
163
- <?php echo $this->__('Note for pin by sms and callback') ?>
164
- </div>
165
- <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
166
- <div class="input-box">
167
- <input onchange="document.getElementById('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/>
168
- <input id="new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
169
- <label style="float:none;" for="new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
170
- </div>
171
- </li>
172
- <!--}}} PIN by Callback-->
173
- <!--{{{ Reply by Email-->
174
- <?php
175
- elseif ($this->getCallbackConfigData() == 3):
176
- ?>
177
- <li>
178
- <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
179
- <div class="input-box">
180
- <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
181
- echo $billingaddress->getEmail(); ?>"/>
182
- </div>
183
- </li>
184
- <?php endif ?>
185
- <!--}}} Reply by Email-->
186
  <?php endif ?>
187
- <!--}}} CallbackType-->
188
- <!-- Mandate overlay START-->
189
- <li>
190
- <div class="bgCover">&nbsp;</div>
191
- <div id='sepa_mandate_overlay_block_first' style='display:none;' class='nnsepaloader'>
192
- </div>
193
- <div id='sepa_mandate_overlay_block' style='display:none;' class='overlay_window_block'>
194
- <div class='nn_header'>
195
- <h1><?php echo $this->__('SEPA Direct Debit Mandate Confirmation') ?></h1>
196
- </div>
197
- <div class='body_div' id='overlay_window_block_body' style="height: 400px;">
198
- <p>
199
- <table>
200
- <tr>
201
- <td><?php echo $this->__('Creditor') ?></td><td>:</td><td><span id='sepa_overlay_payee_span'>&nbsp;</span></td>
202
- </tr>
203
- <tr>
204
- <td><?php echo $this->__('Credit Identification Number') ?></td><td>:</td><td><span id='sepa_overlay_creditoridentificationnumber_span'>&nbsp;</span></td>
205
- </tr>
206
- <tr>
207
- <td><?php echo $this->__('Mandate Reference') ?></td><td>:</td><td><span id='sepa_overlay_mandatereference_span'>&nbsp;</span></td>
208
- </tr>
209
- </table><br/>
210
- <?php echo $this->__('SEPA Confirm paragraph') ?>
211
-
212
- <br/> <br/>
213
- <?php echo $this->__('SEPA Confirm note') ?>
214
- <br/> <br/>
215
- <table>
216
- <tr>
217
- <td><?php echo $this->__('Name of the payee') ?></td><td>:</td><td><span id='sepa_overlay_enduserfullname_span'>&nbsp;</span></td>
218
- </tr>
219
- <?php if($billingaddress->getCompany()) { ?>
220
- <tr>
221
- <td><?php echo $this->__('Company name') ?></td><td>:</td><td><?php echo $billingaddress->getCompany(); ?></td>
222
- </tr>
223
- <?php } ?>
224
- <tr>
225
- <td><?php echo $this->__('NN Address') ?></td><td>:</td><td><?php echo $street[0]; ?></td>
226
- </tr>
227
- <?php if(isset($street[1]) && $street[1]) { ?>
228
- <tr>
229
- <td><?php echo $this->__('NN Street') ?></td><td>:</td><td><?php echo $street[1]; ?></td>
230
- </tr>
231
- <?php }?>
232
- <tr>
233
- <td><?php echo $this->__('Zip Code And City') ?></td><td>:</td><td><?php echo $billingaddress->getPostcode(); ?><span id='sepa_overlay_enduserzipcode_span'>&nbsp;</span> <?php echo $billingaddress->getCity(); ?></td>
234
- </tr>
235
- <tr>
236
- <td><?php echo $this->__('Country') ?></td><td>:</td><td><span id='sepa_overlay_endusercountry_span'>&nbsp;</span></td>
237
- </tr>
238
- <?php if($billingaddress->getEmail()) { ?>
239
- <tr>
240
- <td><?php echo $this->__('Email') ?></td><td>:</td><td><?php echo $billingaddress->getEmail(); ?></td>
241
- </tr>
242
- <?php } ?>
243
- <tr id='nn_sepa_overlay_iban_tr'>
244
- <td><?php echo $this->__('IBAN') ?></td><td>:</td><td><span id='sepa_overlay_iban_span'>&nbsp;</span></td>
245
- </tr>
246
- <tr id='nn_sepa_overlay_bic_tr'>
247
- <td><?php echo $this->__('BIC') ?></td><td>:</td><td><span id='sepa_overlay_bic_span'>&nbsp;</span></td>
248
- </tr>
249
-
250
- </table>
251
- <br/>
252
- <?php echo $billingaddress->getCity(); ?>, <span id='sepa_overlay_mandatedate_span'>&nbsp;</span>, <span id='sepa_overlay_enduserfullname_span1'>&nbsp;</span>
253
- </p>
254
- </div>
255
- <div class='nn_footer'>
256
- <input style="width: 30%" type='button' id='mandate_confirm_btn' name='mandate_confirm_btn' onclick="mandate_confirm_btn_submit()" value=<?php echo $this->__('conirm_mandate') ?> class='mandate_confirm_btn' />
257
- <input style="width: 30%" type='button' id='mandate_cancel_btn' name='mandate_cancel_btn' onclick="mandate_cancel_btn_submit()" value=<?php echo $this->__('cancel') ?> class='mandate_confirm_btn' />
258
- <img src='<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>logo.png' width=120 alt='Novalnet AG' style='float:right;' />
259
- </div>
260
- </div>
261
- </li>
262
- <!-- Mandate overlay END-->
263
- </ul>
264
-
265
- <input type="hidden" id="process_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>"/>
266
- <input type="hidden" id="auth_code" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>"/>
267
  <input id="sepaiban" type="hidden" value="">
268
  <input id="sepabic" type="hidden" value="">
269
  <input id="sepa_payment_id" type="hidden" value="37">
270
- <input id="novalnet_sepa_owner" type="hidden" value="">
271
- <input id="result_mandate_date" type="hidden" value="">
272
- <input id="result_mandate_ref" type="hidden" value="">
273
  <input id="result_mandate_unique" type="hidden" value="" name="result_mandate_unique">
274
  <input id="nnsepa_iban_confirmed" type="hidden" value="0" name="nnsepa_iban_confirmed">
275
- <input type="hidden" id="nn_sepa_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
276
- <input type="hidden" id="nn_sepa_validate_error_message" value="<?php echo $this->__('Your account details are invalid') . '!'; ?>" />
277
- <input id="result_sepa_hash" type="hidden" value="<?php
278
- if (($sepaPaymentRefill || $sepaRefill) && $panhash != '') {
279
- echo $panhash;
280
- } else {
281
- $panhash = '';
282
- }
283
- ?>" name="result_sepa_hash">
284
- </fieldset>
285
  <style>
286
  .nnsepaloader {
287
  position: fixed;
@@ -293,81 +193,14 @@ if ($sepaPaymentRefill && $customerlogin) {
293
  background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
294
  }
295
 
296
- .bgCover { background:#878787; position:fixed; left:0; top:0; display:none; overflow:hidden; z-index:1000; }
297
- #sepa_mandate_overlay_block
298
- {
299
- font-size:12px;
300
- color:#555555;
301
- background-color:#fff;
302
- }
303
-
304
- .overlay_window_block {
305
- background-color:#ffffff;
306
- border-radius:5px;
307
- border:1px solid #a1a1a1;
308
- z-index:1000;
309
- }
310
- .overlay_window_block .nn_footer{
311
- bottom:0px;
312
- position:absolute;
313
- height:37px;
314
- width:100%;
315
- }
316
- .overlay_window_block .nn_header{
317
- top:0px;
318
- height:25px;
319
- border-bottom:1px solid #878787;
320
- padding:5px;
321
- }
322
- .overlay_window_block .body_div{
323
- padding:5px;
324
- overflow-y:scroll;
325
- }
326
- .mandate_confirm_btn{
327
- border:1px solid #0080C9;
328
- -webkit-border-radius: 3px;
329
- -moz-border-radius: 3px;
330
- border-radius: 3px;
331
- padding: 6px;
332
- text-decoration:none;
333
- display:inline-block;
334
- text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
335
- font-weight:bold;
336
- color: #FFFFFF;
337
- width:40%;
338
- cursor:pointer;
339
- margin-left:2px;
340
- margin-top:3px;
341
- float:left;
342
- margin-bottom:0px;
343
- background-color: #0080C9; background-image: -webkit-gradient(linear, left top, left bottom, from(#0080C9), to(#0080C9));
344
- background-image: -webkit-linear-gradient(top, #0080C9, #0080C9);
345
- background-image: -moz-linear-gradient(top, #0080C9, #0080C9);
346
- background-image: -ms-linear-gradient(top, #0080C9, #0080C9);
347
- background-image: -o-linear-gradient(top, #0080C9, #0080C9);
348
- background-image: linear-gradient(to bottom, #0080C9, #0080C9);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=#0080C9, endColorstr=#0080C9);
349
- }
350
-
351
- .mandate_confirm_btn:hover{
352
- border:1px solid #878787;
353
- background-color: #878787; background-image: -webkit-gradient(linear, left top, left bottom, from(#878787), to(#878787));
354
- background-image: -webkit-linear-gradient(top, #878787, #878787);
355
- background-image: -moz-linear-gradient(top, #878787, #878787);
356
- background-image: -ms-linear-gradient(top, #878787, #878787);
357
- background-image: -o-linear-gradient(top, #878787, #878787);
358
- background-image: linear-gradient(to bottom, #878787, #878787);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=#878787, endColorstr=#878787);
359
- }
360
-
361
- #sepa_mandate_overlay_block h1
362
- {
363
- color: #00669D;
364
- font-size:14px;
365
- font-weight:bold;
366
- text-transform:none;
367
- margin:0;
368
- }
369
-
370
- table td{
371
- padding : 2px;
372
  }
373
  </style>
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());
33
  // get quote billing address
34
+ $checkoutSession = Mage::getSingleton('checkout/session');
35
+ $billingaddress = $checkoutSession->getQuote()->getBillingAddress();
36
  $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
37
  ? $billingaddress->getTelephone() : '' ;
38
  $street = $billingaddress->getStreet();
44
  } else if ($sepaRefill) {
45
  $panhash = $assignDatahelper->getCheckout()->getSepaHash();
46
  }
47
+
48
+ $panhash = (($sepaPaymentRefill || $sepaRefill) && $panhash) ? $panhash : '';
49
+ $vendorId = $checkoutSession->getNnVendor() ? $checkoutSession->getNnVendor() : trim($this->getMethod()->getNovalnetConfig('merchant_id', true));
50
+ $authCode = $checkoutSession->getNnAuthcode() ? $checkoutSession->getNnAuthcode() : trim($this->getMethod()->getNovalnetConfig('auth_code', true));
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;">
62
  </div>
63
  <!--}}} Payment Logo -->
64
  <!--{{{ Novalnet SEPA Form -->
65
+ <div class="nnsepaloader" id='sepa_loading' style='display:none;'></div>
66
+ <li>
67
+ <?php echo $this->__('Your account will be debited upon the order submission'); ?>
68
+ </li>
69
+ <?php if ($this->getUserInfo()): ?>
70
  <li>
71
+ <?php echo $this->getUserInfo() ?>
72
  </li>
73
+ <?php endif ?>
74
+ <?php if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->getNovalnetConfig('live_mode', true) == 0): ?>
75
+ <li>
76
+ <div style="font-weight:bold;color:red;font-size:12px;">
77
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
78
  </div>
79
  </li>
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(); ?>" />
86
+ </div>
87
+ </li>
88
+ <li>
89
+ <label for="<?php echo $code ?>_bank_country" class="required"><em>*</em><?php echo $this->__('NN Country') ?></label>
90
+ <div class="input-box">
91
+ <?php
92
+ $_countries = Mage::getResourceModel('directory/country_collection')
93
+ ->loadData()
94
+ ->toOptionArray(false)
95
+ ?>
96
+ <?php if (count($_countries) > 0): ?>
97
+ <select id="<?php echo $code ?>_bank_country" onchange="unsetHashRelatedElements()" class="required-entry">
98
  <?php
99
+ foreach ($_countries as $_country):
100
+ if (in_array($billingaddress->getCountryId(), $_country)) {
101
+ ?>
102
+ <option selected value="<?php echo $_country['value'] ?>"><?php echo $_country['label'] ?>
103
+ </option>
104
+ <?php } else { ?>
105
+ <option value="<?php echo $_country['value'] ?>">
106
+ <?php echo $_country['label'] ?>
107
+ </option>
108
+ <?php } ?>
109
+ <?php endforeach; ?>
110
+ </select><br/>
111
+ <?php endif; ?>
112
+ </div>
113
+ </li>
114
+ <li>
115
+ <label for="<?php echo $code ?>_account_number" class="required"><em>*</em><?php echo $this->__('IBAN or Account number') ?></label>
116
+ <div class="input-box">
117
+ <input type="text" id="<?php echo $code ?>_account_number" onkeypress="return ibanbicValidate(event)" onchange="unsetHashRelatedElements();" title="<?php echo $this->__('IBAN or Account number') ?>" class="required-entry input-text" autocomplete="off" value="" />
118
+ </div>
119
+ </li>
120
+
121
+ <li>
122
+ <label for="<?php echo $code ?>_bank_code" class="required"><em>*</em><?php echo $this->__('BIC or Bank code') ?></label>
123
+ <div class="input-box">
124
+ <input type="text" id="<?php echo $code ?>_bank_code" title="<?php echo $this->__('BIC or Bank code') ?>" class="input-text" autocomplete="off" onkeypress="return ibanbicValidate(event)" onchange="unsetHashRelatedElements()" value="" />
125
+ </div>
126
+ </li>
127
+
128
+ <li>
129
+ <div class="input-box">
130
+ <input type="checkbox" id="<?php echo $code ?>_mandate_confirm" title="<?php echo $this->__('confirm') ?>" class="required-entry" onclick="generate_sepa_iban_bic(this, '<?php echo $this->__('Your account details are invalid') ?>', '<?php echo $this->__('Basic parameter not valid') ?>')"/>
131
+ <label class="required" style="float:none;"><?php echo $this->__('NN Confirm') ?></label>
132
+ </div>
133
+ </li>
134
+ <!--{{{ CallbackType-->
135
+ <?php if ($this->isCallbackTypeCall()): ?>
136
+ <!--{{{ PIN by Callback-->
137
+ <?php if ($this->getCallbackConfigData() != 3): ?>
138
+ <li>
139
+ <label for="<?php echo $code ?>_callback_tel" class="required"><em>*</em>
140
+ <?php if ($this->getCallbackConfigData() == 2): ?>
141
+ <?php echo $this->__('Mobile phone number'); ?>
142
+ <?php else: ?>
143
+ <?php echo $this->__('NN Mobile Number'); ?>
144
  <?php endif; ?>
145
+ </label>
 
 
 
 
 
146
  <div class="input-box">
147
+ <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; ?>"/>
148
  </div>
149
+ </li>
150
+ <li>
151
+ <div class="nncallbacknote">
152
+ <?php echo $this->__('Note for pin by sms and callback') ?>
153
+ </div>
154
+ <label for="<?php echo $code ?>_callback_pin" class="required"><em>*</em><?php echo $this->__('PIN') ?></label>
155
  <div class="input-box">
156
+ <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/>
157
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
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 ?>"/>
175
+ <input id="auth_code" type="hidden" value="<?php echo $authCode ?>"/>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
176
  <input id="sepaiban" type="hidden" value="">
177
  <input id="sepabic" type="hidden" value="">
178
  <input id="sepa_payment_id" type="hidden" value="37">
 
 
 
179
  <input id="result_mandate_unique" type="hidden" value="" name="result_mandate_unique">
180
  <input id="nnsepa_iban_confirmed" type="hidden" value="0" name="nnsepa_iban_confirmed">
181
+ <input id="nn_sepa_merchant_validate_error_message" type="hidden" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
182
+ <input id="nn_sepa_validate_error_message" type="hidden" value="<?php echo $this->__('Your account details are invalid') . '!'; ?>" />
183
+ <input id="result_sepa_hash" type="hidden" value="<?php echo $panhash; ?>" name="result_sepa_hash">
184
+ </ul>
 
 
 
 
 
 
185
  <style>
186
  .nnsepaloader {
187
  position: fixed;
193
  background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
194
  }
195
 
196
+ .nncallbacknote {
197
+ font-weight:bold;
198
+ font-size:11px;
199
+ color:gray;
200
+ border:1px solid #BFBFBF;
201
+ background:#FEFFBF;
202
+ padding:10px;
203
+ margin-top:10px;
204
+ width:400px;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
205
  }
206
  </style>
app/design/frontend/default/default/template/novalnet/payment/method/info/Banktransfer.phtml CHANGED
@@ -28,25 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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 if ($this->getAdditionalData('refunded_tid')):
40
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
41
- if ($this->getAdditionalData('fullRefund') == true):
42
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
43
- else:
44
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
45
- endif;
 
46
  endforeach;
47
- endif;
48
- ?>
49
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
50
  <?php else: ?>
51
  <?php echo $this->__('Error in getting payment method') ?>
52
  <?php endif; ?>
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/Cc.phtml CHANGED
@@ -31,28 +31,29 @@ $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
- ?>
35
- <?php
36
- if ($this->getAdditionalData('NnTestOrder'))
37
  echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
38
  ?>
39
- <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
40
- <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
41
- <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>
42
- <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>
43
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
44
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
45
- <?php if ($this->getAdditionalData('refunded_tid')):
46
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
47
- if ($this->getAdditionalData('fullRefund') == true):
48
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
49
- else:
50
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
51
- endif;
52
- endforeach;
53
- endif;
54
- ?>
55
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
56
  <?php else: ?>
57
  <?php echo $this->__('Error in getting payment method') ?>
58
  <?php endif; ?>
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
+ ?>
35
+ <?php
36
+ if ($this->getAdditionalData('NnTestOrder'))
37
  echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
38
+ ?>
39
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
40
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
41
+ <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>
42
+ <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>
43
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
44
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
45
+ <?php
46
+ if ($this->getAdditionalData('refunded_tid')):
47
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
48
+ if ($this->getAdditionalData('fullRefund') == true || preg_match("/-refund/i", $value['reftid'])):
49
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
50
+ else:
51
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s.Your new TID for the refund amount: %s', $helper->makeValidNumber($value['reqtid']), $value['refamount'], $helper->makeValidNumber($value['reftid'])) . '<br><br>';
52
+ endif;
53
+ endforeach;
54
+ endif;
55
  ?>
56
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
57
  <?php else: ?>
58
  <?php echo $this->__('Error in getting payment method') ?>
59
  <?php endif; ?>
app/design/frontend/default/default/template/novalnet/payment/method/info/Eps.phtml CHANGED
@@ -28,25 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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 if ($this->getAdditionalData('refunded_tid')):
40
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
41
- if ($this->getAdditionalData('fullRefund') == true):
42
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
43
- else:
44
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
45
- endif;
 
46
  endforeach;
47
- endif;
48
- ?>
49
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
50
  <?php else: ?>
51
  <?php echo $this->__('Error in getting payment method') ?>
52
  <?php endif; ?>
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/Ideal.phtml CHANGED
@@ -28,25 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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 if ($this->getAdditionalData('refunded_tid')):
40
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
41
- if ($this->getAdditionalData('fullRefund') == true):
42
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
43
- else:
44
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
45
- endif;
 
46
  endforeach;
47
- endif;
48
- ?>
49
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
50
  <?php else: ?>
51
  <?php echo $this->__('Error in getting payment method') ?>
52
  <?php endif; ?>
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
@@ -31,76 +31,77 @@ $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
37
  if ($this->getAdditionalData('NnTestOrder'))
38
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
39
- ?>
40
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
41
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
42
- <?php if ($nextCycleDate) echo '<br>' . $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br><br>' ?>
43
- <?php if ($this->getAdditionalData('captureTid')) echo '<br>' . $this->__('The transaction has been confirmed on %s', $captureTime) . '<br><br>' ?>
44
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
45
- <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('The transaction has been canceled on ') . $currentTime . '<br>' ?>
46
- <?php if ($this->getAdditionalData('refunded_tid')):
47
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
48
- if ($this->getAdditionalData('fullRefund') == true):
49
- echo '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
50
- else:
51
- echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
52
- endif;
53
- endforeach;
54
- endif;
55
- ?>
56
- <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl)): ?>
57
  <?php
58
- if (strlen($this->getAdditionalData('NnNote'))):
59
- if (strstr($this->getAdditionalData('NnNote'), 'br')):
60
- echo nl2br($this->getAdditionalData('NnNote'));
61
- else:
62
- $note = explode('|',$this->getAdditionalData('NnNote'));
63
- echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
64
- foreach($note as $noteValue):
65
- list($text, $value) = explode(':', $noteValue);
66
- echo $this->__($text) . ' : '. $value . '</br>';
67
- endforeach;
68
- endif;
69
  endif;
70
  ?>
71
- <?php
72
- if (strlen($this->getAdditionalData('NnNoteAmount'))):
73
- list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
74
- echo $this->__($text) . ' : '. $value;
75
- endif;
76
- ?>
77
- <?php
78
- if (strlen($this->getAdditionalData('NnNoteTID'))):
79
- if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
80
- echo nl2br($this->getAdditionalData('NnNoteTID'));
81
- else:
82
- $note = explode('|',$this->getAdditionalData('NnNoteTID'));
83
- echo "<br />";
84
- foreach($note as $noteValue):
85
- list($text, $value) = explode(':', $noteValue);
86
- if ($text == 'NN_Reference3'):
87
- list($referenceTxt, $value) = explode('&', $value);
88
- str_replace('&', '', $referenceTxt);
89
- echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
90
- else:
91
- echo $this->__($text) . ' : '. $value . '</br>';
92
- endif;
93
- endforeach;
94
  endif;
95
- endif;
96
- ?>
97
- <?php
98
- if (strlen($this->getAdditionalData('NnComments'))):
99
- echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
100
- endif;
101
- ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
102
  <?php endif; ?>
103
  <?php else: ?>
104
  <?php echo $this->__('Error in getting payment method') ?>
105
  <?php endif; ?>
106
-
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): ?>
37
  <?php
38
  if ($this->getAdditionalData('NnTestOrder'))
39
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
40
+ ?>
41
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
42
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
43
+ <?php if ($nextCycleDate) echo '<br>' . $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br>' ?>
44
+ <?php if ($this->getAdditionalData('captureTid')) echo '<br>' . $this->__('The transaction has been confirmed on %s', $captureTime) . '<br>' ?>
45
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo '<br>' . $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br>' ?>
46
+ <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('The transaction has been canceled on %s', $currentTime) . '<br>' ?>
 
 
 
 
 
 
 
 
 
 
 
47
  <?php
48
+ if ($this->getAdditionalData('refunded_tid')):
49
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
50
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
51
+ endforeach;
 
 
 
 
 
 
 
52
  endif;
53
  ?>
54
+ <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl) || $recurringOrder): ?>
55
+ <?php
56
+ if (strlen($this->getAdditionalData('NnNote'))):
57
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
58
+ echo '<br>' . ($this->getAdditionalData('NnNote'));
59
+ else:
60
+ $note = explode('|', $this->getAdditionalData('NnNote'));
61
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b>';
62
+ foreach ($note as $noteValue):
63
+ list($text, $value) = explode(':', $noteValue);
64
+ echo '<br>' . $this->__($text) . ' : ' . $value;
65
+ endforeach;
66
+ endif;
 
 
 
 
 
 
 
 
 
 
67
  endif;
68
+ ?>
69
+ <?php
70
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
71
+ list ($text, $value) = explode(':', $this->getAdditionalData('NnNoteAmount'));
72
+ echo '<br>' . $this->__($text) . ' : ' . $value;
73
+ endif;
74
+ ?>
75
+ <?php
76
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
77
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
78
+ echo '<br>' . ($this->getAdditionalData('NnNoteTID'));
79
+ else:
80
+ $note = explode('|', $this->getAdditionalData('NnNoteTID'));
81
+ echo "<br />";
82
+ foreach ($note as $noteValue):
83
+ list($text, $value) = explode(':', $noteValue);
84
+ if (preg_match("/Order No&/i", $value)):
85
+ list($referenceTxt, $value) = explode('&', $value);
86
+ str_replace('&', '', $referenceTxt);
87
+ echo '<br>' . $this->__($text) . ' : ' . '<b>' . $this->__($referenceTxt) . ' ' . $value . '</b>';
88
+ else:
89
+ if ($text == 'NN_Reference_desc1' || $text == 'NN_Reference_desc2'):
90
+ echo '<br><b>' . $this->__($text) . '</b>';
91
+ else:
92
+ echo '<br>' . $this->__($text) . ' : ' . $value;
93
+ endif;
94
+ endif;
95
+ endforeach;
96
+ endif;
97
+ endif;
98
+ ?>
99
+ <?php
100
+ if (strlen($this->getAdditionalData('NnComments'))):
101
+ echo '<br>' . ($this->getAdditionalData('NnComments'));
102
+ endif;
103
+ ?>
104
  <?php endif; ?>
105
  <?php else: ?>
106
  <?php echo $this->__('Error in getting payment method') ?>
107
  <?php endif; ?>
 
app/design/frontend/default/default/template/novalnet/payment/method/info/Paypal.phtml CHANGED
@@ -28,25 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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 if ($this->getAdditionalData('refunded_tid')):
40
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
41
- if ($this->getAdditionalData('fullRefund') == true):
42
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
43
- else:
44
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
45
- endif;
 
46
  endforeach;
47
- endif;
48
- ?>
49
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
50
  <?php else: ?>
51
  <?php echo $this->__('Error in getting payment method') ?>
52
  <?php endif; ?>
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/Prepayment.phtml CHANGED
@@ -31,76 +31,77 @@ $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
37
  if ($this->getAdditionalData('NnTestOrder'))
38
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
39
- ?>
40
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
41
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
42
- <?php if ($nextCycleDate) echo '<br>' . $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br><br>' ?>
43
- <?php if ($this->getAdditionalData('captureTid')) echo '<br>' . $this->__('The transaction has been confirmed on %s', $captureTime) . '<br><br>' ?>
44
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
45
- <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('The transaction has been canceled on ') . $currentTime . '<br>' ?>
46
- <?php if ($this->getAdditionalData('refunded_tid')):
47
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
48
- if ($this->getAdditionalData('fullRefund') == true):
49
- echo '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
50
- else:
51
- echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
52
- endif;
53
- endforeach;
54
- endif;
55
- ?>
56
- <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl)): ?>
57
  <?php
58
- if (strlen($this->getAdditionalData('NnNote'))):
59
- if (strstr($this->getAdditionalData('NnNote'), 'br')):
60
- echo nl2br($this->getAdditionalData('NnNote'));
61
- else:
62
- $note = explode('|',$this->getAdditionalData('NnNote'));
63
- echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
64
- foreach($note as $noteValue):
65
- list($text, $value) = explode(':', $noteValue);
66
- echo $this->__($text) . ' : '. $value . '</br>';
67
- endforeach;
68
- endif;
69
  endif;
70
  ?>
71
- <?php
72
- if (strlen($this->getAdditionalData('NnNoteAmount'))):
73
- list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
74
- echo $this->__($text) . ' : '. $value;
75
- endif;
76
- ?>
77
- <?php
78
- if (strlen($this->getAdditionalData('NnNoteTID'))):
79
- if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
80
- echo nl2br($this->getAdditionalData('NnNoteTID'));
81
- else:
82
- $note = explode('|',$this->getAdditionalData('NnNoteTID'));
83
- echo "<br />";
84
- foreach($note as $noteValue):
85
- list($text, $value) = explode(':', $noteValue);
86
- if ($text == 'NN_Reference3'):
87
- list($referenceTxt, $value) = explode('&', $value);
88
- str_replace('&', '', $referenceTxt);
89
- echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
90
- else:
91
- echo $this->__($text) . ' : '. $value . '</br>';
92
- endif;
93
- endforeach;
94
  endif;
95
- endif;
96
- ?>
97
- <?php
98
- if (strlen($this->getAdditionalData('NnComments'))):
99
- echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
100
- endif;
101
- ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
102
  <?php endif; ?>
103
  <?php else: ?>
104
  <?php echo $this->__('Error in getting payment method') ?>
105
  <?php endif; ?>
106
-
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): ?>
37
  <?php
38
  if ($this->getAdditionalData('NnTestOrder'))
39
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
40
+ ?>
41
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
42
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
43
+ <?php if ($nextCycleDate) echo '<br>' . $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br>' ?>
44
+ <?php if ($this->getAdditionalData('captureTid')) echo '<br>' . $this->__('The transaction has been confirmed on %s', $captureTime) . '<br>' ?>
45
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo '<br>' . $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br>' ?>
46
+ <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('The transaction has been canceled on %s', $currentTime) . '<br>' ?>
 
 
 
 
 
 
 
 
 
 
 
47
  <?php
48
+ if ($this->getAdditionalData('refunded_tid')):
49
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
50
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
51
+ endforeach;
 
 
 
 
 
 
 
52
  endif;
53
  ?>
54
+ <?php if (!preg_match("/invoice|creditmemo|shipment|callback_novalnet2magento/i", $currentUrl) || $recurringOrder): ?>
55
+ <?php
56
+ if (strlen($this->getAdditionalData('NnNote'))):
57
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
58
+ echo '<br>' . ($this->getAdditionalData('NnNote'));
59
+ else:
60
+ $note = explode('|', $this->getAdditionalData('NnNote'));
61
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b>';
62
+ foreach ($note as $noteValue):
63
+ list($text, $value) = explode(':', $noteValue);
64
+ echo '<br>' . $this->__($text) . ' : ' . $value;
65
+ endforeach;
66
+ endif;
 
 
 
 
 
 
 
 
 
 
67
  endif;
68
+ ?>
69
+ <?php
70
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
71
+ list ($text, $value) = explode(':', $this->getAdditionalData('NnNoteAmount'));
72
+ echo '<br>' . $this->__($text) . ' : ' . $value;
73
+ endif;
74
+ ?>
75
+ <?php
76
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
77
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
78
+ echo '<br>' . ($this->getAdditionalData('NnNoteTID'));
79
+ else:
80
+ $note = explode('|', $this->getAdditionalData('NnNoteTID'));
81
+ echo "<br />";
82
+ foreach ($note as $noteValue):
83
+ list($text, $value) = explode(':', $noteValue);
84
+ if (preg_match("/Order No&/i", $value)):
85
+ list($referenceTxt, $value) = explode('&', $value);
86
+ str_replace('&', '', $referenceTxt);
87
+ echo '<br>' . $this->__($text) . ' : ' . '<b>' . $this->__($referenceTxt) . ' ' . $value . '</b>';
88
+ else:
89
+ if ($text == 'NN_Reference_desc1' || $text == 'NN_Reference_desc2'):
90
+ echo '<br><b>' . $this->__($text) . '</b>';
91
+ else:
92
+ echo '<br>' . $this->__($text) . ' : ' . $value;
93
+ endif;
94
+ endif;
95
+ endforeach;
96
+ endif;
97
+ endif;
98
+ ?>
99
+ <?php
100
+ if (strlen($this->getAdditionalData('NnComments'))):
101
+ echo '<br>' . ($this->getAdditionalData('NnComments'));
102
+ endif;
103
+ ?>
104
  <?php endif; ?>
105
  <?php else: ?>
106
  <?php echo $this->__('Error in getting payment method') ?>
107
  <?php endif; ?>
 
app/design/frontend/default/default/template/novalnet/payment/method/info/Sepa.phtml CHANGED
@@ -31,30 +31,25 @@ $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
- ?>
35
- <?php
36
- if ($this->getAdditionalData('NnTestOrder'))
37
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
38
  ?>
39
- <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
40
- <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
41
- <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>
42
- <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>
43
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
44
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
45
- <?php if ($this->getAdditionalData('refunded_tid')):
46
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
47
- if ($this->getAdditionalData('fullRefund') == true):
48
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
49
- elseif(preg_match("/refund/i", $value['reftid'])):
50
- echo $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br><br>';
51
- else:
52
- echo $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('refund amount %s', $value['refamount']) . ', ' . $this->__('New Tid: %s', $value['reftid']) . ' ' . $this->__('for the balance amount.') . '<br><br>';
53
- endif;
54
  endforeach;
55
- endif;
56
- ?>
57
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
58
  <?php else: ?>
59
  <?php echo $this->__('Error in getting payment method') ?>
60
  <?php endif; ?>
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
 
 
 
 
34
  ?>
35
+ <?php
36
+ if ($this->getAdditionalData('NnTestOrder'))
37
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
38
+ ?>
39
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
40
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
41
+ <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>
42
+ <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>
43
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
44
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
45
+ <?php
46
+ if ($this->getAdditionalData('refunded_tid')):
47
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
48
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
 
49
  endforeach;
50
+ endif;
51
+ ?>
52
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
53
  <?php else: ?>
54
  <?php echo $this->__('Error in getting payment method') ?>
55
  <?php endif; ?>
app/design/frontend/default/default/template/novalnet/sales/recurring/profile/view.phtml DELETED
@@ -1,149 +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
- ?>
27
- <?php /* @var $this Mage_Sales_Block_Recurring_Profile_View */ ?>
28
-
29
- <div class="order-page">
30
-
31
- <!-- title 'n' actions -->
32
- <div class="page-title title-buttons">
33
- <h1><?php echo $this->__('Recurring Profile # %s', $this->escapeHtml($this->getReferenceId())) ?></h1>
34
- <div id="recurring_buttons_view">
35
- <?php if ($this->getCanCancel()): ?>
36
- <button style="position: static;" type="button" title="<?php echo $this->__('Cancel') ?>" class="button" onclick="cancelviewstatus('recurring_buttons_view', 'recurring_cancel_button_view')"><span><span><?php echo $this->__('Cancel') ?></span></span></button>
37
- <?php endif; ?>
38
- <?php
39
- if ($this->getCanSuspend() && $this->_profile->getState() != 'pending'):
40
- ?>
41
- <button style="position: static;" type="button" title="<?php echo $this->__('Suspend') ?>" class="button" onclick="if (confirm('<?php echo $this->getConfirmationMessage() ?>')) {
42
- window.location.href = '<?php echo $this->getSuspendUrl() ?>';
43
- }
44
- return false;"><span><span><?php echo $this->__('Suspend') ?></span></span></button>
45
- <?php endif; ?>
46
- <?php
47
- if ($this->getCanActivate() && $this->_profile->getState() != 'pending'):
48
- ?>
49
- <button style="position: static;" type="button" title="<?php echo $this->__('Activate') ?>" class="button" onclick="if (confirm('<?php echo $this->getConfirmationMessage() ?>')) {
50
- window.location.href = '<?php echo $this->getActivateUrl() ?>';
51
- }
52
- return false;"><span><span><?php echo $this->__('Activate') ?></span></span></button>
53
- <?php endif; ?>
54
- </div>
55
-
56
- <div id="recurring_cancel_button_view" style="display:none;">
57
- <?php if ($this->getCanCancel()): ?>
58
- <?php echo $this->getCancelReason(); ?>
59
- <button type="button" title="<?php echo $this->__('Cancel') ?>" class="button" onclick="cancel_action('<?php echo $this->getConfirmationMessage() ?>', '<?php echo $this->getCancelUrl() ?>','<?php echo $this->__('Please select the reason of subscription cancellation'); ?>');"><span><span><?php echo $this->__('Cancel') ?></span></span></button>
60
- <?php endif; ?>
61
- </div>
62
- </div>
63
-
64
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
65
-
66
- <!-- info tabs -->
67
- <?php $infoTabs = $this->getChildGroup('info_tabs'); ?>
68
-
69
- <dl class="order-info">
70
- <dt><?php echo $this->__('About This Profile:') ?></dt>
71
- <dd>
72
- <ul id="order-info-tabs">
73
- <?php foreach ($infoTabs as $block): ?>
74
- <?php if ($this->getObjectData($block, 'is_view_current')): ?>
75
- <li class="current"><strong><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></strong></li>
76
- <?php else: ?>
77
- <li><a href="<?php echo $this->escapeHtml($this->getObjectData($block, 'view_url')) ?>"><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></a></li>
78
- <?php endif; ?>
79
- <?php endforeach; ?>
80
- </ul>
81
- </dd>
82
- </dl>
83
-
84
- <!-- info blocks in 2 columns -->
85
- <?php for ($i = 1; $i <= 5; $i++): ?>
86
- <?php $infoBlocks = $this->getChildGroup("info_blocks_row_{$i}"); ?>
87
- <?php if ($infoBlocks): ?>
88
- <div class="col2-set order-info-box">
89
- <?php for ($j = 1; $j <= 2; $j++): ?>
90
- <?php foreach ($infoBlocks as $alias => $block): ?>
91
- <?php if ($j == $this->getObjectData($block, 'view_column')): ?>
92
- <div class="col-<?php echo $j ?>">
93
- <div>
94
- <div class="box-title">
95
- <h2><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></h2>
96
- </div>
97
- <div class="box-content">
98
- <?php
99
- $html = $this->getChildHtml($alias)
100
- ?>
101
- <?php
102
- echo ($html ? $html : $this->__('No information available.'));
103
- ?>
104
- </div>
105
- </div>
106
- </div>
107
- <?php endif; ?>
108
- <?php endforeach; ?>
109
- <?php endfor; ?>
110
- </div>
111
- <?php endif; ?>
112
- <?php endfor; ?>
113
-
114
- <!-- table data block -->
115
- <?php $table = $this->getChild('table') ?>
116
- <?php if ($table): ?>
117
- <div>
118
- <h2 class="table-caption"><?php echo $this->escapeHtml($this->getObjectData($table, 'view_label')) ?></h2>
119
- <?php echo $this->getChildHtml('table') ?>
120
- </div>
121
- <?php endif; ?>
122
-
123
- <div class="buttons-set">
124
- <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Recurring Profiles') ?></a></p>
125
- </div>
126
- </div>
127
- <script type="text/javascript">
128
- function cancelviewstatus(current_id, change_id)
129
- {
130
- document.getElementById(current_id).style.display = 'none';
131
- document.getElementById(change_id).style.display = 'block';
132
- }
133
-
134
- function cancel_action(message, url, cancelReason)
135
- {
136
- var reason = parseInt(document.getElementById('reason-subscribe').value);
137
- var resontext = document.getElementById('reason-subscribe');
138
- var resontextval = resontext.options[resontext.selectedIndex].innerHTML;
139
-
140
- if (reason) {
141
- if (confirm(message)) {
142
- window.location.href = url + "?reason=" + resontextval;
143
- }
144
- } else {
145
- alert(cancelReason);
146
- }
147
- return false;
148
- }
149
- </script>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Banktransfer.phtml CHANGED
@@ -23,10 +23,10 @@
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
- <fieldset class="form-list">
30
  <!--{{{ Payment Logo -->
31
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
@@ -38,23 +38,24 @@ $helper = Mage::helper('novalnet_payment');
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
- <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
42
- <!--{{{ Payment Description -->
 
 
 
 
 
 
43
  <li>
44
- <?php echo $this->__('redirect payment description') ?>
45
  </li>
46
- <?php if ($this->getUserInfo()): ?>
47
- <li>
48
- <?php echo $this->getUserInfo() ?>
49
- </li>
50
- <?php endif; ?>
51
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
52
- <li>
53
- <div style="font-weight:bold;color:red;font-size:12px;">
54
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
55
- </div>
56
- </li>
57
- <?php endif ?>
58
- <!--{{{ Payment Description -->
59
- </ul>
60
- </fieldset>
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
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
+ <!--{{{ Payment Description -->
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()): ?>
49
  <li>
50
+ <?php echo $this->getUserInfo() ?>
51
  </li>
52
+ <?php endif; ?>
53
+ <?php if ($this->getMethod()->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
+ <!--{{{ Payment Description -->
61
+ </ul>
 
 
 
 
 
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Cc.phtml CHANGED
@@ -28,13 +28,18 @@ $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()->_getConfigData('auto_refill', true);
32
  // get quote billing address
33
- $billingaddress = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
 
34
  $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
35
- ? $billingaddress->getTelephone() : '' ;
 
 
 
 
36
  ?>
37
- <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
38
  <!--{{{ Payment Logo -->
39
  <div>
40
  <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;float:none;">
@@ -46,148 +51,121 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
46
  </div>
47
  <!--}}} Payment Logo -->
48
  <!--{{{ Novalnet Cc Form -->
49
-
50
- <ul id="payment_form_<?php echo $code ?>" style="display:none;">
51
- <div class="nnccloader" id='cc_loading' style='display:none;'></div>
 
 
 
 
 
 
 
52
  <li>
53
- <?php echo $this->__('The amount will be debited from your credit card once the order is submitted'); ?>
54
  </li>
55
- <?php if ($this->getUserInfo()): ?>
56
- <li>
57
- <?php echo $this->getUserInfo() ?>
58
- </li>
59
- <?php endif ?>
60
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('live_mode', true) == 0): ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
61
  <li>
62
- <div style="font-weight:bold;color:red;font-size:12px;">
63
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
 
 
 
 
 
 
 
64
  </div>
65
  </li>
66
- <?php endif ?>
67
- <li class="fields">
68
- <div class="field">
69
- <label style="float:none;" for="<?php echo $code ?>_cc_type"><?php echo $this->__('NN CC type') ?><span class="required"></span></label><br />
70
- <div class="input-box">
71
- <select id="<?php echo $code ?>_cc_type" onchange="cchashcall()" class="required-entry validate-cc-type-select">
72
- <option value=""><?php echo $this->__('NN Select') ?></option>
73
- <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
74
- <option value="<?php echo $_typeCode ?>"><?php echo $_typeName ?></option>
75
- <?php endforeach; ?>
76
- </select>
77
  </div>
78
- </div>
79
- </li>
80
- <li class="fields">
81
- <div class="field">
82
- <label style="float:none;" for="<?php echo $code ?>_cc_owner"><?php echo $this->__('NN CC holder') ?><span class="required"></span></label><br/>
83
- <div class="input-box">
84
- <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_cc_owner" autocomplete="off" onchange="cchashcall()" value="<?php echo $billingaddress->getFirstname() . ' ' . $billingaddress->getLastname(); ?>" /></div>
85
- </div>
86
- </li>
87
- <li class="fields">
88
- <div class="field">
89
- <label style="float:none;" for="<?php echo $code ?>_cc_number"><?php echo $this->__('NN CC number') ?><span class="required"></span></label><br/>
90
  <div class="input-box">
91
- <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="" />
 
 
92
  </div>
93
- </div>
94
- </li>
95
- <li class="fields">
96
- <div class="field">
97
- <label style="float:none;" for="<?php echo $code ?>_expiration"><?php echo $this->__('NN Expiration Date') ?><span class="required"></span></label><br />
 
98
  <div class="input-box">
99
- <div class="v-fix">
100
- <select id="<?php echo $code ?>_expiration" style="width:140px;" onchange="cchashcall()" class="required-entry">
101
- <option value=""><?php echo $this->__('Month'); ?></option>
102
- <?php foreach ($this->getCcMonths() as $k => $v): ?>
103
- <option value="<?php echo $k ?>"><?php echo $v ?></option>
104
- <?php endforeach; ?>
105
- </select>
106
- </div>
107
- <div class="v-fix" style="padding-left:5px;">
108
- <select id="<?php echo $code ?>_expiration_yr" style="width:103px;" onchange="cchashcall()" class="required-entry">
109
- <option value=""><?php echo $this->__('Year'); ?></option>
110
- <?php foreach ($this->getCcYears() as $k => $v): ?>
111
- <option value="<?php echo $k ?>"><?php echo $v ?></option>
112
- <?php endforeach; ?>
113
- </select>
114
- </div>
115
  </div>
116
- </div>
117
- </li>
118
- <li class="fields">
119
- <div class="field">
120
- <label style="float:none;" for="<?php echo $code ?>_cc_cid"><?php echo $this->__('NN CVC') ?><span class="required"></span></label><br />
121
- <div class="input-box">
122
- <div class="v-fix"><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:4em;" autocomplete="off" /></div>
123
- &nbsp;
124
- <a href="#"><img src='<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>cvc_hint.png' border="0" style="margin-top:-15px;" alt="CCV/CVC?" id="nn_cc_hint"></a>
125
- <img src="<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>creditcard_cvc.jpg" style="display:none;float:left;" border="0" id="nn_cvc_hover"/>
126
- </div>
127
- </div>
128
- </li>
129
- <!--{{{ CallbackType-->
130
- <?php if (!$creditCardSecure && $this->isCallbackTypeCall()): ?>
131
- <!--{{{ PIN by Callback-->
132
- <?php
133
- if ($this->getCallbackConfigData() != 3):
134
- ?>
135
- <li>
136
- <div class="input-box">
137
- <label style="float:none;" for="<?php echo $code ?>_callback_tel">
138
- <?php
139
- if ($this->getCallbackConfigData() == 2):
140
- ?>
141
- <?php echo $this->__('Mobile phone number'); ?>
142
- <?php else: ?>
143
- <?php echo $this->__('NN Mobile Number'); ?>
144
- <?php endif; ?>
145
- <span class="required"></span></label><br/>
146
- <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
147
- echo $telephoneNumber; ?>"/>
148
- </div>
149
- </li>
150
- <li>
151
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
152
- <?php echo $this->__('Note for pin by sms and callback') ?>
153
- </div>
154
- <div class="input-box">
155
- <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required"></span></label><br/>
156
- <input onchange="document.getElementById('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/>
157
- <input id="new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
158
- <label style="float:none;" for="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
164
- elseif ($this->getCallbackConfigData() == 3):
165
- ?>
166
- <li>
167
- <div class="input-box">
168
- <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required"></span></label><br/>
169
- <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
170
- echo $billingaddress->getEmail(); ?>"/>
171
- </div>
172
- </li>
173
- <?php endif ?>
174
- <!--}}} Reply by Email-->
175
  <?php endif ?>
176
- <!--}}} CallbackType-->
177
- </ul>
178
-
179
- <input type="hidden" id="original_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>" />
180
- <input type="hidden" id="original_vendor_authcode" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>" />
181
- <input type="hidden" id="novalnet_cc_pan_hash" value="<?php
182
- echo $ccRefill ? $assignDatahelper->getCheckout()->getCcPanHash() : '';
183
- ?>" />
184
  <input type="hidden" name="novalnet_cc_hash" id="novalnet_cc_hash" value="" />
185
- <input type="hidden" name="novalnet_cc_unique_id" id="novalnet_cc_unique_id" value="<?php echo $ccRefill ? $assignDatahelper->getCheckout()->getCcUniqueId() : '';
186
- ?>" />
187
  <input type="hidden" id="nn_cc_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
188
  <input type="hidden" id="nn_cc_validate_error_message" value="<?php echo $this->__('Your credit card details are invalid') . '!'; ?>" />
189
  <!--}}} Novalnet Cc Form -->
190
- </fieldset>
191
  <style>
192
  .nnccloader {
193
  position: fixed;
@@ -198,12 +176,14 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
198
  z-index: 9999;
199
  background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
200
  }
 
 
 
 
 
 
 
 
 
 
201
  </style>
202
- <script type="text/javascript">
203
- jQuery('#nn_cc_hint').hover(function(){
204
- jQuery('#nn_cvc_hover').show();
205
- });
206
- jQuery('#nn_cc_hint').mouseleave(function(){
207
- jQuery('#nn_cvc_hover').hide();
208
- });
209
- </script>
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;">
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()): ?>
64
  <li>
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;
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>
 
 
 
 
 
 
 
 
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Eps.phtml CHANGED
@@ -23,10 +23,10 @@
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
- <fieldset class="form-list">
30
  <!--{{{ Payment Logo -->
31
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
@@ -38,23 +38,24 @@ $helper = Mage::helper('novalnet_payment');
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
- <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
42
- <!--{{{ Payment Description -->
 
 
 
 
 
 
43
  <li>
44
- <?php echo $this->__('redirect payment description') ?>
45
  </li>
46
- <?php if ($this->getUserInfo()): ?>
47
- <li>
48
- <?php echo $this->getUserInfo() ?>
49
- </li>
50
- <?php endif; ?>
51
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
52
- <li>
53
- <div style="font-weight:bold;color:red;font-size:12px;">
54
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
55
- </div>
56
- </li>
57
- <?php endif ?>
58
- <!--}}} Payment Description -->
59
- </ul>
60
- </fieldset>
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
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
+ <!--{{{ Payment Description -->
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()): ?>
49
  <li>
50
+ <?php echo $this->getUserInfo() ?>
51
  </li>
52
+ <?php endif; ?>
53
+ <?php if ($this->getMethod()->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
+ <!--}}} Payment Description -->
61
+ </ul>
 
 
 
 
 
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Ideal.phtml CHANGED
@@ -23,10 +23,10 @@
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
- <fieldset class="form-list">
30
  <!--{{{ Payment Logo -->
31
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
@@ -38,23 +38,24 @@ $helper = Mage::helper('novalnet_payment');
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
- <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
42
- <!--{{{ Payment Description -->
 
 
 
 
 
 
43
  <li>
44
- <?php echo $this->__('redirect payment description') ?>
45
  </li>
46
- <?php if ($this->getUserInfo()): ?>
47
- <li>
48
- <?php echo $this->getUserInfo() ?>
49
- </li>
50
- <?php endif; ?>
51
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
52
- <li>
53
- <div style="font-weight:bold;color:red;font-size:12px;">
54
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
55
- </div>
56
- </li>
57
- <?php endif ?>
58
- <!--{{{ Payment Description -->
59
- </ul>
60
- </fieldset>
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
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
+ <!--{{{ Payment Description -->
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()): ?>
49
  <li>
50
+ <?php echo $this->getUserInfo() ?>
51
  </li>
52
+ <?php endif; ?>
53
+ <?php if ($this->getMethod()->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
+ <!--{{{ Payment Description -->
61
+ </ul>
 
 
 
 
 
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Invoice.phtml CHANGED
@@ -27,9 +27,9 @@ $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
  $billingaddress = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
29
  $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
30
- ? $billingaddress->getTelephone() : '' ;
31
  ?>
32
- <fieldset class="form-list">
33
  <!-- PAYMENT LOGO -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
@@ -38,65 +38,74 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
38
  </a>
39
  </div>
40
  <!-- PAYMENT LOGO -->
41
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
42
- <!--{{{ PAYMENT DESCRIPTION -->
 
 
 
43
  <li>
44
- <?php echo $this->__('Invoice/Prepayment payment description') ?>
45
  </li>
46
- <?php if ($this->getUserInfo()): ?>
 
 
 
 
 
 
 
 
 
 
 
 
47
  <li>
48
- <?php echo $this->getUserInfo() ?>
 
 
 
 
 
 
 
 
 
 
49
  </li>
50
- <?php endif ?>
51
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
52
  <li>
53
- <div style="font-weight:bold;color:red;font-size:12px;">
54
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
55
  </div>
56
  </li>
57
  <?php endif ?>
58
- <!--}}} PAYMENT DESCRIPTION -->
59
- <!--{{{ CallbackType-->
60
- <?php if ($this->isCallbackTypeCall()): ?>
61
- <!--{{{ PIN by Callback-->
62
- <?php if ($this->getCallbackConfigData() != 3): ?>
63
- <li>
64
- <div class="input-box">
65
- <label style="float:none;" for="<?php echo $code ?>_callback_tel">
66
- <?php
67
- if ($this->getCallbackConfigData() == 2):
68
- ?>
69
- <?php echo $this->__('Mobile phone number'); ?>
70
- <?php else: ?>
71
- <?php echo $this->__('NN Mobile Number'); ?>
72
- <?php endif; ?>
73
- <span class="required"></span></label><br/>
74
- <input type="text" value="<?php echo $telephoneNumber; ?>" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" />
75
- </div>
76
- </li>
77
- <li>
78
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
79
- <?php echo $this->__('Note for pin by sms and callback') ?>
80
- </div>
81
- <div class="input-box">
82
- <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required"></span></label><br/>
83
- <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/>
84
- <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
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
- <!--{{{ Reply by Email-->
90
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
91
- <li>
92
- <div class="input-box">
93
- <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required"></span></label><br/>
94
- <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" />
95
- </div>
96
- </li>
97
- <?php endif ?>
98
- <!--}}} Reply by Email-->
99
- <?php endif ?>
100
- <!--}}} CallbackType-->
101
- </ul>
102
- </fieldset>
27
  $helper = Mage::helper('novalnet_payment');
28
  $billingaddress = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
29
  $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
30
+ ? $billingaddress->getTelephone() : '' ;
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;">
38
  </a>
39
  </div>
40
  <!-- PAYMENT LOGO -->
41
+ <!--{{{ PAYMENT DESCRIPTION -->
42
+ <li>
43
+ <?php echo $this->__('Invoice/Prepayment payment description') ?>
44
+ </li>
45
+ <?php if ($this->getUserInfo()): ?>
46
  <li>
47
+ <?php echo $this->getUserInfo() ?>
48
  </li>
49
+ <?php endif ?>
50
+ <?php if ($this->getMethod()->getNovalnetConfig('live_mode', true) == 0): ?>
51
+ <li>
52
+ <div style="font-weight:bold;color:red;font-size:12px;">
53
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
54
+ </div>
55
+ </li>
56
+ <?php endif ?>
57
+ <!--}}} PAYMENT DESCRIPTION -->
58
+ <!--{{{ CallbackType-->
59
+ <?php if ($this->isCallbackTypeCall()): ?>
60
+ <!--{{{ PIN by Callback-->
61
+ <?php if ($this->getCallbackConfigData() != 3): ?>
62
  <li>
63
+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
64
+ <label for="<?php echo $code ?>_callback_tel" class="required"><em>*</em>
65
+ <?php if ($this->getCallbackConfigData() == 2): ?>
66
+ <?php echo $this->__('Mobile phone number'); ?>
67
+ <?php else: ?>
68
+ <?php echo $this->__('NN Mobile Number'); ?>
69
+ <?php endif; ?>
70
+ </label>
71
+ <div class="input-box">
72
+ <input type="text" value="<?php echo $telephoneNumber; ?>" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" />
73
+ </div>
74
  </li>
 
 
75
  <li>
76
+ <div class="nncallbacknote">
77
+ <?php echo $this->__('Note for pin by sms and callback') ?>
78
+ </div>
79
+ <label for="<?php echo $code ?>_callback_pin" class="required"><em>*</em><?php echo $this->__('PIN') ?></label>
80
+ <div class="input-box">
81
+ <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/>
82
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
83
+ <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
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>
100
+ <style>
101
+ .nncallbacknote {
102
+ font-weight:bold;
103
+ font-size:11px;
104
+ color:gray;
105
+ border:1px solid #BFBFBF;
106
+ background:#FEFFBF;
107
+ padding:10px;
108
+ margin-top:10px;
109
+ width:400px;
110
+ }
111
+ </style>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Paypal.phtml CHANGED
@@ -23,10 +23,10 @@
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
- <fieldset class="form-list">
30
  <!--{{{ Payment Logo -->
31
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
@@ -38,23 +38,25 @@ $helper = Mage::helper('novalnet_payment');
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
- <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
42
- <!--{{{ Payment Description -->
 
 
 
 
 
 
43
  <li>
44
- <?php echo $this->__('redirect payment description') ?>
45
  </li>
46
- <?php if ($this->getUserInfo()): ?>
47
- <li>
48
- <?php echo $this->getUserInfo() ?>
49
- </li>
50
- <?php endif; ?>
51
- <?php if ($this->getMethod()->_getConfigData('live_mode', true) == 0): ?>
52
- <li>
53
- <div style="font-weight:bold;color:red;font-size:12px;">
54
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
55
- </div>
56
- </li>
57
- <?php endif ?>
58
- <!--{{{ Payment Description -->
59
- </ul>
60
- </fieldset>
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
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
38
  </a>
39
  </div>
40
  <!--}}} Payment Logo -->
41
+ <!--{{{ Payment Description -->
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()): ?>
49
  <li>
50
+ <?php echo $this->getUserInfo() ?>
51
  </li>
52
+ <?php endif; ?>
53
+ <?php if ($this->getMethod()->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
+ <!--{{{ Payment Description -->
61
+ </ul>
62
+
 
 
 
 
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Prepayment.phtml CHANGED
@@ -26,7 +26,7 @@
26
  $code = $this->getMethodCode();
27
  $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;">
@@ -35,23 +35,21 @@ $helper = Mage::helper('novalnet_payment');
35
  </a>
36
  </div>
37
  <!-- PAYMENT LOGO -->
38
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
39
- <!--{{{ PAYMENT DESCRIPTION -->
 
 
 
40
  <li>
41
- <?php echo $this->__('Invoice/Prepayment payment description') ?>
42
  </li>
43
- <?php if ($this->getUserInfo()): ?>
44
- <li>
45
- <?php echo $this->getUserInfo() ?>
46
- </li>
47
- <?php endif ?>
48
- <?php if ($this->getLiveMode() == 0): ?>
49
- <li>
50
- <div style="font-weight:bold;color:red;font-size:12px;">
51
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
52
- </div>
53
- </li>
54
- <?php endif ?>
55
- <!--}}} PAYMENT DESCRIPTION -->
56
- </ul>
57
- </fieldset>
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
  <div>
32
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
35
  </a>
36
  </div>
37
  <!-- PAYMENT LOGO -->
38
+ <!--{{{ PAYMENT DESCRIPTION -->
39
+ <li>
40
+ <?php echo $this->__('Invoice/Prepayment payment description') ?>
41
+ </li>
42
+ <?php if ($this->getUserInfo()): ?>
43
  <li>
44
+ <?php echo $this->getUserInfo() ?>
45
  </li>
46
+ <?php endif ?>
47
+ <?php if ($this->getLiveMode() == 0): ?>
48
+ <li>
49
+ <div style="font-weight:bold;color:red;font-size:12px;">
50
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
51
+ </div>
52
+ </li>
53
+ <?php endif ?>
54
+ <!--}}} PAYMENT DESCRIPTION -->
55
+ </ul>
 
 
 
 
 
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Sepa.phtml CHANGED
@@ -26,12 +26,13 @@
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
  $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
- $sepaRefill = $this->getMethod()->_getConfigData('auto_refill', true);
30
  $sepaPaymentRefill = $this->getMethod()->getConfigData('sepa_payment_refill');
31
  $refillValues = $assignDatahelper->getCheckout()->getRefilldatavalues();
32
- $refillMethod = ($sepaRefill && $refillValues != '' && $code == $refillValues->getMethod());
33
  // get quote billing address
34
- $billingaddress = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
 
35
  $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
36
  ? $billingaddress->getTelephone() : '' ;
37
  $street = $billingaddress->getStreet();
@@ -43,8 +44,12 @@ if ($sepaPaymentRefill && $customerlogin) {
43
  } else if ($sepaRefill) {
44
  $panhash = $assignDatahelper->getCheckout()->getSepaHash();
45
  }
 
 
 
 
46
  ?>
47
- <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
48
  <!--{{{ Payment Logo -->
49
  <div>
50
  <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
@@ -57,231 +62,127 @@ if ($sepaPaymentRefill && $customerlogin) {
57
  </div>
58
  <!--}}} Payment Logo -->
59
  <!--{{{ Novalnet SEPA Form -->
60
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
61
- <div class="nnsepaloader" id='sepa_loading' style='display:none;'></div>
 
 
 
62
  <li>
63
- <?php echo $this->__('Your account will be debited upon the order submission'); ?>
64
  </li>
65
- <?php if ($this->getUserInfo()): ?>
66
- <li>
67
- <?php echo $this->getUserInfo() ?>
68
- </li>
69
- <?php endif ?>
70
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('live_mode', true) == 0): ?>
71
- <li>
72
- <div style="font-weight:bold;color:red;font-size:12px;">
73
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
74
- </div>
75
- </li>
76
- <?php endif ?>
77
-
78
- <li class="fields">
79
- <div class="field">
80
- <label style="float:none;" for="<?php echo $code ?>_account_holder"><?php echo $this->__('Account Holder') ?><span class="required"></span></label><br/>
81
- <div class="input-box">
82
- <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(); ?>" />
83
- </div>
84
  </div>
85
  </li>
86
- <li class="fields">
87
- <div class="field">
88
- <label style="float:none;" for="<?php echo $code ?>_bank_country"><?php echo $this->__('NN Country') ?><span class="required"></span></label><br />
89
- <div class="input-box">
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
90
  <?php
91
- $_countries = Mage::getResourceModel('directory/country_collection')
92
- ->loadData()
93
- ->toOptionArray(false)
94
- ?>
95
- <?php if (count($_countries) > 0): ?>
96
- <select id="<?php echo $code ?>_bank_country" onchange="unsetHashRelatedElements()" class="required-entry">
97
- <?php
98
- foreach ($_countries as $_country):
99
- if (in_array($billingaddress->getCountryId(), $_country)) {
100
- ?>
101
- <option selected value="<?php echo $_country['value'] ?>"><?php echo $_country['label'] ?>
102
- </option>
103
- <?php } else { ?>
104
- <option value="<?php echo $_country['value'] ?>">
105
- <?php echo $_country['label'] ?>
106
- </option>
107
- <?php } ?>
108
- <?php endforeach; ?>
109
- </select><br/>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
110
  <?php endif; ?>
111
- </div>
112
- </div>
113
- </li>
114
- <li class="fields">
115
- <div class="field">
116
- <label style="float:none;" for="<?php echo $code ?>_account_number"><?php echo $this->__('IBAN or Account number') ?><span class="required"></span></label><br/>
117
  <div class="input-box">
118
- <input type="text" id="<?php echo $code ?>_account_number" onkeypress="return ibanbicValidate(event)" onchange="unsetHashRelatedElements();" title="<?php echo $this->__('IBAN or Account number') ?>" class="required-entry input-text" autocomplete="off" value="" />
119
  </div>
120
- </div>
121
- </li>
122
-
123
- <li class="fields">
124
- <div class="field">
125
- <label style="float:none;" for="<?php echo $code ?>_bank_code"><?php echo $this->__('BIC or Bank code') ?><span class="required"></span></label><br/>
126
  <div class="input-box">
127
- <input type="text" id="<?php echo $code ?>_bank_code" title="<?php echo $this->__('BIC or Bank code') ?>" class="input-text" autocomplete="off" onkeypress="return ibanbicValidate(event)" onchange="unsetHashRelatedElements()" value="" />
 
 
128
  </div>
129
- </div>
130
- </li>
131
-
132
- <li class="fields">
133
- <div class="field">
 
134
  <div class="input-box">
135
- <input type="checkbox" id="<?php echo $code ?>_mandate_confirm" title="<?php echo $this->__('confirm') ?>" class="required-entry" onclick="generate_sepa_iban_bic(this, '<?php echo $this->__('Your account details are invalid') ?>', '<?php echo $this->__('Basic parameter not valid') ?>')"/>
136
- <label style="float:none;" ><?php echo $this->__('NN Confirm') ?><span class="required"></span></label><br/>
137
  </div>
138
- </div>
139
- </li>
140
- <!--{{{ CallbackType-->
141
- <?php if ($this->isCallbackTypeCall()): ?>
142
- <!--{{{ PIN by Callback-->
143
- <?php
144
- if ($this->getCallbackConfigData() != 3):
145
- ?>
146
- <li>
147
- <label style="float:none;" for="<?php echo $code ?>_callback_tel">
148
- <div class="input-box">
149
- <?php
150
- if ($this->getCallbackConfigData() == 2):
151
- ?>
152
- <?php echo $this->__('Mobile phone number'); ?>
153
- <?php else: ?>
154
- <?php echo $this->__('NN Mobile Number'); ?>
155
- <?php endif; ?>
156
- <span class="required"></span></label><br/>
157
- <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
158
- echo $telephoneNumber; ?>"/>
159
- </div>
160
- </li>
161
- <li>
162
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
163
- <?php echo $this->__('Note for pin by sms and callback') ?>
164
- </div>
165
- <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required"></span></label><br/>
166
- <div class="input-box">
167
- <input onchange="document.getElementById('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/>
168
- <input id="new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
169
- <label style="float:none;" for="new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
170
- </div>
171
- </li>
172
- <!--}}} PIN by Callback-->
173
- <!--{{{ Reply by Email-->
174
- <?php
175
- elseif ($this->getCallbackConfigData() == 3):
176
- ?>
177
- <li>
178
- <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required"></span></label><br/>
179
- <div class="input-box">
180
- <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
181
- echo $billingaddress->getEmail(); ?>"/>
182
- </div>
183
- </li>
184
- <?php endif ?>
185
- <!--}}} Reply by Email-->
186
  <?php endif ?>
187
- <!--}}} CallbackType-->
188
- <!-- Mandate overlay START-->
189
- <li>
190
- <div class="bgCover">&nbsp;</div>
191
- <div id='sepa_mandate_overlay_block_first' style='display:none;' class='nnsepaloader'>
192
- </div>
193
- <div id='sepa_mandate_overlay_block' style='display:none;' class='overlay_window_block'>
194
- <div class='nn_header'>
195
- <h1><?php echo $this->__('SEPA Direct Debit Mandate Confirmation') ?></h1>
196
- </div>
197
- <div class='body_div' id='overlay_window_block_body' style="height: 400px;">
198
- <p>
199
- <table>
200
- <tr>
201
- <td><?php echo $this->__('Creditor') ?></td><td>:</td><td><span id='sepa_overlay_payee_span'>&nbsp;</span></td>
202
- </tr>
203
- <tr>
204
- <td><?php echo $this->__('Credit Identification Number') ?></td><td>:</td><td><span id='sepa_overlay_creditoridentificationnumber_span'>&nbsp;</span></td>
205
- </tr>
206
- <tr>
207
- <td><?php echo $this->__('Mandate Reference') ?></td><td>:</td><td><span id='sepa_overlay_mandatereference_span'>&nbsp;</span></td>
208
- </tr>
209
- </table><br/>
210
- <?php echo $this->__('SEPA Confirm paragraph') ?>
211
-
212
- <br/> <br/>
213
- <?php echo $this->__('SEPA Confirm note') ?>
214
- <br/> <br/>
215
- <table>
216
- <tr>
217
- <td><?php echo $this->__('Name of the payee') ?></td><td>:</td><td><span id='sepa_overlay_enduserfullname_span'>&nbsp;</span></td>
218
- </tr>
219
- <?php if($billingaddress->getCompany()) { ?>
220
- <tr>
221
- <td><?php echo $this->__('Company name') ?></td><td>:</td><td><?php echo $billingaddress->getCompany(); ?></td>
222
- </tr>
223
- <?php } ?>
224
- <tr>
225
- <td><?php echo $this->__('NN Address') ?></td><td>:</td><td><?php echo $street[0]; ?></td>
226
- </tr>
227
- <?php if(isset($street[1]) && $street[1]) { ?>
228
- <tr>
229
- <td><?php echo $this->__('NN Street') ?></td><td>:</td><td><?php echo $street[1]; ?></td>
230
- </tr>
231
- <?php }?>
232
- <tr>
233
- <td><?php echo $this->__('Zip Code And City') ?></td><td>:</td><td><?php echo $billingaddress->getPostcode(); ?><span id='sepa_overlay_enduserzipcode_span'>&nbsp;</span> <?php echo $billingaddress->getCity(); ?></td>
234
- </tr>
235
- <tr>
236
- <td><?php echo $this->__('Country') ?></td><td>:</td><td><span id='sepa_overlay_endusercountry_span'>&nbsp;</span></td>
237
- </tr>
238
- <?php if($billingaddress->getEmail()) { ?>
239
- <tr>
240
- <td><?php echo $this->__('Email') ?></td><td>:</td><td><?php echo $billingaddress->getEmail(); ?></td>
241
- </tr>
242
- <?php } ?>
243
- <tr id='nn_sepa_overlay_iban_tr'>
244
- <td><?php echo $this->__('IBAN') ?></td><td>:</td><td><span id='sepa_overlay_iban_span'>&nbsp;</span></td>
245
- </tr>
246
- <tr id='nn_sepa_overlay_bic_tr'>
247
- <td><?php echo $this->__('BIC') ?></td><td>:</td><td><span id='sepa_overlay_bic_span'>&nbsp;</span></td>
248
- </tr>
249
-
250
- </table>
251
- <br/>
252
- <?php echo $billingaddress->getCity(); ?>, <span id='sepa_overlay_mandatedate_span'>&nbsp;</span>, <span id='sepa_overlay_enduserfullname_span1'>&nbsp;</span>
253
- </p>
254
- </div>
255
- <div class='nn_footer'>
256
- <input style="width: 30%" type='button' id='mandate_confirm_btn' name='mandate_confirm_btn' onclick="mandate_confirm_btn_submit()" value=<?php echo $this->__('conirm_mandate') ?> class='mandate_confirm_btn' />
257
- <input style="width: 30%" type='button' id='mandate_cancel_btn' name='mandate_cancel_btn' onclick="mandate_cancel_btn_submit()" value=<?php echo $this->__('cancel') ?> class='mandate_confirm_btn' />
258
- <img src='<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>logo.png' width=120 alt='Novalnet AG' style='float:right;' />
259
- </div>
260
- </div>
261
- </li>
262
- <!-- Mandate overlay END-->
263
- </ul>
264
-
265
- <input type="hidden" id="process_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>"/>
266
- <input type="hidden" id="auth_code" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>"/>
267
  <input id="sepaiban" type="hidden" value="">
268
  <input id="sepabic" type="hidden" value="">
269
  <input id="sepa_payment_id" type="hidden" value="37">
270
- <input id="novalnet_sepa_owner" type="hidden" value="">
271
- <input id="result_mandate_date" type="hidden" value="">
272
- <input id="result_mandate_ref" type="hidden" value="">
273
  <input id="result_mandate_unique" type="hidden" value="" name="result_mandate_unique">
274
  <input id="nnsepa_iban_confirmed" type="hidden" value="0" name="nnsepa_iban_confirmed">
275
- <input type="hidden" id="nn_sepa_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
276
- <input type="hidden" id="nn_sepa_validate_error_message" value="<?php echo $this->__('Your account details are invalid') . '!'; ?>" />
277
- <input id="result_sepa_hash" type="hidden" value="<?php
278
- if (($sepaPaymentRefill || $sepaRefill) && $panhash != '') {
279
- echo $panhash;
280
- } else {
281
- $panhash = '';
282
- }
283
- ?>" name="result_sepa_hash">
284
- </fieldset>
285
  <style>
286
  .nnsepaloader {
287
  position: fixed;
@@ -293,81 +194,14 @@ if ($sepaPaymentRefill && $customerlogin) {
293
  background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
294
  }
295
 
296
- .bgCover { background:#878787; position:fixed; left:0; top:0; display:none; overflow:hidden; z-index:1000; }
297
- #sepa_mandate_overlay_block
298
- {
299
- font-size:12px;
300
- color:#555555;
301
- background-color:#fff;
302
- }
303
-
304
- .overlay_window_block {
305
- background-color:#ffffff;
306
- border-radius:5px;
307
- border:1px solid #a1a1a1;
308
- z-index:1000;
309
- }
310
- .overlay_window_block .nn_footer{
311
- bottom:0px;
312
- position:absolute;
313
- height:37px;
314
- width:100%;
315
- }
316
- .overlay_window_block .nn_header{
317
- top:0px;
318
- height:25px;
319
- border-bottom:1px solid #878787;
320
- padding:5px;
321
- }
322
- .overlay_window_block .body_div{
323
- padding:5px;
324
- overflow-y:scroll;
325
- }
326
- .mandate_confirm_btn{
327
- border:1px solid #0080C9;
328
- -webkit-border-radius: 3px;
329
- -moz-border-radius: 3px;
330
- border-radius: 3px;
331
- padding: 6px;
332
- text-decoration:none;
333
- display:inline-block;
334
- text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
335
- font-weight:bold;
336
- color: #FFFFFF;
337
- width:40%;
338
- cursor:pointer;
339
- margin-left:2px;
340
- margin-top:3px;
341
- float:left;
342
- margin-bottom:0px;
343
- background-color: #0080C9; background-image: -webkit-gradient(linear, left top, left bottom, from(#0080C9), to(#0080C9));
344
- background-image: -webkit-linear-gradient(top, #0080C9, #0080C9);
345
- background-image: -moz-linear-gradient(top, #0080C9, #0080C9);
346
- background-image: -ms-linear-gradient(top, #0080C9, #0080C9);
347
- background-image: -o-linear-gradient(top, #0080C9, #0080C9);
348
- background-image: linear-gradient(to bottom, #0080C9, #0080C9);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=#0080C9, endColorstr=#0080C9);
349
- }
350
-
351
- .mandate_confirm_btn:hover{
352
- border:1px solid #878787;
353
- background-color: #878787; background-image: -webkit-gradient(linear, left top, left bottom, from(#878787), to(#878787));
354
- background-image: -webkit-linear-gradient(top, #878787, #878787);
355
- background-image: -moz-linear-gradient(top, #878787, #878787);
356
- background-image: -ms-linear-gradient(top, #878787, #878787);
357
- background-image: -o-linear-gradient(top, #878787, #878787);
358
- background-image: linear-gradient(to bottom, #878787, #878787);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=#878787, endColorstr=#878787);
359
- }
360
-
361
- #sepa_mandate_overlay_block h1
362
- {
363
- color: #00669D;
364
- font-size:14px;
365
- font-weight:bold;
366
- text-transform:none;
367
- margin:0;
368
- }
369
-
370
- table td{
371
- padding : 2px;
372
  }
373
  </style>
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());
33
  // get quote billing address
34
+ $checkoutSession = Mage::getSingleton('checkout/session');
35
+ $billingaddress = $checkoutSession->getQuote()->getBillingAddress();
36
  $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
37
  ? $billingaddress->getTelephone() : '' ;
38
  $street = $billingaddress->getStreet();
44
  } else if ($sepaRefill) {
45
  $panhash = $assignDatahelper->getCheckout()->getSepaHash();
46
  }
47
+
48
+ $panhash = (($sepaPaymentRefill || $sepaRefill) && $panhash) ? $panhash : '';
49
+ $vendorId = $checkoutSession->getNnVendor() ? $checkoutSession->getNnVendor() : trim($this->getMethod()->getNovalnetConfig('merchant_id', true));
50
+ $authCode = $checkoutSession->getNnAuthcode() ? $checkoutSession->getNnAuthcode() : trim($this->getMethod()->getNovalnetConfig('auth_code', true));
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;">
62
  </div>
63
  <!--}}} Payment Logo -->
64
  <!--{{{ Novalnet SEPA Form -->
65
+ <div class="nnsepaloader" id='sepa_loading' style='display:none;'></div>
66
+ <li>
67
+ <?php echo $this->__('Your account will be debited upon the order submission'); ?>
68
+ </li>
69
+ <?php if ($this->getUserInfo()): ?>
70
  <li>
71
+ <?php echo $this->getUserInfo() ?>
72
  </li>
73
+ <?php endif ?>
74
+ <?php if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->getNovalnetConfig('live_mode', true) == 0): ?>
75
+ <li>
76
+ <div style="font-weight:bold;color:red;font-size:12px;">
77
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
78
  </div>
79
  </li>
80
+ <?php endif ?>
81
+
82
+ <li>
83
+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
84
+ <label for="<?php echo $code ?>_account_holder" class="required"><em>*</em><?php echo $this->__('Account Holder') ?></label>
85
+ <div class="input-box">
86
+ <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(); ?>" />
87
+ </div>
88
+ </li>
89
+ <li>
90
+ <label for="<?php echo $code ?>_bank_country" class="required"><em>*</em><?php echo $this->__('NN Country') ?></label>
91
+ <div class="input-box">
92
+ <?php
93
+ $_countries = Mage::getResourceModel('directory/country_collection')
94
+ ->loadData()
95
+ ->toOptionArray(false)
96
+ ?>
97
+ <?php if (count($_countries) > 0): ?>
98
+ <select id="<?php echo $code ?>_bank_country" onchange="unsetHashRelatedElements()" class="required-entry">
99
  <?php
100
+ foreach ($_countries as $_country):
101
+ if (in_array($billingaddress->getCountryId(), $_country)) {
102
+ ?>
103
+ <option selected value="<?php echo $_country['value'] ?>"><?php echo $_country['label'] ?>
104
+ </option>
105
+ <?php } else { ?>
106
+ <option value="<?php echo $_country['value'] ?>">
107
+ <?php echo $_country['label'] ?>
108
+ </option>
109
+ <?php } ?>
110
+ <?php endforeach; ?>
111
+ </select><br/>
112
+ <?php endif; ?>
113
+ </div>
114
+ </li>
115
+ <li>
116
+ <label for="<?php echo $code ?>_account_number" class="required"><em>*</em><?php echo $this->__('IBAN or Account number') ?></label>
117
+ <div class="input-box">
118
+ <input type="text" id="<?php echo $code ?>_account_number" onkeypress="return ibanbicValidate(event)" onchange="unsetHashRelatedElements();" title="<?php echo $this->__('IBAN or Account number') ?>" class="required-entry input-text" autocomplete="off" value="" />
119
+ </div>
120
+ </li>
121
+
122
+ <li>
123
+ <label for="<?php echo $code ?>_bank_code" class="required"><em>*</em><?php echo $this->__('BIC or Bank code') ?></label>
124
+ <div class="input-box">
125
+ <input type="text" id="<?php echo $code ?>_bank_code" title="<?php echo $this->__('BIC or Bank code') ?>" class="input-text" autocomplete="off" onkeypress="return ibanbicValidate(event)" onchange="unsetHashRelatedElements()" value="" />
126
+ </div>
127
+ </li>
128
+
129
+ <li>
130
+ <div class="input-box">
131
+ <input type="checkbox" id="<?php echo $code ?>_mandate_confirm" title="<?php echo $this->__('confirm') ?>" class="required-entry" onclick="generate_sepa_iban_bic(this, '<?php echo $this->__('Your account details are invalid') ?>', '<?php echo $this->__('Basic parameter not valid') ?>')"/>
132
+ <label class="required" style="float:none;"><?php echo $this->__('NN Confirm') ?></label>
133
+ </div>
134
+ </li>
135
+ <!--{{{ CallbackType-->
136
+ <?php if ($this->isCallbackTypeCall()): ?>
137
+ <!--{{{ PIN by Callback-->
138
+ <?php if ($this->getCallbackConfigData() != 3): ?>
139
+ <li>
140
+ <label for="<?php echo $code ?>_callback_tel" class="required"><em>*</em>
141
+ <?php if ($this->getCallbackConfigData() == 2): ?>
142
+ <?php echo $this->__('Mobile phone number'); ?>
143
+ <?php else: ?>
144
+ <?php echo $this->__('NN Mobile Number'); ?>
145
  <?php endif; ?>
146
+ </label>
 
 
 
 
 
147
  <div class="input-box">
148
+ <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; ?>"/>
149
  </div>
150
+ </li>
151
+ <li>
152
+ <div class="nncallbacknote">
153
+ <?php echo $this->__('Note for pin by sms and callback') ?>
154
+ </div>
155
+ <label for="<?php echo $code ?>_callback_pin" class="required"><em>*</em><?php echo $this->__('PIN') ?></label>
156
  <div class="input-box">
157
+ <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/>
158
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
159
+ <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
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 ?>"/>
176
+ <input id="auth_code" type="hidden" value="<?php echo $authCode ?>"/>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
177
  <input id="sepaiban" type="hidden" value="">
178
  <input id="sepabic" type="hidden" value="">
179
  <input id="sepa_payment_id" type="hidden" value="37">
 
 
 
180
  <input id="result_mandate_unique" type="hidden" value="" name="result_mandate_unique">
181
  <input id="nnsepa_iban_confirmed" type="hidden" value="0" name="nnsepa_iban_confirmed">
182
+ <input id="nn_sepa_merchant_validate_error_message" type="hidden" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
183
+ <input id="nn_sepa_validate_error_message" type="hidden" value="<?php echo $this->__('Your account details are invalid') . '!'; ?>" />
184
+ <input id="result_sepa_hash" type="hidden" value="<?php echo $panhash; ?>" name="result_sepa_hash">
185
+ </ul>
 
 
 
 
 
 
186
  <style>
187
  .nnsepaloader {
188
  position: fixed;
194
  background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
195
  }
196
 
197
+ .nncallbacknote {
198
+ font-weight:bold;
199
+ font-size:11px;
200
+ color:gray;
201
+ border:1px solid #BFBFBF;
202
+ background:#FEFFBF;
203
+ padding:10px;
204
+ margin-top:10px;
205
+ width:400px;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
206
  }
207
  </style>
app/design/frontend/rwd/default/template/novalnet/payment/method/info/Banktransfer.phtml CHANGED
@@ -28,25 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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 if ($this->getAdditionalData('refunded_tid')):
40
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
41
- if ($this->getAdditionalData('fullRefund') == true):
42
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
43
- else:
44
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
45
- endif;
 
46
  endforeach;
47
- endif;
48
- ?>
49
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
50
  <?php else: ?>
51
  <?php echo $this->__('Error in getting payment method') ?>
52
  <?php endif; ?>
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/Cc.phtml CHANGED
@@ -31,28 +31,29 @@ $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
- ?>
35
- <?php
36
- if ($this->getAdditionalData('NnTestOrder'))
37
  echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
38
  ?>
39
- <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
40
- <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
41
- <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>
42
- <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>
43
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
44
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
45
- <?php if ($this->getAdditionalData('refunded_tid')):
46
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
47
- if ($this->getAdditionalData('fullRefund') == true):
48
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
49
- else:
50
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
51
- endif;
52
- endforeach;
53
- endif;
54
- ?>
55
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
56
  <?php else: ?>
57
  <?php echo $this->__('Error in getting payment method') ?>
58
  <?php endif; ?>
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
+ ?>
35
+ <?php
36
+ if ($this->getAdditionalData('NnTestOrder'))
37
  echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
38
+ ?>
39
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
40
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
41
+ <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>
42
+ <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>
43
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
44
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
45
+ <?php
46
+ if ($this->getAdditionalData('refunded_tid')):
47
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
48
+ if ($this->getAdditionalData('fullRefund') == true || preg_match("/-refund/i", $value['reftid'])):
49
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
50
+ else:
51
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s.Your new TID for the refund amount: %s', $helper->makeValidNumber($value['reqtid']), $value['refamount'], $helper->makeValidNumber($value['reftid'])) . '<br><br>';
52
+ endif;
53
+ endforeach;
54
+ endif;
55
  ?>
56
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
57
  <?php else: ?>
58
  <?php echo $this->__('Error in getting payment method') ?>
59
  <?php endif; ?>
app/design/frontend/rwd/default/template/novalnet/payment/method/info/Eps.phtml CHANGED
@@ -28,25 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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 if ($this->getAdditionalData('refunded_tid')):
40
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
41
- if ($this->getAdditionalData('fullRefund') == true):
42
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
43
- else:
44
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
45
- endif;
 
46
  endforeach;
47
- endif;
48
- ?>
49
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
50
  <?php else: ?>
51
  <?php echo $this->__('Error in getting payment method') ?>
52
  <?php endif; ?>
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/Ideal.phtml CHANGED
@@ -28,25 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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 if ($this->getAdditionalData('refunded_tid')):
40
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
41
- if ($this->getAdditionalData('fullRefund') == true):
42
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
43
- else:
44
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
45
- endif;
 
46
  endforeach;
47
- endif;
48
- ?>
49
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
50
  <?php else: ?>
51
  <?php echo $this->__('Error in getting payment method') ?>
52
  <?php endif; ?>
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
@@ -31,76 +31,77 @@ $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
37
  if ($this->getAdditionalData('NnTestOrder'))
38
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
39
- ?>
40
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
41
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
42
- <?php if ($nextCycleDate) echo '<br>' . $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br><br>' ?>
43
- <?php if ($this->getAdditionalData('captureTid')) echo '<br>' . $this->__('The transaction has been confirmed on %s', $captureTime) . '<br><br>' ?>
44
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
45
- <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('The transaction has been canceled on ') . $currentTime . '<br>' ?>
46
- <?php if ($this->getAdditionalData('refunded_tid')):
47
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
48
- if ($this->getAdditionalData('fullRefund') == true):
49
- echo '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
50
- else:
51
- echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
52
- endif;
53
- endforeach;
54
- endif;
55
- ?>
56
- <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl)): ?>
57
  <?php
58
- if (strlen($this->getAdditionalData('NnNote'))):
59
- if (strstr($this->getAdditionalData('NnNote'), 'br')):
60
- echo nl2br($this->getAdditionalData('NnNote'));
61
- else:
62
- $note = explode('|',$this->getAdditionalData('NnNote'));
63
- echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
64
- foreach($note as $noteValue):
65
- list($text, $value) = explode(':', $noteValue);
66
- echo $this->__($text) . ' : '. $value . '</br>';
67
- endforeach;
68
- endif;
69
  endif;
70
  ?>
71
- <?php
72
- if (strlen($this->getAdditionalData('NnNoteAmount'))):
73
- list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
74
- echo $this->__($text) . ' : '. $value;
75
- endif;
76
- ?>
77
- <?php
78
- if (strlen($this->getAdditionalData('NnNoteTID'))):
79
- if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
80
- echo nl2br($this->getAdditionalData('NnNoteTID'));
81
- else:
82
- $note = explode('|',$this->getAdditionalData('NnNoteTID'));
83
- echo "<br />";
84
- foreach($note as $noteValue):
85
- list($text, $value) = explode(':', $noteValue);
86
- if ($text == 'NN_Reference3'):
87
- list($referenceTxt, $value) = explode('&', $value);
88
- str_replace('&', '', $referenceTxt);
89
- echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
90
- else:
91
- echo $this->__($text) . ' : '. $value . '</br>';
92
- endif;
93
- endforeach;
94
  endif;
95
- endif;
96
- ?>
97
- <?php
98
- if (strlen($this->getAdditionalData('NnComments'))):
99
- echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
100
- endif;
101
- ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
102
  <?php endif; ?>
103
  <?php else: ?>
104
  <?php echo $this->__('Error in getting payment method') ?>
105
  <?php endif; ?>
106
-
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): ?>
37
  <?php
38
  if ($this->getAdditionalData('NnTestOrder'))
39
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
40
+ ?>
41
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
42
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
43
+ <?php if ($nextCycleDate) echo '<br>' . $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br>' ?>
44
+ <?php if ($this->getAdditionalData('captureTid')) echo '<br>' . $this->__('The transaction has been confirmed on %s', $captureTime) . '<br>' ?>
45
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo '<br>' . $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br>' ?>
46
+ <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('The transaction has been canceled on %s', $currentTime) . '<br>' ?>
 
 
 
 
 
 
 
 
 
 
 
47
  <?php
48
+ if ($this->getAdditionalData('refunded_tid')):
49
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
50
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
51
+ endforeach;
 
 
 
 
 
 
 
52
  endif;
53
  ?>
54
+ <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl) || $recurringOrder): ?>
55
+ <?php
56
+ if (strlen($this->getAdditionalData('NnNote'))):
57
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
58
+ echo '<br>' . ($this->getAdditionalData('NnNote'));
59
+ else:
60
+ $note = explode('|', $this->getAdditionalData('NnNote'));
61
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b>';
62
+ foreach ($note as $noteValue):
63
+ list($text, $value) = explode(':', $noteValue);
64
+ echo '<br>' . $this->__($text) . ' : ' . $value;
65
+ endforeach;
66
+ endif;
 
 
 
 
 
 
 
 
 
 
67
  endif;
68
+ ?>
69
+ <?php
70
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
71
+ list ($text, $value) = explode(':', $this->getAdditionalData('NnNoteAmount'));
72
+ echo '<br>' . $this->__($text) . ' : ' . $value;
73
+ endif;
74
+ ?>
75
+ <?php
76
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
77
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
78
+ echo '<br>' . ($this->getAdditionalData('NnNoteTID'));
79
+ else:
80
+ $note = explode('|', $this->getAdditionalData('NnNoteTID'));
81
+ echo "<br />";
82
+ foreach ($note as $noteValue):
83
+ list($text, $value) = explode(':', $noteValue);
84
+ if (preg_match("/Order No&/i", $value)):
85
+ list($referenceTxt, $value) = explode('&', $value);
86
+ str_replace('&', '', $referenceTxt);
87
+ echo '<br>' . $this->__($text) . ' : ' . '<b>' . $this->__($referenceTxt) . ' ' . $value . '</b>';
88
+ else:
89
+ if ($text == 'NN_Reference_desc1' || $text == 'NN_Reference_desc2'):
90
+ echo '<br><b>' . $this->__($text) . '</b>';
91
+ else:
92
+ echo '<br>' . $this->__($text) . ' : ' . $value;
93
+ endif;
94
+ endif;
95
+ endforeach;
96
+ endif;
97
+ endif;
98
+ ?>
99
+ <?php
100
+ if (strlen($this->getAdditionalData('NnComments'))):
101
+ echo '<br>' . ($this->getAdditionalData('NnComments'));
102
+ endif;
103
+ ?>
104
  <?php endif; ?>
105
  <?php else: ?>
106
  <?php echo $this->__('Error in getting payment method') ?>
107
  <?php endif; ?>
 
app/design/frontend/rwd/default/template/novalnet/payment/method/info/Paypal.phtml CHANGED
@@ -28,25 +28,22 @@ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('N
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 if ($this->getAdditionalData('refunded_tid')):
40
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
41
- if ($this->getAdditionalData('fullRefund') == true):
42
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
43
- else:
44
- echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
45
- endif;
 
46
  endforeach;
47
- endif;
48
- ?>
49
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
50
  <?php else: ?>
51
  <?php echo $this->__('Error in getting payment method') ?>
52
  <?php endif; ?>
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/Prepayment.phtml CHANGED
@@ -31,76 +31,77 @@ $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
37
  if ($this->getAdditionalData('NnTestOrder'))
38
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
39
- ?>
40
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
41
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
42
- <?php if ($nextCycleDate) echo '<br>' . $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br><br>' ?>
43
- <?php if ($this->getAdditionalData('captureTid')) echo '<br>' . $this->__('The transaction has been confirmed on %s', $captureTime) . '<br><br>' ?>
44
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
45
- <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('The transaction has been canceled on ') . $currentTime . '<br>' ?>
46
- <?php if ($this->getAdditionalData('refunded_tid')):
47
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
48
- if ($this->getAdditionalData('fullRefund') == true):
49
- echo '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
50
- else:
51
- echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
52
- endif;
53
- endforeach;
54
- endif;
55
- ?>
56
- <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl)): ?>
57
  <?php
58
- if (strlen($this->getAdditionalData('NnNote'))):
59
- if (strstr($this->getAdditionalData('NnNote'), 'br')):
60
- echo nl2br($this->getAdditionalData('NnNote'));
61
- else:
62
- $note = explode('|',$this->getAdditionalData('NnNote'));
63
- echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
64
- foreach($note as $noteValue):
65
- list($text, $value) = explode(':', $noteValue);
66
- echo $this->__($text) . ' : '. $value . '</br>';
67
- endforeach;
68
- endif;
69
  endif;
70
  ?>
71
- <?php
72
- if (strlen($this->getAdditionalData('NnNoteAmount'))):
73
- list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
74
- echo $this->__($text) . ' : '. $value;
75
- endif;
76
- ?>
77
- <?php
78
- if (strlen($this->getAdditionalData('NnNoteTID'))):
79
- if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
80
- echo nl2br($this->getAdditionalData('NnNoteTID'));
81
- else:
82
- $note = explode('|',$this->getAdditionalData('NnNoteTID'));
83
- echo "<br />";
84
- foreach($note as $noteValue):
85
- list($text, $value) = explode(':', $noteValue);
86
- if ($text == 'NN_Reference3'):
87
- list($referenceTxt, $value) = explode('&', $value);
88
- str_replace('&', '', $referenceTxt);
89
- echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
90
- else:
91
- echo $this->__($text) . ' : '. $value . '</br>';
92
- endif;
93
- endforeach;
94
  endif;
95
- endif;
96
- ?>
97
- <?php
98
- if (strlen($this->getAdditionalData('NnComments'))):
99
- echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
100
- endif;
101
- ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
102
  <?php endif; ?>
103
  <?php else: ?>
104
  <?php echo $this->__('Error in getting payment method') ?>
105
  <?php endif; ?>
106
-
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): ?>
37
  <?php
38
  if ($this->getAdditionalData('NnTestOrder'))
39
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
40
+ ?>
41
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
42
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
43
+ <?php if ($nextCycleDate) echo '<br>' . $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br>' ?>
44
+ <?php if ($this->getAdditionalData('captureTid')) echo '<br>' . $this->__('The transaction has been confirmed on %s', $captureTime) . '<br>' ?>
45
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo '<br>' . $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br>' ?>
46
+ <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('The transaction has been canceled on %s', $currentTime) . '<br>' ?>
 
 
 
 
 
 
 
 
 
 
 
47
  <?php
48
+ if ($this->getAdditionalData('refunded_tid')):
49
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
50
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
51
+ endforeach;
 
 
 
 
 
 
 
52
  endif;
53
  ?>
54
+ <?php if (!preg_match("/invoice|creditmemo|shipment|callback_novalnet2magento/i", $currentUrl) || $recurringOrder): ?>
55
+ <?php
56
+ if (strlen($this->getAdditionalData('NnNote'))):
57
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
58
+ echo '<br>' . ($this->getAdditionalData('NnNote'));
59
+ else:
60
+ $note = explode('|', $this->getAdditionalData('NnNote'));
61
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b>';
62
+ foreach ($note as $noteValue):
63
+ list($text, $value) = explode(':', $noteValue);
64
+ echo '<br>' . $this->__($text) . ' : ' . $value;
65
+ endforeach;
66
+ endif;
 
 
 
 
 
 
 
 
 
 
67
  endif;
68
+ ?>
69
+ <?php
70
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
71
+ list ($text, $value) = explode(':', $this->getAdditionalData('NnNoteAmount'));
72
+ echo '<br>' . $this->__($text) . ' : ' . $value;
73
+ endif;
74
+ ?>
75
+ <?php
76
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
77
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
78
+ echo '<br>' . ($this->getAdditionalData('NnNoteTID'));
79
+ else:
80
+ $note = explode('|', $this->getAdditionalData('NnNoteTID'));
81
+ echo "<br />";
82
+ foreach ($note as $noteValue):
83
+ list($text, $value) = explode(':', $noteValue);
84
+ if (preg_match("/Order No&/i", $value)):
85
+ list($referenceTxt, $value) = explode('&', $value);
86
+ str_replace('&', '', $referenceTxt);
87
+ echo '<br>' . $this->__($text) . ' : ' . '<b>' . $this->__($referenceTxt) . ' ' . $value . '</b>';
88
+ else:
89
+ if ($text == 'NN_Reference_desc1' || $text == 'NN_Reference_desc2'):
90
+ echo '<br><b>' . $this->__($text) . '</b>';
91
+ else:
92
+ echo '<br>' . $this->__($text) . ' : ' . $value;
93
+ endif;
94
+ endif;
95
+ endforeach;
96
+ endif;
97
+ endif;
98
+ ?>
99
+ <?php
100
+ if (strlen($this->getAdditionalData('NnComments'))):
101
+ echo '<br>' . ($this->getAdditionalData('NnComments'));
102
+ endif;
103
+ ?>
104
  <?php endif; ?>
105
  <?php else: ?>
106
  <?php echo $this->__('Error in getting payment method') ?>
107
  <?php endif; ?>
 
app/design/frontend/rwd/default/template/novalnet/payment/method/info/Sepa.phtml CHANGED
@@ -31,30 +31,25 @@ $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
- ?>
35
- <?php
36
- if ($this->getAdditionalData('NnTestOrder'))
37
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
38
  ?>
39
- <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
40
- <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
41
- <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>
42
- <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>
43
- <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
44
- <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
45
- <?php if ($this->getAdditionalData('refunded_tid')):
46
- foreach($this->getAdditionalData('refunded_tid') as $key => $value):
47
- if ($this->getAdditionalData('fullRefund') == true):
48
- echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
49
- elseif(preg_match("/refund/i", $value['reftid'])):
50
- echo $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br><br>';
51
- else:
52
- echo $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('refund amount %s', $value['refamount']) . ', ' . $this->__('New Tid: %s', $value['reftid']) . ' ' . $this->__('for the balance amount.') . '<br><br>';
53
- endif;
54
  endforeach;
55
- endif;
56
- ?>
57
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
58
  <?php else: ?>
59
  <?php echo $this->__('Error in getting payment method') ?>
60
  <?php endif; ?>
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
 
 
 
 
34
  ?>
35
+ <?php
36
+ if ($this->getAdditionalData('NnTestOrder'))
37
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
38
+ ?>
39
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
40
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
41
+ <?php if ($nextCycleDate) echo $this->__('Next Payment Date is: %s', $nextCycleDate) . '<br /><br>' ?>
42
+ <?php if ($this->getAdditionalData('captureTid')) echo $this->__('The transaction has been confirmed on %s', $captureTime) . '<br /><br>' ?>
43
+ <?php if ($this->getAdditionalData('subsCancelReason')) echo $this->__('Subscription Cancellation: %s', $this->getAdditionalData('subsCancelReason')) . '<br /><br>' ?>
44
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
45
+ <?php
46
+ if ($this->getAdditionalData('refunded_tid')):
47
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
48
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
 
49
  endforeach;
50
+ endif;
51
+ ?>
52
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
53
  <?php else: ?>
54
  <?php echo $this->__('Error in getting payment method') ?>
55
  <?php endif; ?>
app/design/frontend/rwd/default/template/novalnet/sales/recurring/profile/view.phtml DELETED
@@ -1,149 +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
- ?>
27
- <?php /* @var $this Mage_Sales_Block_Recurring_Profile_View */ ?>
28
-
29
- <div class="order-page">
30
-
31
- <!-- title 'n' actions -->
32
- <div class="page-title title-buttons">
33
- <h1><?php echo $this->__('Recurring Profile # %s', $this->escapeHtml($this->getReferenceId())) ?></h1>
34
- <div id="recurring_buttons_view">
35
- <?php if ($this->getCanCancel()): ?>
36
- <button style="position: static;" type="button" title="<?php echo $this->__('Cancel') ?>" class="button" onclick="cancelviewstatus('recurring_buttons_view', 'recurring_cancel_button_view')"><span><span><?php echo $this->__('Cancel') ?></span></span></button>
37
- <?php endif; ?>
38
- <?php
39
- if ($this->getCanSuspend() && $this->_profile->getState() != 'pending'):
40
- ?>
41
- <button style="position: static;" type="button" title="<?php echo $this->__('Suspend') ?>" class="button" onclick="if (confirm('<?php echo $this->getConfirmationMessage() ?>')) {
42
- window.location.href = '<?php echo $this->getSuspendUrl() ?>';
43
- }
44
- return false;"><span><span><?php echo $this->__('Suspend') ?></span></span></button>
45
- <?php endif; ?>
46
- <?php
47
- if ($this->getCanActivate() && $this->_profile->getState() != 'pending'):
48
- ?>
49
- <button style="position: static;" type="button" title="<?php echo $this->__('Activate') ?>" class="button" onclick="if (confirm('<?php echo $this->getConfirmationMessage() ?>')) {
50
- window.location.href = '<?php echo $this->getActivateUrl() ?>';
51
- }
52
- return false;"><span><span><?php echo $this->__('Activate') ?></span></span></button>
53
- <?php endif; ?>
54
- </div>
55
-
56
- <div id="recurring_cancel_button_view" style="display:none;">
57
- <?php if ($this->getCanCancel()): ?>
58
- <?php echo $this->getCancelReason(); ?>
59
- <button type="button" title="<?php echo $this->__('Cancel') ?>" class="button" onclick="cancel_action('<?php echo $this->getConfirmationMessage() ?>', '<?php echo $this->getCancelUrl() ?>','<?php echo $this->__('Please select the reason of subscription cancellation'); ?>');"><span><span><?php echo $this->__('Cancel') ?></span></span></button>
60
- <?php endif; ?>
61
- </div>
62
- </div>
63
-
64
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
65
-
66
- <!-- info tabs -->
67
- <?php $infoTabs = $this->getChildGroup('info_tabs'); ?>
68
-
69
- <dl class="order-info">
70
- <dt><?php echo $this->__('About This Profile:') ?></dt>
71
- <dd>
72
- <ul id="order-info-tabs">
73
- <?php foreach ($infoTabs as $block): ?>
74
- <?php if ($this->getObjectData($block, 'is_view_current')): ?>
75
- <li class="current"><strong><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></strong></li>
76
- <?php else: ?>
77
- <li><a href="<?php echo $this->escapeHtml($this->getObjectData($block, 'view_url')) ?>"><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></a></li>
78
- <?php endif; ?>
79
- <?php endforeach; ?>
80
- </ul>
81
- </dd>
82
- </dl>
83
-
84
- <!-- info blocks in 2 columns -->
85
- <?php for ($i = 1; $i <= 5; $i++): ?>
86
- <?php $infoBlocks = $this->getChildGroup("info_blocks_row_{$i}"); ?>
87
- <?php if ($infoBlocks): ?>
88
- <div class="col2-set order-info-box">
89
- <?php for ($j = 1; $j <= 2; $j++): ?>
90
- <?php foreach ($infoBlocks as $alias => $block): ?>
91
- <?php if ($j == $this->getObjectData($block, 'view_column')): ?>
92
- <div class="col-<?php echo $j ?>">
93
- <div>
94
- <div class="box-title">
95
- <h2><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></h2>
96
- </div>
97
- <div class="box-content">
98
- <?php
99
- $html = $this->getChildHtml($alias)
100
- ?>
101
- <?php
102
- echo ($html ? $html : $this->__('No information available.'));
103
- ?>
104
- </div>
105
- </div>
106
- </div>
107
- <?php endif; ?>
108
- <?php endforeach; ?>
109
- <?php endfor; ?>
110
- </div>
111
- <?php endif; ?>
112
- <?php endfor; ?>
113
-
114
- <!-- table data block -->
115
- <?php $table = $this->getChild('table') ?>
116
- <?php if ($table): ?>
117
- <div>
118
- <h2 class="table-caption"><?php echo $this->escapeHtml($this->getObjectData($table, 'view_label')) ?></h2>
119
- <?php echo $this->getChildHtml('table') ?>
120
- </div>
121
- <?php endif; ?>
122
-
123
- <div class="buttons-set">
124
- <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Recurring Profiles') ?></a></p>
125
- </div>
126
- </div>
127
- <script type="text/javascript">
128
- function cancelviewstatus(current_id, change_id)
129
- {
130
- document.getElementById(current_id).style.display = 'none';
131
- document.getElementById(change_id).style.display = 'block';
132
- }
133
-
134
- function cancel_action(message, url, cancelReason)
135
- {
136
- var reason = parseInt(document.getElementById('reason-subscribe').value);
137
- var resontext = document.getElementById('reason-subscribe');
138
- var resontextval = resontext.options[resontext.selectedIndex].innerHTML;
139
-
140
- if (reason) {
141
- if (confirm(message)) {
142
- window.location.href = url + "?reason=" + resontextval;
143
- }
144
- } else {
145
- alert(cancelReason);
146
- }
147
- return false;
148
- }
149
- </script>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/locale/de_DE/Novalnet_Payment.csv CHANGED
@@ -21,7 +21,7 @@
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
- "Use Proxy","Use Proxy"
25
  "Proxy Host","Host des Proxyservers"
26
  "Proxy Port","Port des Proxyservers"
27
  "OnHold transaction completion status","Bestellstatus für Bestätigung"
@@ -30,7 +30,7 @@
30
  "Gateway timeout description","Falls die Verarbeitungszeit der Bestellung das Zeitlimit der Schnittstelle überschreitet, wird die Bestellung nicht ausgeführt."
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 Testmodus 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"
@@ -55,7 +55,7 @@
55
  "Order completion status","Abschluss-Status der Bestellung"
56
  "Order status for the pending payment","Bestellstatus der ausstehenden Zahlung"
57
  "The order has been updated.","Der Auftrag wurde aktualisiert."
58
- "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"
@@ -112,6 +112,7 @@
112
  "Invoice Due Date","Fälligkeitsdatum der Transaktion"
113
  "Enter the amount or invoice duedate","Ungültiger Betrag"
114
  "Invoice duedate is invalid","Das Datum sollte in der Zukunft liegen."
 
115
  "Update Amount","Betrag der Transaktion erfolgreich geändert :"
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?"
@@ -193,8 +194,8 @@
193
  "TID: %s","Novalnet-Transaktions-ID: %s"
194
  "Novalnet Transaction ID: %s","Novalnet-Transaktions-ID: %s"
195
  "Next Payment Date is: %s","Nächste Zahlungstermin ist: %s"
196
- "The transaction has been canceled on %s","Die Transaktion wurde storniert am %s Uhr storniert."
197
- "The transaction has been confirmed on %s","Die Buchung wurde am %s Uhr bestätigt."
198
  "Subscription Cancellation: %s","Das Abonnement wurde gekündigt wegen: %s"
199
  "Due Date Updated", "Fälligkeitsdatum erfolgreich geändert :"
200
  "Refunded Transaction ID: %s","Transaktions-ID der Rückerstattung: %s"
@@ -213,16 +214,13 @@
213
  "NN_Bank","Bank"
214
  "NN_Amount","Betrag"
215
  "NN Order No","Bestellnummer"
216
- "NN_Reference1","1. Verwendungszweck"
217
- "NN_Reference2","2. Verwendungszweck"
218
- "NN_Reference3","3. Verwendungszweck"
219
  "Please Note: This transaction will run on TEST MODE and the amount will not be charged","Die Zahlung wird im Testmodus durchgeführt, daher wird der Betrag für diese Transaktion nicht eingezogen."
220
  "redirect payment description","Nach der erfolgreichen Überprüfung werden Sie auf die abgesicherte Novalnet-Bestellseite umgeleitet, um die Zahlung fortzusetzen."
221
  "Your account will be debited upon the order submission","Ihr Konto wird nach Abschicken der Bestellung belastet."
222
  "Invoice/Prepayment payment description","Nachdem Sie die Bestellung abgeschickt haben, erhalten Sie eine Email mit den Bankdaten, um die Zahlung durchzuführen."
223
  "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."
224
  "NN Select","Auswählen"
225
- "NN CC type","Kartentyp"
226
  "NN CC holder","Name des Karteninhabers"
227
  "NN CC number","Kreditkartennummer"
228
  "NN Expiration Date","Ablaufdatum"
@@ -233,22 +231,6 @@
233
  "IBAN or Account number","IBAN oder Kontonummer"
234
  "BIC or Bank code","BIC oder Bankleitzahl"
235
  "NN Confirm","Hiermit erteile ich das SEPA-Lastschriftmandat und bestätige, dass die angegebene IBAN und BIC korrekt sind."
236
- "SEPA Direct Debit Mandate Confirmation","Bestätigung des SEPA-Lastschriftmandats"
237
- "Creditor","Gläubiger"
238
- "Credit Identification Number","Gläubiger-Identifikationsnummer"
239
- "Mandate Reference","Mandatsreferenz"
240
- "SEPA Confirm paragraph","Mit diesem Mandatsformular ermächtige ich a. den Gläubiger, Zahlungen von meinem Konto mittels Lastschrift einzuziehen. Zugleich weise ich b. mein Kreditinstitut an, die von dem Gläubiger auf mein Konto gezogenen Lastschriften einzulösen."
241
- "SEPA Confirm note","Ich kann innerhalb von acht Wochen, beginnend mit dem Belastungsdatum, die Erstattung des belasteten Betrages verlangen. Es gelten dabei die mit meinem Kreditinstitut vereinbarten Bedingungen."
242
- "Name of the payee","Name des Zahlungspflichtigen"
243
- "Company name","Firmenname"
244
- "Address","Adresse"
245
- "NN Street","Street"
246
- "NN Address","Straße und Hausnummer"
247
- "Zip Code And City","Postleitzahl und Stadt"
248
- "Country","Country"
249
- "Email","Email"
250
- "conirm_mandate","Bestätigen"
251
- "cancel","Stornieren"
252
  "SEPA Due date is not valid","SEPA Fälligkeitsdatum Ungültiger"
253
  "Mobile phone number","Mobiltelefonnummer"
254
  "NN Mobile Number","Telefonnummer"
@@ -267,3 +249,23 @@
267
  "Customer name/email fields are not valid","Ungültige Werte für die Felder Kundenname-/email"
268
  "The transaction amount %s has been updated successfully on %s","Der Betrag der Transaktion %s wurde am %s Uhr erfolgreich geändert."
269
  "Refund reference","Referenz für die Rückerstattung"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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"
26
  "Proxy Port","Port des Proxyservers"
27
  "OnHold transaction completion status","Bestellstatus für Bestätigung"
30
  "Gateway timeout description","Falls die Verarbeitungszeit der Bestellung das Zeitlimit der Schnittstelle überschreitet, wird die Bestellung nicht ausgeführt."
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"
55
  "Order completion status","Abschluss-Status der Bestellung"
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"
112
  "Invoice Due Date","Fälligkeitsdatum der Transaktion"
113
  "Enter the amount or invoice duedate","Ungültiger Betrag"
114
  "Invoice duedate is invalid","Das Datum sollte in der Zukunft liegen."
115
+ "Invalid due date","Ungültiges Fälligkeitsdatum"
116
  "Update Amount","Betrag der Transaktion erfolgreich geändert :"
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?"
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"
200
  "Due Date Updated", "Fälligkeitsdatum erfolgreich geändert :"
201
  "Refunded Transaction ID: %s","Transaktions-ID der Rückerstattung: %s"
214
  "NN_Bank","Bank"
215
  "NN_Amount","Betrag"
216
  "NN Order No","Bestellnummer"
217
+ "Order No","Bestellnummer"
 
 
218
  "Please Note: This transaction will run on TEST MODE and the amount will not be charged","Die Zahlung wird im Testmodus durchgeführt, daher wird der Betrag für diese Transaktion nicht eingezogen."
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"
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."
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
234
  "SEPA Due date is not valid","SEPA Fälligkeitsdatum Ungültiger"
235
  "Mobile phone number","Mobiltelefonnummer"
236
  "NN Mobile Number","Telefonnummer"
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)"
254
+ "New Tid: %s for the refunded amount %s","Neue TID: der erstattete Betrag für %s ist %s"
255
+ "The date should be in future","Das Datum sollte in der Zukunft liegen."
256
+ "Enter your PIN","PIN eingeben."
257
+ "Please enter valid due date","Geben Sie bitte ein gültiges Fälligkeitsdatum ein"
258
+ "NN_Reference","Verwendungszweck "
259
+ "NN_Reference1","1. Verwendungszweck"
260
+ "NN_Reference2","2. Verwendungszweck"
261
+ "NN_Reference3","3. Verwendungszweck"
262
+ "payment reference one","Verwendungszweck 1: (Novalnet Rechnungsnummer)"
263
+ "payment reference two","Verwendungszweck 2: (TID)"
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."
app/locale/en_US/Novalnet_Payment.csv CHANGED
@@ -21,7 +21,7 @@
21
  "Autofill description","The payment details will be filled automatically in the payment form during the checkout process"
22
  "Enable default payment method","Enable default payment method"
23
  "Payment last success description","For the registered users the last chosen payment method will be selected by default during the checkout"
24
- "Use Proxy","Use Proxy"
25
  "Proxy Host","Proxy Host"
26
  "Proxy Port","Proxy Port"
27
  "OnHold transaction completion status","Confirmation order status"
@@ -30,7 +30,7 @@
30
  "Gateway timeout description","In case the order processing time exceeds the gateway timeout, the order will not be placed"
31
  "Merchant script management","Merchant script management"
32
  "Enable debug mode","Enable debug mode"
33
- "Debug mode description","Set the debug mode to execute the merchant script in test mode"
34
  "Enable test mode","Enable test mode"
35
  "Test mode description","The payment will be processed in the test mode therefore amount for this transaction will not be charged"
36
  "Callback order status","Callback order status"
@@ -54,7 +54,7 @@
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
- "Credit Card Types","Credit Card Types"
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"
@@ -109,6 +109,7 @@
109
  "Invoice Due Date","Transaction due date"
110
  "Enter the amount or invoice duedate","The amount is invalid"
111
  "Invoice duedate is invalid","The date should be in future"
 
112
  "Update Amount","Transaction amount updated successfully :"
113
  "Novalnet Amount Changed","Change the amount / due date"
114
  "The transaction amount ","The transaction amount "
@@ -216,16 +217,12 @@
216
  "NN_Bank","Bank"
217
  "NN_Amount","Amount"
218
  "NN Order No","Order number"
219
- "NN_Reference1","Reference 1"
220
- "NN_Reference2","Reference 2"
221
- "NN_Reference3","Reference 3"
222
  "Please Note: This transaction will run on TEST MODE and the amount will not be charged","The payment will be processed in the test mode therefore amount for this transaction will not be charged"
223
  "redirect payment description","After the successful verification, you will be redirected to Novalnet secure order page to proceed with the payment"
224
  "Your account will be debited upon the order submission","Your account will be debited upon the order submission"
225
  "Invoice/Prepayment payment description","Once you've submitted the order, you will receive an e-mail with account details to make payment"
226
  "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"
227
  "NN Select","Select"
228
- "NN CC type","Type of card"
229
  "NN CC holder","Card holder name"
230
  "NN CC number","Card number"
231
  "NN Expiration Date","Expiry date"
@@ -235,22 +232,6 @@
235
  "IBAN or Account number","IBAN or Account number"
236
  "BIC or Bank code","BIC or Bank code"
237
  "NN Confirm","I hereby grant the SEPA direct debit mandate and confirm that the given IBAN and BIC are correct"
238
- "SEPA Direct Debit Mandate Confirmation","Direct debit SEPA mandate confirmation"
239
- "Creditor","Creditor"
240
- "Credit Identification Number","Creditor identifier"
241
- "Mandate Reference","Mandate reference"
242
- "SEPA Confirm paragraph","By granting this mandate form, I authorize (A) the creditor to send instructions to my bank to debit my account and (B) my bank to debit my account in accordance with the instructions from the creditor for this and future payments."
243
- "SEPA Confirm note","As part of my rights, I am entitled to a refund from my bank under the terms and conditions of my agreement with my bank. A refund must be claimed within eight weeks from the date on which my account was debited."
244
- "Name of the payee","Name of the payee"
245
- "Company name","Company name"
246
- "Address","Street name and number"
247
- "NN Street","Street"
248
- "NN Address","Address"
249
- "Zip Code And City","Postal code and City"
250
- "Country","Country"
251
- "Email","E-mail"
252
- "conirm_mandate","Confirm"
253
- "cancel","Cancel"
254
  "SEPA Due date is not valid","SEPA Due date is not valid"
255
  "Mobile phone number","Mobile number"
256
  "NN Mobile Number","Telephone number"
@@ -268,3 +249,20 @@
268
  "Your E-mail address is invalid","Your E-mail address is invalid"
269
  "Customer name/email fields are not valid","Customer name/email fields are not valid"
270
  "Refund reference","Refund reference"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
21
  "Autofill description","The payment details will be filled automatically in the payment form during the checkout process"
22
  "Enable default payment method","Enable default payment method"
23
  "Payment last success description","For the registered users the last chosen payment method will be selected by default during the checkout"
24
+ "Novalnet Use Proxy","Proxy server"
25
  "Proxy Host","Proxy Host"
26
  "Proxy Port","Proxy Port"
27
  "OnHold transaction completion status","Confirmation order status"
30
  "Gateway timeout description","In case the order processing time exceeds the gateway timeout, the order will not be placed"
31
  "Merchant script management","Merchant script management"
32
  "Enable debug mode","Enable debug mode"
33
+ "Debug mode description","Set the debug mode to execute the merchant script in debug mode"
34
  "Enable test mode","Enable test mode"
35
  "Test mode description","The payment will be processed in the test mode therefore amount for this transaction will not be charged"
36
  "Callback order status","Callback order status"
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"
109
  "Invoice Due Date","Transaction due date"
110
  "Enter the amount or invoice duedate","The amount is invalid"
111
  "Invoice duedate is invalid","The date should be in future"
112
+ "Invalid due date","Invalid due date"
113
  "Update Amount","Transaction amount updated successfully :"
114
  "Novalnet Amount Changed","Change the amount / due date"
115
  "The transaction amount ","The transaction amount "
217
  "NN_Bank","Bank"
218
  "NN_Amount","Amount"
219
  "NN Order No","Order number"
 
 
 
220
  "Please Note: This transaction will run on TEST MODE and the amount will not be charged","The payment will be processed in the test mode therefore amount for this transaction will not be charged"
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"
232
  "IBAN or Account number","IBAN or Account number"
233
  "BIC or Bank code","BIC or Bank code"
234
  "NN Confirm","I hereby grant the SEPA direct debit mandate and confirm that the given IBAN and BIC are correct"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
235
  "SEPA Due date is not valid","SEPA Due date is not valid"
236
  "Mobile phone number","Mobile number"
237
  "NN Mobile Number","Telephone 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"
253
+ "The period of the subsequent subscription cycle (E.g: 1d/1m/1y)","The period of the subsequent subscription cycle (E.g: 1d/1m/1y)"
254
+ "Please enter valid due date","Please enter valid due date"
255
+ "NN_Reference","Payment Reference "
256
+ "NN_Reference1","Payment Reference 1"
257
+ "NN_Reference2","Payment Reference 2"
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"
js/novalnet/novalnetcc.js CHANGED
@@ -36,11 +36,11 @@ function cchashcall()
36
  return false;
37
  }
38
 
39
- var ccParams = {'ccType':'cc_type', '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;
@@ -61,8 +61,9 @@ function cchashcall()
61
 
62
  $nncc_j('#cc_loading').show();
63
  var ccUniqueId = generateUniqueId();
 
64
 
65
- var ccPayportParams = {"noval_cc_exp_month" : ccParams['ccExpMonth'], "noval_cc_exp_year" : ccParams['ccExpYear'], "noval_cc_holder" : ccParams['ccHolder'], "noval_cc_no" : ccParams['ccNo'], "noval_cc_type" : ccParams['ccType'], "unique_id": ccUniqueId, "vendor_authcode" : merchantAuthcode,"vendor_id" : merchantVendor};
66
 
67
  ccPayportParams = $nncc_j.param(ccPayportParams);
68
 
@@ -135,7 +136,6 @@ function getCcHashResult(response, reqCall)
135
  $nncc_j('#novalnetCc_cc_number').val(arrayResult.cc_no);
136
  $nncc_j('#novalnetCc_expiration').val(arrayResult.cc_exp_month);
137
  $nncc_j('#novalnetCc_expiration_yr').val(arrayResult.cc_exp_year);
138
- $nncc_j('#novalnetCc_cc_type').val(arrayResult.cc_type);
139
  $nncc_j('#novalnet_cc_hash').val(response.pan_hash);
140
  }
141
  } else {
@@ -187,10 +187,9 @@ function getCcHttpProtocol()
187
  function isNumberKey(evt, allowspace)
188
  {
189
  var charCode = (evt.which) ? evt.which : evt.keyCode;
190
-
191
  if (String.fromCharCode(evt.which) == '.' || String.fromCharCode(evt.which) == "'" || String.fromCharCode(evt.which) == '#') return false;
192
 
193
- if ((charCode == 32 && allowspace == true) || (charCode == 35 || charCode == 116 || charCode == 36 || charCode == 37 || charCode == 39 || charCode == 46) && evt.shiftKey == false) {
194
  return true;
195
  } else if (evt.ctrlKey == true && charCode == 114) {
196
  return true;
@@ -203,6 +202,13 @@ function isNumberKey(evt, allowspace)
203
  return true;
204
  }
205
 
 
 
 
 
 
 
 
206
  function generateUniqueId()
207
  {
208
  var length = 30; //Maximum Hash Limit
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;
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
 
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 {
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;
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
js/novalnet/novalnetsepa.js CHANGED
@@ -30,7 +30,6 @@ function generate_sepa_iban_bic(value)
30
  unsetHashRelatedElements();
31
  return false;
32
  } else {
33
- $nnsepa_j('#novalnetSepa_mandate_confirm').attr('disabled', true);
34
  $nnsepa_j('#novalnetSepa_iban').remove();
35
  $nnsepa_j('#novalnetSepa_bic').remove();
36
  }
@@ -81,7 +80,7 @@ function getSepaFormValues()
81
  {
82
  var merchantVendor = $nnsepa_j('#process_vendor_id').val();
83
  var merchantAuthcode = $nnsepa_j('#auth_code').val();
84
- var sepaAccountHolder = removeUnwantedSpecialChars($nnsepa_j.trim($nnsepa_j('#novalnetSepa_account_holder').val()));
85
  var sepaBankCountry = $nnsepa_j('#novalnetSepa_bank_country').val();
86
  var sepaAccountNumber = removeUnwantedSpecialChars($nnsepa_j.trim($nnsepa_j('#novalnetSepa_account_number').val()));
87
  var sepaUniqueId = generateUniqueId();
@@ -238,36 +237,25 @@ function getSepaHashResult(response, reqCall)
238
  if(response.IBAN != '' && response.BIC != '') {
239
  $nnsepa_j('<span id="novalnetSepa_iban"></span>').insertAfter($nnsepa_j("#novalnetSepa_account_number"));
240
  $nnsepa_j('#novalnetSepa_iban').html('<b>IBAN:</b> '+response.IBAN);
241
- $nnsepa_j('#nn_sepa_overlay_iban_tr').show(60);
242
  $nnsepa_j('<span id="novalnetSepa_bic"></span>').insertAfter($nnsepa_j("#novalnetSepa_bank_code"));
243
  $nnsepa_j('#novalnetSepa_bic').html('<b>BIC:</b> '+response.BIC);
244
- $nnsepa_j('#nn_sepa_overlay_bic_tr').show(60);
245
  generateSepaHash();
246
  return true;
247
  } else {
248
  alert($nnsepa_j('#nn_sepa_validate_error_message').val());
249
- $nnsepa_j('#sepa_mandate_overlay_block_first').css("display", "none");
250
  $nnsepa_j('#novalnetSepa_mandate_confirm').removeAttr("checked");
251
  $nnsepa_j('#novalnetSepa_mandate_confirm').attr('disabled', false);
252
  $nnsepa_j('#nnsepa_iban_confirmed').val(0);
253
- $nnsepa_j('#nn_sepa_overlay_iban_tr').hide(60);
254
- $nnsepa_j('#nn_sepa_overlay_bic_tr').hide(60);
255
- closeMandateOverlay(0);
256
  return false;
257
  }
258
  } else if (reqCall == 'hash_call') {
259
  var sepaUniqueId = generateUniqueId();
260
  $nnsepa_j('#result_sepa_hash').val(response.sepa_hash);
261
  $nnsepa_j('#result_sepa_hash').attr('disabled',false);
262
- $nnsepa_j('#result_mandate_ref').val(response.mandate_ref);
263
- $nnsepa_j('#result_mandate_ref').attr('disabled',false);
264
- $nnsepa_j('#result_mandate_date').val(response.mandate_date);
265
- $nnsepa_j('#result_mandate_date').attr('disabled',false);
266
  $nnsepa_j('#result_mandate_unique').val(sepaUniqueId);
267
  $nnsepa_j('#result_mandate_unique').attr('disabled',false);
268
  $nnsepa_j('#nnsepa_iban_confirmed').val(1);
269
  $nnsepa_j('#nnsepa_iban_confirmed').attr('disabled',false);
270
- showMandateOverlay();
271
  } else if (reqCall == 'refill_call') {
272
  var params = response.hash_string+"&";
273
  params = params.split("=");
@@ -304,93 +292,21 @@ function unsetHashRelatedElements()
304
  $nnsepa_j('#sepabic').val('');
305
  $nnsepa_j('#result_mandate_unique').val('');
306
  $nnsepa_j('#result_sepa_hash').val('');
307
- $nnsepa_j('#result_mandate_date').val('');
308
- $nnsepa_j('#result_mandate_ref').val('');
309
  $nnsepa_j('#novalnetSepa_iban').remove();
310
  $nnsepa_j('#novalnetSepa_bic').remove();
311
  $nnsepa_j('#nnsepa_iban_confirmed').val(0);
312
  $nnsepa_j('#novalnetSepa_mandate_confirm').removeAttr("checked");
313
  }
314
 
315
- function showMandateOverlay()
316
- {
317
- $nnsepa_j('.bgCover').css({
318
- display: 'block',
319
- width: $nnsepa_j(document).width(),
320
- height: $nnsepa_j(document).height()
321
- });
322
- $nnsepa_j('.bgCover').css({opacity: 0}).animate({opacity: 0.5, backgroundColor: '#878787'});
323
- $nnsepa_j('#sepa_overlay_iban_span').html(removeUnwantedSpecialChars($nnsepa_j('#sepaiban').val()));
324
- $nnsepa_j('#sepa_overlay_bic_span').html(removeUnwantedSpecialChars($nnsepa_j('#sepabic').val()));
325
- if ($nnsepa_j('#sepaiban').val() != '' && $nnsepa_j('#sepabic').val() != '') {
326
- $nnsepa_j('#label_iban').css('display', 'table-row');
327
- $nnsepa_j('#label_bic').css('display', 'table-row');
328
- }
329
-
330
- if (isNaN($nnsepa_j('#novalnetSepa_account_number').val()) && $nnsepa_j('#novalnetSepa_bank_code').val() == '') {
331
- $nnsepa_j('#sepa_overlay_iban_span').html(removeUnwantedSpecialChars($nnsepa_j('#novalnetSepa_account_number').val()));
332
- $nnsepa_j('#nn_sepa_overlay_bic_tr').hide(60);
333
- } else if (isNaN($nnsepa_j('#novalnetSepa_account_number').val()) && isNaN($nnsepa_j('#novalnetSepa_bank_code').val())) {
334
- $nnsepa_j('#sepa_overlay_iban_span').html(removeUnwantedSpecialChars($nnsepa_j('#novalnetSepa_account_number').val()));
335
- $nnsepa_j('#sepa_overlay_bic_span').html(removeUnwantedSpecialChars($nnsepa_j('#novalnetSepa_bank_code').val()));
336
- }
337
-
338
- $nnsepa_j('#sepa_overlay_payee_span').html('Novalnet AG');
339
- $nnsepa_j('#sepa_overlay_creditoridentificationnumber_span').html('DE53ZZZ00000004253');
340
- $nnsepa_j('#sepa_overlay_enduserfullname_span').html(removeUnwantedSpecialChars($nnsepa_j('#novalnetSepa_account_holder').val()));
341
- $nnsepa_j('#sepa_overlay_enduserfullname_span1').html(removeUnwantedSpecialChars($nnsepa_j('#novalnetSepa_account_holder').val()));
342
- $nnsepa_j('#sepa_overlay_endusercountry_span').html($nnsepa_j('#novalnetSepa_bank_country').val());
343
- $nnsepa_j('#sepa_overlay_mandatedate_span').html(normalizeDate($nnsepa_j('#result_mandate_date').val()));
344
- $nnsepa_j('#sepa_overlay_mandatereference_span').html($nnsepa_j('#result_mandate_ref').val());
345
- $nnsepa_j('#sepa_mandate_overlay_block_first').css({display: 'none', position: 'fixed'});
346
- $nnsepa_j('#sepa_mandate_overlay_block').css({display: 'block', position: 'fixed'});
347
-
348
- if ($nnsepa_j(window).width() < 650) {
349
- $nnsepa_j('#sepa_mandate_overlay_block').css({left: ($nnsepa_j(window).width() / 2), top: ($nnsepa_j(window).height() / 2), width: 0, height: 0}).animate({left: (($nnsepa_j(window).width() - ($nnsepa_j(window).width() - 10)) / 2), top: 5, width: ($nnsepa_j(window).width() - 10), height: ($nnsepa_j(window).height() - 10)});
350
- $nnsepa_j('#overlay_window_block_body').css({'height': ($nnsepa_j(window).height() - 95)});
351
- } else {
352
- $nnsepa_j('#sepa_mandate_overlay_block').css({left: (($nnsepa_j(window).height() - (490 / 2))), top: (($nnsepa_j(window).height() - 490) / 2), width: (600), height: (490)});
353
- $nnsepa_j('#overlay_window_block_body').css({'height': (400)});
354
- }
355
-
356
- return true;
357
- }
358
-
359
- function normalizeDate(input)
360
- {
361
- var parts = input.split('-');
362
- return(parts[2] + '.' + parts[1] + '.' + parts[0]);
363
- }
364
-
365
- function closeMandateOverlay(mandate)
366
- {
367
- $nnsepa_j('#sepa_mandate_overlay_block').hide(60);
368
- $nnsepa_j('.bgCover').css({display: 'none'});
369
- return true;
370
- }
371
-
372
- function mandate_confirm_btn_submit()
373
- {
374
- $nnsepa_j('#novalnetSepa_mandate_confirm').attr('disabled', false);
375
- $nnsepa_j('#nnsepa_iban_confirmed').val(1);
376
- closeMandateOverlay(0);
377
- }
378
-
379
- function mandate_cancel_btn_submit()
380
- {
381
- $nnsepa_j('#nnsepa_iban_confirmed').val(0);
382
- $nnsepa_j('#novalnetSepa_mandate_confirm').removeAttr("checked");
383
- $nnsepa_j('#novalnetSepa_mandate_confirm').attr('disabled', false);
384
- closeMandateOverlay(0);
385
- $nnsepa_j('#novalnetSepa_iban').remove();
386
- $nnsepa_j('#novalnetSepa_bic').remove();
387
- }
388
-
389
- function removeUnwantedSpecialChars(value)
390
  {
391
  if (value != 'undefined' || value != '') {
392
  value.replace(/^\s+|\s+$/g, '');
393
- return value.replace(/[\/\\|\]\[|#@,+()`'$~%.":;*?<>!^{}=_-]/g,'');
 
 
 
 
394
  }
395
  }
396
 
@@ -398,7 +314,7 @@ function ibanbicValidate(event)
398
  {
399
  var keycode = ('which' in event) ? event.which : event.keyCode;
400
  var reg = /^(?:[A-Za-z0-9]+$)/;
401
- if(event.target.id == 'novalnetSepa_account_holder') var reg = /^(?:[A-Za-z0-9&\s]+$)/;
402
  return (reg.test(String.fromCharCode(keycode)) || keycode == 0 || keycode == 8 || (event.ctrlKey == true && keycode == 114))? true : false;
403
  }
404
 
@@ -427,13 +343,25 @@ function getSepaHttpProtocol()
427
  return urlPrefix + "://payport.novalnet.de/sepa_iban";
428
  }
429
 
430
- sepaRefillcall();
431
  $nnsepa_j(document).ready(function() {
 
 
432
  Ajax.Responders.register({ onComplete: function() {
433
- if (Ajax.activeRequestCount == 0 && $nnsepa_j('input[name="payment[method]"]:checked').val() == 'novalnetSepa'
434
- && $nnsepa_j('#nnsepa_iban_confirmed').val() == 0) {
435
- sepaRefillcall();
 
 
 
436
  }
437
  }
438
  });
 
 
 
 
 
 
 
439
  });
 
30
  unsetHashRelatedElements();
31
  return false;
32
  } else {
 
33
  $nnsepa_j('#novalnetSepa_iban').remove();
34
  $nnsepa_j('#novalnetSepa_bic').remove();
35
  }
80
  {
81
  var merchantVendor = $nnsepa_j('#process_vendor_id').val();
82
  var merchantAuthcode = $nnsepa_j('#auth_code').val();
83
+ var sepaAccountHolder = removeUnwantedSpecialChars($nnsepa_j.trim($nnsepa_j('#novalnetSepa_account_holder').val()), 'holder');
84
  var sepaBankCountry = $nnsepa_j('#novalnetSepa_bank_country').val();
85
  var sepaAccountNumber = removeUnwantedSpecialChars($nnsepa_j.trim($nnsepa_j('#novalnetSepa_account_number').val()));
86
  var sepaUniqueId = generateUniqueId();
237
  if(response.IBAN != '' && response.BIC != '') {
238
  $nnsepa_j('<span id="novalnetSepa_iban"></span>').insertAfter($nnsepa_j("#novalnetSepa_account_number"));
239
  $nnsepa_j('#novalnetSepa_iban').html('<b>IBAN:</b> '+response.IBAN);
 
240
  $nnsepa_j('<span id="novalnetSepa_bic"></span>').insertAfter($nnsepa_j("#novalnetSepa_bank_code"));
241
  $nnsepa_j('#novalnetSepa_bic').html('<b>BIC:</b> '+response.BIC);
 
242
  generateSepaHash();
243
  return true;
244
  } else {
245
  alert($nnsepa_j('#nn_sepa_validate_error_message').val());
 
246
  $nnsepa_j('#novalnetSepa_mandate_confirm').removeAttr("checked");
247
  $nnsepa_j('#novalnetSepa_mandate_confirm').attr('disabled', false);
248
  $nnsepa_j('#nnsepa_iban_confirmed').val(0);
 
 
 
249
  return false;
250
  }
251
  } else if (reqCall == 'hash_call') {
252
  var sepaUniqueId = generateUniqueId();
253
  $nnsepa_j('#result_sepa_hash').val(response.sepa_hash);
254
  $nnsepa_j('#result_sepa_hash').attr('disabled',false);
 
 
 
 
255
  $nnsepa_j('#result_mandate_unique').val(sepaUniqueId);
256
  $nnsepa_j('#result_mandate_unique').attr('disabled',false);
257
  $nnsepa_j('#nnsepa_iban_confirmed').val(1);
258
  $nnsepa_j('#nnsepa_iban_confirmed').attr('disabled',false);
 
259
  } else if (reqCall == 'refill_call') {
260
  var params = response.hash_string+"&";
261
  params = params.split("=");
292
  $nnsepa_j('#sepabic').val('');
293
  $nnsepa_j('#result_mandate_unique').val('');
294
  $nnsepa_j('#result_sepa_hash').val('');
 
 
295
  $nnsepa_j('#novalnetSepa_iban').remove();
296
  $nnsepa_j('#novalnetSepa_bic').remove();
297
  $nnsepa_j('#nnsepa_iban_confirmed').val(0);
298
  $nnsepa_j('#novalnetSepa_mandate_confirm').removeAttr("checked");
299
  }
300
 
301
+ function removeUnwantedSpecialChars(value, req)
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
302
  {
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
  }
312
 
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
 
343
  return urlPrefix + "://payport.novalnet.de/sepa_iban";
344
  }
345
 
 
346
  $nnsepa_j(document).ready(function() {
347
+ sepaRefillcall();
348
+
349
  Ajax.Responders.register({ onComplete: function() {
350
+ if (Ajax.activeRequestCount == 0) {
351
+ if ($nnsepa_j('input[name="payment[method]"]:checked').val() == 'novalnetSepa'
352
+ && $nnsepa_j('#nnsepa_iban_confirmed').val() == 0) {
353
+ sepaRefillcall();
354
+ }
355
+ return true;
356
  }
357
  }
358
  });
359
+
360
+ $nnsepa_j(document).on('click', '#co-payment-form input[type="radio"]', function(event) {
361
+ if (this.value == "novalnetSepa") {
362
+ $nnsepa_j(this).addClass('active');
363
+ sepaRefillcall();
364
+ }
365
+ });
366
  });
367
+
package.xml CHANGED
@@ -1,35 +1,19 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Novalnet</name>
4
- <version>10.0.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>- Novalnet Merchant API configuration has been globally implemented.&#xD;
12
- o On-hold transaction configuration.&#xD;
13
- o Merchant script notification mail configuration.&#xD;
14
- o Auto selection of last successfull payment. &#xD;
15
- o Merchant can set up their Referrer ID.&#xD;
16
- o Proxy server configuration.&#xD;
17
- o Merchant can define their gateway timeout.&#xD;
18
- - Auto-fill for payment data (Direct Debit SEPA).&#xD;
19
- - Fraud prevention through PIN by Callback/SMS/E-Mail. (For Credit Card, Direct Debit SEPA &amp; Invoice).&#xD;
20
- - Integrated "AMEX card type".&#xD;
21
- - Subscription management.&#xD;
22
- - Order and transaction management.&#xD;
23
- - Implemented "Extension" features &#xD;
24
- o VOID &amp; CAPTURE option for on-hold transaction payments (Direct Debit SEPA, Credit Card, Invoice &amp; Prepayment).&#xD;
25
- o Refund option for the payments (Credit Card, Direct Debit SEPA, Invoice, Prepayment, Instant Bank Transfer, iDEAL &amp; PayPal).&#xD;
26
- o Transaction amount update option (For Direct Debit SEPA, Invoice &amp; Prepayment).&#xD;
27
- o Due date change option for Prepayment &amp; Invoice payment.&#xD;
28
- - Affiliate management system.</notes>
29
  <authors><author><name>Gabriel Dixon</name><user>Novalnet</user><email>gd@novalnet.de</email></author></authors>
30
- <date>2015-05-05</date>
31
- <time>10:38:30</time>
32
- <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="bc9014a4ac9894ebf13ca0f696f542ec"/><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="060ebd828ac2ec1b8aa106c2b43409e1"/><dir name="Invoice"><file name="Totals.php" hash="1ad938eb50e5c00d293b8c3a6ff9eebe"/><file name="View.php" hash="fe4f6dfb8c42e551a296d539358abd4a"/></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="76b70f08c906504e57ef6e3830212c22"/></dir></dir><file name="View.php" hash="588c7040dbbb2eca74e376ca96b89564"/></dir><file name="Order.php" hash="7d3f23b4d944138e25db603a161c764e"/><file name="Sales.php" hash="955045ba24383e85fdd2e4dd7a8fa437"/></dir><dir name="Transaction"><file name="Grid.php" hash="9d9b02b1d73b37f11d33a80fe7252570"/><dir name="View"><file name="Form.php" hash="1960a7abc65e82c6893cb59cbd8fff13"/></dir><file name="View.php" hash="c761fe3876d4f410344e76f022202c1d"/></dir><file name="Transaction.php" hash="9d67e39e951ef6e31da72bfd4d648249"/><dir name="Transactionoverview"><file name="Grid.php" hash="32b8aa3d5c79752817e0a68dbcdac072"/><dir name="View"><file name="Form.php" hash="3414da367d9f47ecc670233ddead8a56"/></dir><file name="View.php" hash="fbaef0990f5eeb837f463e518abed50c"/></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="Cart"><dir name="Item"><file name="Renderer.php" hash="3d834934971b172d75fdeee6ba74aa62"/></dir></dir><dir name="Payment"><dir name="Method"><dir name="Form"><file name="Banktransfer.php" hash="4245dcb83f3a92cf784c30c8dd39b20f"/><file name="Cc.php" hash="1dee644c0ad11ac3bbe700f4debd087e"/><file name="Eps.php" hash="0d6522bbf748e002cbee43dbf1ead213"/><file name="Ideal.php" hash="e82980d6a49d89948dcde99f24a302e3"/><file name="Invoice.php" hash="ae34378578ea6865e919be80dc9b3d91"/><file name="Paypal.php" hash="34890e76d19a895928fa20c54f0947e5"/><file name="Prepayment.php" hash="cda55000b93340d0863476634a83ea2d"/><file name="Sepa.php" hash="3e20c0046070666e76112a1aa6b2192e"/></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="905040b97393e81fbf521c57f2faff40"/></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="2daf3f384b4937de25a2602c37bff354"/><file name="Data.php" hash="8715410d590b872d0e6f3ca6f8ae2b39"/></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="20693661a042c682fa524aad399f0559"/><file name="Config.php" hash="0abecac4c019c759b15d5b8481fec4b9"/><file name="Factory.php" hash="38ea67304e8bc2fd6bc6a7574f52c19d"/><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="e24f35f2dbf85e7b47519bfd11754641"/></dir></dir><file name="Observer.php" hash="16976a4ad5bd9c6589c800a5270ba395"/><dir name="Payment"><dir name="Method"><file name="Abstract.php" hash="ffaee88624777f17df33dbf2619241a3"/><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="1041c211cc1b241df9947cd4c70c40a9"/><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="Creditmemo"><file name="Tax.php" hash="617bd8ccc92a171738859a010a3a4e2e"/><file name="Total.php" hash="241d98361b30e4e37e7a03ba80636c2e"/></dir><dir name="Order"><file name="Invoice.php" hash="b3f7cd05cf7d57579f72e64019cd5b39"/><file name="Payment.php" hash="0896fb14fc0c9a72162a8eed52ea9aef"/><dir name="Pdf"><file name="Creditmemo.php" hash="475bae31d1d98dd9180a05a7939af9f5"/><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="0d3ba0fea1a3ea9e77e1a31856a65a54"/></dir></dir><file name="Transactionoverview.php" hash="efa669cfa0fece162980ea1025bd0b30"/><file name="Transactionstatus.php" hash="9634b88d4bd47535f2ba655a056c862f"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Configuration"><dir name="Wizard"><file name="PageController.php" hash="c3caa4e8e859d727c6a673922455bd37"/></dir></dir><dir name="Information"><file name="ModuleController.php" hash="e321ca9221134812b11928c74fc993d1"/><file name="NovalnetmerchantadminController.php" hash="a70f4806f8d32b13db2e842a43108508"/></dir><dir name="Sales"><file name="OrderController.php" hash="e70e0ae1bb91c964e123d9763cf0e50a"/><dir name="Recurring"><file name="ProfileController.php" hash="4942cbcb920c62f9262c382a098de180"/></dir></dir><file name="TransactionController.php" hash="4856ccaced048b327286b134856ee24e"/><file name="TransactionoverviewController.php" hash="8eac78cb020bb283bbff67508b23aadb"/></dir><file name="GatewayController.php" hash="32e1dcb31e280d08e215a6e32a0ad16d"/></dir><dir name="etc"><file name="adminhtml.xml" hash="593655c1db4c74371cd9282a1ec5c358"/><file name="config.xml" hash="8d00aa4c6e78a529f901e4a8e0d4f7d7"/><file name="system.xml" hash="ca03b5b98b11a8d560a7d812e1183ee6"/></dir><dir name="sql"><dir name="novalnet_setup"><file name="mysql4-install-10.0.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-10.0.0.php" hash="1143e8786a6b266519d38772ce678ea4"/><file name="mysql4-upgrade-5.0.2-5.0.3.php" hash="946953f6fc66a2cf8831f903b696b9ba"/><file name="mysql4-upgrade-5.0.3-10.0.0.php" hash="6fb86f8aadcf67ae75d1868349fc2569"/><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="695a78caf7816d76237f22406562e152"/></dir></dir><dir name="template"><dir name="novalnet"><dir><dir name="information"><file name="module.phtml" hash="3704fbf6762df384f7cb62a26b343d3c"/><file name="novalnetmerchantadmin.phtml" hash="c806d66735db8bd6bdb724856ead287c"/></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="71b52a2c8ca8d9dbe7cfd4595930c6d6"/><file name="Invoice.phtml" hash="e7a8d5d94c4c2d22cdc8b6c5aa075328"/><file name="Prepayment.phtml" hash="93386e5eb2f6809ae8464c59594c18d7"/><file name="Sepa.phtml" hash="73d4c7639305bb206798c699dd891aee"/></dir><dir name="info"><file name="Banktransfer.phtml" hash="eadc764f6a9d8440f04df259bf36ab84"/><file name="Cc.phtml" hash="c6b2ab25f4703aba805ddb81e038eb70"/><file name="Eps.phtml" hash="eadc764f6a9d8440f04df259bf36ab84"/><file name="Ideal.phtml" hash="eadc764f6a9d8440f04df259bf36ab84"/><file name="Invoice.phtml" hash="0d8a04696ef64b8315480f12699e1321"/><file name="Paypal.phtml" hash="eadc764f6a9d8440f04df259bf36ab84"/><file name="Prepayment.phtml" hash="0d8a04696ef64b8315480f12699e1321"/><file name="Sepa.phtml" hash="bc50c2a8b11b58adda2897c2ee9c4a31"/></dir><dir name="pdf"><file name="Banktransfer.phtml" hash="1740b2c35c218ea67e9afe4f1d48854d"/><file name="Cc.phtml" hash="bf5d23e9c325861730c5b7757547a545"/><file name="Eps.phtml" hash="1740b2c35c218ea67e9afe4f1d48854d"/><file name="Ideal.phtml" hash="1740b2c35c218ea67e9afe4f1d48854d"/><file name="Invoice.phtml" hash="167db82e7f46edc0345fd69fb6389ea1"/><file name="Paypal.phtml" hash="1740b2c35c218ea67e9afe4f1d48854d"/><file name="Prepayment.phtml" hash="167db82e7f46edc0345fd69fb6389ea1"/><file name="Sepa.phtml" hash="20f97790d3ad0f6c72d181f6fddb3957"/></dir></dir></dir><dir name="sales"><dir name="order"><dir name="view"><file name="info.phtml" hash="220bc0304e0a7a83e1f376cf71e00abd"/><dir name="tab"><file name="info.phtml" hash="0b8aa89890110d9d679704ba9dec9ef7"/><file name="transactionoverview.phtml" hash="f1d65fdb3134dbb0ab386b037fa092a9"/></dir></dir></dir></dir><dir name="transaction"><dir name="overview"><dir name="view"><file name="form.phtml" hash="aa1133b686d3c42073a5dfeacbf95aa3"/></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="1a173a55579d079c79f5e2aab45344f1"/><file name="Cc.phtml" hash="ba5b9bcf18fb6d701ff9dfde7f63d931"/><file name="Eps.phtml" hash="2f49491be2afa366acfd749d57efe791"/><file name="Ideal.phtml" hash="0d0737a3550d060691715da3419ec644"/><file name="Invoice.phtml" hash="7131d3b80c8fa7b60a2191325f89965a"/><file name="Paypal.phtml" hash="7f7f045ef3e495ee6132bc9aca904554"/><file name="Prepayment.phtml" hash="7618ef49118726762107a982ef9a7917"/><file name="Sepa.phtml" hash="8b90a427d544605fe9d019b25332a3ec"/></dir><dir name="info"><file name="Banktransfer.phtml" hash="eadc764f6a9d8440f04df259bf36ab84"/><file name="Cc.phtml" hash="c6b2ab25f4703aba805ddb81e038eb70"/><file name="Eps.phtml" hash="eadc764f6a9d8440f04df259bf36ab84"/><file name="Ideal.phtml" hash="eadc764f6a9d8440f04df259bf36ab84"/><file name="Invoice.phtml" hash="0d8a04696ef64b8315480f12699e1321"/><file name="Paypal.phtml" hash="eadc764f6a9d8440f04df259bf36ab84"/><file name="Prepayment.phtml" hash="0d8a04696ef64b8315480f12699e1321"/><file name="Sepa.phtml" hash="bc50c2a8b11b58adda2897c2ee9c4a31"/></dir><dir name="pdf"><file name="Banktransfer.phtml" hash="1740b2c35c218ea67e9afe4f1d48854d"/><file name="Cc.phtml" hash="bf5d23e9c325861730c5b7757547a545"/><file name="Eps.phtml" hash="1740b2c35c218ea67e9afe4f1d48854d"/><file name="Ideal.phtml" hash="1740b2c35c218ea67e9afe4f1d48854d"/><file name="Invoice.phtml" hash="1073c6f0be00bf03a88692e611430b30"/><file name="Paypal.phtml" hash="1740b2c35c218ea67e9afe4f1d48854d"/><file name="Prepayment.phtml" hash="1073c6f0be00bf03a88692e611430b30"/><file name="Sepa.phtml" hash="20f97790d3ad0f6c72d181f6fddb3957"/></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="1a173a55579d079c79f5e2aab45344f1"/><file name="Cc.phtml" hash="d0c34c184e0d019e7956c05b24cae06c"/><file name="Eps.phtml" hash="2f49491be2afa366acfd749d57efe791"/><file name="Ideal.phtml" hash="0d0737a3550d060691715da3419ec644"/><file name="Invoice.phtml" hash="7131d3b80c8fa7b60a2191325f89965a"/><file name="Paypal.phtml" hash="7f7f045ef3e495ee6132bc9aca904554"/><file name="Prepayment.phtml" hash="7618ef49118726762107a982ef9a7917"/><file name="Sepa.phtml" hash="8b90a427d544605fe9d019b25332a3ec"/></dir><dir name="info"><file name="Banktransfer.phtml" hash="eadc764f6a9d8440f04df259bf36ab84"/><file name="Cc.phtml" hash="c6b2ab25f4703aba805ddb81e038eb70"/><file name="Eps.phtml" hash="eadc764f6a9d8440f04df259bf36ab84"/><file name="Ideal.phtml" hash="eadc764f6a9d8440f04df259bf36ab84"/><file name="Invoice.phtml" hash="0d8a04696ef64b8315480f12699e1321"/><file name="Paypal.phtml" hash="eadc764f6a9d8440f04df259bf36ab84"/><file name="Prepayment.phtml" hash="0d8a04696ef64b8315480f12699e1321"/><file name="Sepa.phtml" hash="bc50c2a8b11b58adda2897c2ee9c4a31"/></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="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="1a173a55579d079c79f5e2aab45344f1"/><file name="Cc.phtml" hash="e3c5cbd42363907add362ff3a5081dde"/><file name="Eps.phtml" hash="c8c4a17531b51c5fb78697675ecbcf46"/><file name="Ideal.phtml" hash="04b5f859c573b2ce5207c7d990b5ba99"/><file name="Invoice.phtml" hash="08ae9b72d43cde71b30ab952bbab9557"/><file name="Paypal.phtml" hash="79c580508f2a43dfdeb6766e11ad8754"/><file name="Prepayment.phtml" hash="7618ef49118726762107a982ef9a7917"/><file name="Sepa.phtml" hash="cb41ed3b1e266d78a98fbeb1d4fb4135"/></dir><dir name="info"><file name="Banktransfer.phtml" hash="eadc764f6a9d8440f04df259bf36ab84"/><file name="Cc.phtml" hash="c6b2ab25f4703aba805ddb81e038eb70"/><file name="Eps.phtml" hash="eadc764f6a9d8440f04df259bf36ab84"/><file name="Ideal.phtml" hash="eadc764f6a9d8440f04df259bf36ab84"/><file name="Invoice.phtml" hash="0d8a04696ef64b8315480f12699e1321"/><file name="Paypal.phtml" hash="eadc764f6a9d8440f04df259bf36ab84"/><file name="Prepayment.phtml" hash="0d8a04696ef64b8315480f12699e1321"/><file name="Sepa.phtml" hash="bc50c2a8b11b58adda2897c2ee9c4a31"/></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></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="c42d260b35c96494018fcf3fa1bad5fc"/></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="13572f40d00dd60debcc95131c3b197f"/></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="VI.png" hash="d1dd9a2b12a070c7aeaef44ec5a7647b"/><file name="banktransfer.png" hash="9cdaf6feb2699335e2752309ed18ce39"/><file name="creditcard_cvc.jpg" hash="718a57088dff41d318825fb23dc218d2"/><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="46b0a5c0501c0a0335e0a6370844a545"/><file name="novalnetsepa.js" hash="46b93d86aea915b2de3974a0bb3de372"/></dir></dir><dir name="."><file name="callback_novalnet2magento.php" hash="b84f2adabfb0cc2ed16bba56f682699c"/></dir></target></contents>
33
  <compatible/>
34
  <dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
35
  </package>
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>
skin/frontend/base/default/images/novalnet/T.png ADDED
Binary file
skin/frontend/base/default/images/novalnet/TO.png ADDED
Binary file
skin/frontend/base/default/images/novalnet/creditcard_cvc.jpg DELETED
Binary file
skin/frontend/base/default/images/novalnet/creditcard_cvc.png ADDED
Binary file