Novalnet - Version 5.0.3

Version Notes

- The Payment Direct Debit Direct Debit Germany and Austria offered by the AG Novalnet be replaced from 01.08.2014 by the SEPA Direct Debit Scheme.
- Code Optimization has been done.
- Checked the compatibility for version 1.9.1.0.

Download this release

Release Info

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


Code changes from version 5.0.2 to 5.0.3

Files changed (184) hide show
  1. app/code/community/Novalnet/Payment/Block/Adminhtml/Configuration/Wizard/Config/Form.php +34 -23
  2. app/code/community/Novalnet/Payment/Block/Adminhtml/Configuration/Wizard/Page/Edit.php +12 -7
  3. app/code/community/Novalnet/Payment/Block/Adminhtml/Configuration/Wizard/Page/View.php +20 -12
  4. app/code/community/Novalnet/Payment/Block/Adminhtml/Information.php +8 -7
  5. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order.php +5 -4
  6. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/Grid.php +25 -18
  7. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/Invoice/View.php +35 -11
  8. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View.php +37 -26
  9. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View/Tab/TransactionOverview.php +22 -13
  10. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View/Tab/TransactionStatus.php +44 -36
  11. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Sales.php +6 -4
  12. app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction.php +5 -4
  13. app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction/Grid.php +12 -7
  14. app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction/View.php +14 -8
  15. app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction/View/Form.php +5 -4
  16. app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview.php +4 -3
  17. app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview/Grid.php +18 -12
  18. app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview/View.php +17 -12
  19. app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview/View/Form.php +4 -3
  20. app/code/community/Novalnet/Payment/Block/Adminhtml/Widget.php +7 -5
  21. app/code/community/Novalnet/Payment/Block/Adminhtml/Widget/Grid/Container.php +2 -1
  22. app/code/community/Novalnet/Payment/Block/Adminhtml/Widget/View/Container.php +3 -2
  23. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Cc.php +8 -5
  24. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Ccsecure.php +0 -130
  25. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Elvaustria.php +0 -107
  26. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Elvgerman.php +0 -107
  27. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Ideal.php +6 -22
  28. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Invoice.php +10 -39
  29. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Paypal.php +6 -22
  30. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Phonepayment.php +6 -55
  31. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Prepayment.php +6 -55
  32. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Safetypay.php +0 -64
  33. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Sepa.php +25 -3
  34. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Sofortueberweisung.php +6 -22
  35. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Cc.php +12 -7
  36. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Ccsecure.php +0 -110
  37. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Elvaustria.php +0 -78
  38. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Elvgerman.php +0 -78
  39. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Ideal.php +10 -6
  40. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Invoice.php +14 -8
  41. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Paypal.php +10 -6
  42. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Phonepayment.php +14 -8
  43. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Prepayment.php +14 -8
  44. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Safetypay.php +0 -64
  45. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Sepa.php +12 -7
  46. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Sofortueberweisung.php +10 -6
  47. app/code/community/Novalnet/Payment/Block/Payment/Method/NovalnetRedirect.php +34 -28
  48. app/code/community/Novalnet/Payment/Helper/AssignData.php +175 -265
  49. app/code/community/Novalnet/Payment/Helper/Data.php +270 -165
  50. app/code/community/Novalnet/Payment/Model/Adminhtml/Sales/Order/Create.php +101 -0
  51. app/code/community/Novalnet/Payment/Model/Callback.php +19 -4
  52. app/code/community/Novalnet/Payment/Model/Callbackscript.php +877 -0
  53. app/code/community/Novalnet/Payment/Model/Config.php +48 -74
  54. app/code/community/Novalnet/Payment/Model/Novalnet/Source/Callbacktypes.php +8 -7
  55. app/code/community/Novalnet/Payment/Model/Novalnet/Source/Cctype.php +0 -33
  56. app/code/community/Novalnet/Payment/Model/Novalnet/Source/Sepatype.php +0 -39
  57. app/code/community/Novalnet/Payment/Model/Observer.php +93 -0
  58. app/code/community/Novalnet/Payment/Model/Payment/Method/Abstract.php +927 -774
  59. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetCc.php +2 -2
  60. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetElvaustria.php +0 -35
  61. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetIdeal.php +2 -10
  62. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetInvoice.php +2 -2
  63. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetPaypal.php +2 -10
  64. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetPhonepayment.php +2 -2
  65. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetPrepayment.php +2 -2
  66. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetSafetypay.php +0 -45
  67. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetSecure.php +0 -45
  68. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetSepa.php +2 -2
  69. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetSofortueberweisung.php +2 -10
  70. app/code/community/Novalnet/Payment/Model/Resource/Callback.php +4 -3
  71. app/code/community/Novalnet/Payment/Model/Resource/Callback/Collection.php +4 -3
  72. app/code/community/Novalnet/Payment/Model/Resource/Transactionoverview.php +5 -4
  73. app/code/community/Novalnet/Payment/Model/Resource/Transactionoverview/Collection.php +8 -6
  74. app/code/community/Novalnet/Payment/Model/Resource/Transactionstatus.php +5 -4
  75. app/code/community/Novalnet/Payment/Model/Resource/Transactionstatus/Collection.php +8 -6
  76. app/code/community/Novalnet/Payment/Model/System/Config/Activemethods.php +18 -18
  77. app/code/community/Novalnet/Payment/Model/Transactionoverview.php +8 -21
  78. app/code/community/Novalnet/Payment/Model/Transactionstatus.php +8 -21
  79. app/code/community/Novalnet/Payment/controllers/Adminhtml/Configuration/Wizard/PageController.php +19 -11
  80. app/code/community/Novalnet/Payment/controllers/Adminhtml/InformationController.php +5 -4
  81. app/code/community/Novalnet/Payment/controllers/Adminhtml/NovalnetCcController.php +6 -4
  82. app/code/community/Novalnet/Payment/controllers/Adminhtml/NovalnetSepaController.php +6 -4
  83. app/code/community/Novalnet/Payment/controllers/Adminhtml/Sales/OrderController.php +104 -129
  84. app/code/community/Novalnet/Payment/controllers/Adminhtml/TransactionController.php +16 -12
  85. app/code/community/Novalnet/Payment/controllers/Adminhtml/TransactionoverviewController.php +17 -13
  86. app/code/community/Novalnet/Payment/controllers/GatewayController.php +203 -168
  87. app/code/community/Novalnet/Payment/controllers/NovalnetCcController.php +6 -4
  88. app/code/community/Novalnet/Payment/controllers/NovalnetSepaController.php +6 -4
  89. app/code/community/Novalnet/Payment/etc/adminhtml.xml +67 -19
  90. app/code/community/Novalnet/Payment/etc/config.xml +74 -124
  91. app/code/community/Novalnet/Payment/etc/system.xml +1682 -2387
  92. app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-install-5.0.2.php +0 -106
  93. app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-install-5.0.3.php +151 -0
  94. app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-1.4.0-5.0.0.php +147 -0
  95. app/code/community/Novalnet/Payment/{Model/Payment/Method/NovalnetElvgerman.php → sql/novalnet_setup/mysql4-upgrade-5.0.0-5.0.1.php} +48 -35
  96. app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-5.0.0-5.0.2.php +0 -61
  97. app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-5.0.1-5.0.2.php +31 -19
  98. app/code/community/Novalnet/Payment/{Model/Novalnet/Source/PendingOrder.php → sql/novalnet_setup/mysql4-upgrade-5.0.2-5.0.3.php} +49 -31
  99. app/design/adminhtml/default/default/layout/novalnet/configuration.xml +24 -36
  100. app/design/adminhtml/default/default/template/novalnet/payment/{method/form/Ccsecure.phtml → configuration/container.phtml} +45 -27
  101. app/design/adminhtml/default/default/template/novalnet/payment/{method/form/Safetypay.phtml → configuration/formcontainer.phtml} +12 -1
  102. app/design/adminhtml/default/default/template/novalnet/payment/configuration/store_switcher.phtml +46 -0
  103. app/design/adminhtml/default/default/template/novalnet/payment/configuration/wizard/page/form/container.phtml +0 -12
  104. app/design/adminhtml/default/default/template/novalnet/payment/configuration/wizard/page/store_switcher.phtml +0 -19
  105. app/design/adminhtml/default/default/template/novalnet/payment/configuration/wizard/page/view/container.phtml +0 -19
  106. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Cc.phtml +24 -17
  107. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Ccform.phtml +12 -53
  108. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Elvaustria.phtml +0 -81
  109. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Elvgerman.phtml +0 -105
  110. app/design/{frontend/default/default/template/novalnet/payment/method/form/Safetypay.phtml → adminhtml/default/default/template/novalnet/payment/method/form/Ideal.phtml} +10 -8
  111. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Invoice.phtml +14 -14
  112. app/design/{frontend/base/default/template/novalnet/payment/method/form/Safetypay.phtml → adminhtml/default/default/template/novalnet/payment/method/form/Paypal.phtml} +10 -8
  113. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Phonepayment.phtml +61 -0
  114. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Prepayment.phtml +14 -14
  115. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Sepa.phtml +15 -16
  116. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Sepaform.phtml +5 -51
  117. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Sofortueberweisung.phtml +66 -27
  118. app/design/adminhtml/default/default/template/novalnet/payment/method/form/blank.phtml +9 -9
  119. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Cc.phtml +26 -8
  120. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Ccsecure.phtml +0 -37
  121. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Elvaustria.phtml +0 -37
  122. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Elvgerman.phtml +0 -37
  123. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Ideal.phtml +11 -9
  124. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Invoice.phtml +49 -16
  125. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Paypal.phtml +11 -9
  126. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Phonepayment.phtml +8 -6
  127. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Prepayment.phtml +49 -16
  128. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Safetypay.phtml +0 -37
  129. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Sepa.phtml +30 -14
  130. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Sofortueberweisung.phtml +11 -9
  131. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Cc.phtml +16 -2
  132. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Ideal.phtml +2 -2
  133. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Invoice.phtml +39 -8
  134. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Paypal.phtml +7 -3
  135. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Phonepayment.phtml +2 -2
  136. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Prepayment.phtml +39 -8
  137. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Sepa.phtml +21 -9
  138. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Sofortueberweisung.phtml +2 -2
  139. app/design/adminhtml/default/default/template/novalnet/sales/order/{view/tab/transactionoverview.phtml → transactionoverview.phtml} +3 -4
  140. app/design/adminhtml/default/default/template/novalnet/sales/order/view/info.phtml +0 -165
  141. app/design/adminhtml/default/default/template/novalnet/sales/order/view/tab/info.phtml +0 -16
  142. app/design/adminhtml/default/default/template/novalnet/transaction/overview/view/form.phtml +127 -128
  143. app/design/adminhtml/default/default/template/novalnet/transaction/view/form.phtml +139 -140
  144. app/design/frontend/base/default/template/novalnet/payment/method/form/Cc.phtml +77 -58
  145. app/design/frontend/base/default/template/novalnet/payment/method/form/Ccform.phtml +4 -45
  146. app/design/frontend/base/default/template/novalnet/payment/method/form/Ccsecure.phtml +0 -117
  147. app/design/frontend/base/default/template/novalnet/payment/method/form/Elvaustria.phtml +0 -124
  148. app/design/frontend/base/default/template/novalnet/payment/method/form/Elvgerman.phtml +0 -148
  149. app/design/frontend/base/default/template/novalnet/payment/method/form/Ideal.phtml +11 -9
  150. app/design/frontend/base/default/template/novalnet/payment/method/form/Invoice.phtml +9 -7
  151. app/design/frontend/base/default/template/novalnet/payment/method/form/Paypal.phtml +11 -9
  152. app/design/frontend/base/default/template/novalnet/payment/method/form/Phonepayment.phtml +2 -2
  153. app/design/frontend/base/default/template/novalnet/payment/method/form/Prepayment.phtml +3 -3
  154. app/design/frontend/base/default/template/novalnet/payment/method/form/Sepa.phtml +73 -15
  155. app/design/frontend/base/default/template/novalnet/payment/method/form/Sepaform.phtml +5 -52
  156. app/design/frontend/base/default/template/novalnet/payment/method/form/Sofortueberweisung.phtml +11 -9
  157. app/design/frontend/base/default/template/novalnet/payment/method/info/Cc.phtml +30 -14
  158. app/design/frontend/base/default/template/novalnet/payment/method/info/Elvaustria.phtml +0 -40
  159. app/design/frontend/base/default/template/novalnet/payment/method/info/Elvgerman.phtml +0 -39
  160. app/design/frontend/base/default/template/novalnet/payment/method/info/Ideal.phtml +4 -3
  161. app/design/frontend/base/default/template/novalnet/payment/method/info/Invoice.phtml +44 -27
  162. app/design/frontend/base/default/template/novalnet/payment/method/info/Paypal.phtml +5 -5
  163. app/design/frontend/base/default/template/novalnet/payment/method/info/Phonepayment.phtml +4 -3
  164. app/design/frontend/base/default/template/novalnet/payment/method/info/Prepayment.phtml +44 -26
  165. app/design/frontend/base/default/template/novalnet/payment/method/info/Sepa.phtml +28 -12
  166. app/design/frontend/base/default/template/novalnet/payment/method/info/Sofortueberweisung.phtml +5 -5
  167. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Cc.phtml +43 -0
  168. app/design/{adminhtml/default/default/template/novalnet/payment/method/pdf/Ccsecure.phtml → frontend/base/default/template/novalnet/payment/method/pdf/Ideal.phtml} +2 -2
  169. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Invoice.phtml +66 -0
  170. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Paypal.phtml +34 -0
  171. app/design/{adminhtml/default/default/template/novalnet/payment/method/pdf/Elvaustria.phtml → frontend/base/default/template/novalnet/payment/method/pdf/Phonepayment.phtml} +2 -2
  172. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Prepayment.phtml +66 -0
  173. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Sepa.phtml +45 -0
  174. app/design/{adminhtml/default/default/template/novalnet/payment/method/pdf/Elvgerman.phtml → frontend/base/default/template/novalnet/payment/method/pdf/Sofortueberweisung.phtml} +2 -2
  175. app/design/frontend/default/default/template/novalnet/payment/method/form/Cc.phtml +77 -58
  176. app/design/frontend/default/default/template/novalnet/payment/method/form/Ccform.phtml +4 -45
  177. app/design/frontend/default/default/template/novalnet/payment/method/form/Ccsecure.phtml +0 -117
  178. app/design/frontend/default/default/template/novalnet/payment/method/form/Elvaustria.phtml +0 -124
  179. app/design/frontend/default/default/template/novalnet/payment/method/form/Elvgerman.phtml +0 -148
  180. app/design/frontend/default/default/template/novalnet/payment/method/form/Ideal.phtml +11 -9
  181. app/design/frontend/default/default/template/novalnet/payment/method/form/Invoice.phtml +9 -7
  182. app/design/frontend/default/default/template/novalnet/payment/method/form/Paypal.phtml +11 -9
  183. app/design/frontend/default/default/template/novalnet/payment/method/form/Phonepayment.phtml +2 -2
  184. app/design/frontend/default/default/template/novalnet/payment/method/form/Prepayment.phtml +2 -2
app/code/community/Novalnet/Payment/Block/Adminhtml/Configuration/Wizard/Config/Form.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,14 +23,16 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends Mage_Adminhtml_Block_System_Config_Form {
 
28
 
29
  /**
30
  * @var string
31
  */
32
- protected $groupName = '';
33
 
34
- protected function _prepareLayout() {
 
35
  $return = parent::_prepareLayout();
36
  $this->initForm();
37
  return $return;
@@ -41,7 +42,8 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
41
  *
42
  * @return Mage_Adminhtml_Block_System_Config_Form
43
  */
44
- public function initForm() {
 
45
  $this->_initObjects();
46
  $form = $this->_initForm();
47
 
@@ -49,7 +51,7 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
49
  $this->getSectionCode(), $this->getWebsiteCode(), $this->getStoreCode()
50
  );
51
 
52
- $session = Mage::getSingleton('admin/session');
53
 
54
  if (!$this->getWebsiteCode() && !$this->getStoreCode()) {
55
  $session->setNnStoreConfig(Mage::helper('novalnet_payment')->__('Standard'));
@@ -62,7 +64,7 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
62
  Mage::register('storeConfig', Mage::getModel('core/store')->load($this->getStoreCode())->getId());
63
  $session->setNnStoreConfig($storeConfig);
64
  }
65
-
66
  $groups = $sections->groups;
67
  $groupName = $this->getGroupName();
68
  $group = $groups->$groupName;
@@ -77,7 +79,7 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
77
  $this->initFields($fieldset, $group, $sections);
78
 
79
  $fieldset->addField(
80
- 'page_code', 'hidden', array(
81
  'name' => 'page_code',
82
  'value' => $this->getPageCode()
83
  )
@@ -90,54 +92,61 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
90
  /**
91
  * @return Varien_Data_Form
92
  */
93
- protected function _initForm() {
 
94
  $form = new Varien_Data_Form(
95
- array(
96
- 'id' => 'edit_form',
97
- 'action' => $this->getSaveUrl(),
98
- 'method' => 'post',
99
- 'enctype' => 'multipart/form-data'
100
- )
101
  );
102
  return $form;
103
  }
104
 
105
- protected function getSaveUrl() {
 
106
  return $this->getUrl('*/*/save', array('_current' => true));
107
  }
108
 
109
  /**
110
  * @return string
111
  */
112
- public function getGroupName() {
 
113
  return $this->getConfigPage('group_name');
114
  }
115
 
116
  /**
117
  * @return string
118
  */
119
- public function getPageCode() {
 
120
  return $this->getConfigPage('codes/page');
121
  }
122
 
123
  /**
124
  * @return string
125
  */
126
- public function getSectionCode() {
 
127
  return $this->getConfigPage('codes/section');
128
  }
129
 
130
  /**
131
  * @return string
132
  */
133
- public function getStoreCode() {
 
134
  return $this->getConfigPage('codes/store');
135
  }
136
 
137
  /**
138
  * @return string
139
  */
140
- public function getWebsiteCode() {
 
141
  return $this->getConfigPage('codes/website');
142
  }
143
 
@@ -145,7 +154,8 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
145
  * @param string $path
146
  * @return mixed
147
  */
148
- public function getConfigPage($path) {
 
149
  $config = $this->helperWizard()->getConfigPage();
150
  return $config->getData($path);
151
  }
@@ -153,7 +163,8 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
153
  /**
154
  * @return Novalnet_Payment_Helper_Wizard
155
  */
156
- public function helperWizard() {
 
157
  return Mage::helper('novalnet_payment');
158
  }
159
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends Mage_Adminhtml_Block_System_Config_Form
27
+ {
28
 
29
  /**
30
  * @var string
31
  */
32
+ protected $_groupName = '';
33
 
34
+ protected function _prepareLayout()
35
+ {
36
  $return = parent::_prepareLayout();
37
  $this->initForm();
38
  return $return;
42
  *
43
  * @return Mage_Adminhtml_Block_System_Config_Form
44
  */
45
+ public function initForm()
46
+ {
47
  $this->_initObjects();
48
  $form = $this->_initForm();
49
 
51
  $this->getSectionCode(), $this->getWebsiteCode(), $this->getStoreCode()
52
  );
53
 
54
+ $session = Mage::getSingleton('admin/session');
55
 
56
  if (!$this->getWebsiteCode() && !$this->getStoreCode()) {
57
  $session->setNnStoreConfig(Mage::helper('novalnet_payment')->__('Standard'));
64
  Mage::register('storeConfig', Mage::getModel('core/store')->load($this->getStoreCode())->getId());
65
  $session->setNnStoreConfig($storeConfig);
66
  }
67
+
68
  $groups = $sections->groups;
69
  $groupName = $this->getGroupName();
70
  $group = $groups->$groupName;
79
  $this->initFields($fieldset, $group, $sections);
80
 
81
  $fieldset->addField(
82
+ 'page_code', 'hidden', array(
83
  'name' => 'page_code',
84
  'value' => $this->getPageCode()
85
  )
92
  /**
93
  * @return Varien_Data_Form
94
  */
95
+ protected function _initForm()
96
+ {
97
  $form = new Varien_Data_Form(
98
+ array(
99
+ 'id' => 'edit_form',
100
+ 'action' => $this->getSaveUrl(),
101
+ 'method' => 'post',
102
+ 'enctype' => 'multipart/form-data'
103
+ )
104
  );
105
  return $form;
106
  }
107
 
108
+ protected function getSaveUrl()
109
+ {
110
  return $this->getUrl('*/*/save', array('_current' => true));
111
  }
112
 
113
  /**
114
  * @return string
115
  */
116
+ public function getGroupName()
117
+ {
118
  return $this->getConfigPage('group_name');
119
  }
120
 
121
  /**
122
  * @return string
123
  */
124
+ public function getPageCode()
125
+ {
126
  return $this->getConfigPage('codes/page');
127
  }
128
 
129
  /**
130
  * @return string
131
  */
132
+ public function getSectionCode()
133
+ {
134
  return $this->getConfigPage('codes/section');
135
  }
136
 
137
  /**
138
  * @return string
139
  */
140
+ public function getStoreCode()
141
+ {
142
  return $this->getConfigPage('codes/store');
143
  }
144
 
145
  /**
146
  * @return string
147
  */
148
+ public function getWebsiteCode()
149
+ {
150
  return $this->getConfigPage('codes/website');
151
  }
152
 
154
  * @param string $path
155
  * @return mixed
156
  */
157
+ public function getConfigPage($path)
158
+ {
159
  $config = $this->helperWizard()->getConfigPage();
160
  return $config->getData($path);
161
  }
163
  /**
164
  * @return Novalnet_Payment_Helper_Wizard
165
  */
166
+ public function helperWizard()
167
+ {
168
  return Mage::helper('novalnet_payment');
169
  }
170
 
app/code/community/Novalnet/Payment/Block/Adminhtml/Configuration/Wizard/Page/Edit.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,9 +23,11 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Page_Edit extends Mage_Adminhtml_Block_Widget_Form_Container {
 
28
 
29
- public function __construct() {
 
30
  $this->_mode = '';
31
  $this->_blockGroup = 'novalnet_payment';
32
  $this->_controller = 'adminhtml_configuration_wizard_page_edit';
@@ -49,7 +50,8 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Page_Edit extends Ma
49
  ));
50
  }
51
 
52
- public function getHeaderText() {
 
53
  $session = Mage::getSingleton('admin/session');
54
  $storeConfig = $session->getNnStoreConfig();
55
 
@@ -59,17 +61,20 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Page_Edit extends Ma
59
  return $text;
60
  }
61
 
62
- public function getBackUrl() {
 
63
  $url = $this->helperWizard()->getPreviousPageUrlAsString();
64
  return $this->getUrl($url, array('_current' => true));
65
  }
66
 
67
- public function getConfigPage($path) {
 
68
  $config = $this->helperWizard()->getConfigPage();
69
  return $config->getData($path);
70
  }
71
 
72
- public function helperWizard() {
 
73
  return Mage::helper('novalnet_payment');
74
  }
75
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Page_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
27
+ {
28
 
29
+ public function __construct()
30
+ {
31
  $this->_mode = '';
32
  $this->_blockGroup = 'novalnet_payment';
33
  $this->_controller = 'adminhtml_configuration_wizard_page_edit';
50
  ));
51
  }
52
 
53
+ public function getHeaderText()
54
+ {
55
  $session = Mage::getSingleton('admin/session');
56
  $storeConfig = $session->getNnStoreConfig();
57
 
61
  return $text;
62
  }
63
 
64
+ public function getBackUrl()
65
+ {
66
  $url = $this->helperWizard()->getPreviousPageUrlAsString();
67
  return $this->getUrl($url, array('_current' => true));
68
  }
69
 
70
+ public function getConfigPage($path)
71
+ {
72
  $config = $this->helperWizard()->getConfigPage();
73
  return $config->getData($path);
74
  }
75
 
76
+ public function helperWizard()
77
+ {
78
  return Mage::helper('novalnet_payment');
79
  }
80
 
app/code/community/Novalnet/Payment/Block/Adminhtml/Configuration/Wizard/Page/View.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,9 +23,11 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Page_View extends Mage_Adminhtml_Block_Widget_View_Container {
 
28
 
29
- public function __construct() {
 
30
  $this->_blockGroup = 'novalnet_payment';
31
  $this->_controller = 'adminhtml_configuration_wizard_page';
32
  $this->_headerText = Mage::helper('novalnet_payment')->__('Novalnet Payment Configuration');
@@ -41,7 +42,8 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Page_View extends Ma
41
  ));
42
  }
43
 
44
- public function getViewHtml() {
 
45
  $html = '';
46
  foreach ($this->getSortedChildren() as $childName) {
47
 
@@ -52,27 +54,33 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Page_View extends Ma
52
  return $html;
53
  }
54
 
55
- protected function getNextUrl() {
 
56
  $url = $this->helperWizard()->getNextPageUrlAsString();
57
  return $this->getUrl($url, array('_current' => true));
58
  }
59
 
60
- public function getHeaderText() {
 
61
  $headerText = $this->getConfigPage('header_text');
62
  $text = Mage::helper('novalnet_payment')->__($headerText);
63
  return $text;
64
  }
65
 
66
- public function getConfigPage($path) {
 
67
  $config = $this->helperWizard()->getConfigPage();
68
  return $config->getData($path);
69
  }
70
 
71
- public function helperWizard() {
 
72
  return Mage::helper('novalnet_payment');
73
  }
74
-
75
- protected function _prepareLayout() {
76
- $this->unsetChild('', '');
77
- }
 
 
78
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Page_View extends Mage_Adminhtml_Block_Widget_View_Container
27
+ {
28
 
29
+ public function __construct()
30
+ {
31
  $this->_blockGroup = 'novalnet_payment';
32
  $this->_controller = 'adminhtml_configuration_wizard_page';
33
  $this->_headerText = Mage::helper('novalnet_payment')->__('Novalnet Payment Configuration');
42
  ));
43
  }
44
 
45
+ public function getViewHtml()
46
+ {
47
  $html = '';
48
  foreach ($this->getSortedChildren() as $childName) {
49
 
54
  return $html;
55
  }
56
 
57
+ protected function getNextUrl()
58
+ {
59
  $url = $this->helperWizard()->getNextPageUrlAsString();
60
  return $this->getUrl($url, array('_current' => true));
61
  }
62
 
63
+ public function getHeaderText()
64
+ {
65
  $headerText = $this->getConfigPage('header_text');
66
  $text = Mage::helper('novalnet_payment')->__($headerText);
67
  return $text;
68
  }
69
 
70
+ public function getConfigPage($path)
71
+ {
72
  $config = $this->helperWizard()->getConfigPage();
73
  return $config->getData($path);
74
  }
75
 
76
+ public function helperWizard()
77
+ {
78
  return Mage::helper('novalnet_payment');
79
  }
80
+
81
+ protected function _prepareLayout()
82
+ {
83
+ $this->unsetChild('', '');
84
+ }
85
+
86
  }
app/code/community/Novalnet/Payment/Block/Adminhtml/Information.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -26,9 +25,10 @@
26
  */
27
  class Novalnet_Payment_Block_Adminhtml_Information extends Mage_Adminhtml_Block_Template
28
  {
29
- /**
30
- * Assign the template to load the novalnet magento module updates
31
- *
 
32
  */
33
  public function _construct()
34
  {
@@ -36,14 +36,15 @@ class Novalnet_Payment_Block_Adminhtml_Information extends Mage_Adminhtml_Block_
36
  }
37
 
38
  /**
39
- * Set the Novalnet Magento module path
40
- *
41
  * @return string
42
  */
43
  public function getNovalnetUrl()
44
  {
45
- $protocol = Mage::app()->getStore()->isCurrentlySecure() ? 'https' : 'http';
46
  $url = $this->escapeUrl($protocol . '://www.novalnet.de/modul/magento-payment-module');
47
  return $url;
48
  }
 
49
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Information extends Mage_Adminhtml_Block_Template
27
  {
28
+
29
+ /**
30
+ * Assign the template to load the novalnet magento module updates
31
+ *
32
  */
33
  public function _construct()
34
  {
36
  }
37
 
38
  /**
39
+ * Set the Novalnet Magento module path
40
+ *
41
  * @return string
42
  */
43
  public function getNovalnetUrl()
44
  {
45
+ $protocol = Mage::app()->getStore()->isCurrentlySecure() ? 'https' : 'http';
46
  $url = $this->escapeUrl($protocol . '://www.novalnet.de/modul/magento-payment-module');
47
  return $url;
48
  }
49
+
50
  }
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Sales_Order extends Novalnet_Payment_Block_Adminhtml_Widget_Grid_Container {
 
28
 
29
  /**
30
  *
31
  */
32
- public function __construct() {
 
33
  parent::__construct();
34
 
35
  $this->_blockGroup = 'novalnet_payment';
@@ -39,4 +40,4 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order extends Novalnet_Payment_Bloc
39
  $this->removeButton('add');
40
  }
41
 
42
- }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Sales_Order extends Novalnet_Payment_Block_Adminhtml_Widget_Grid_Container
27
+ {
28
 
29
  /**
30
  *
31
  */
32
+ public function __construct()
33
+ {
34
  parent::__construct();
35
 
36
  $this->_blockGroup = 'novalnet_payment';
40
  $this->removeButton('add');
41
  }
42
 
43
+ }
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/Grid.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,14 +23,16 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_Block_Widget_Grid {
 
28
 
29
  var $novalnetPayments = array();
30
 
31
  /**
32
  *
33
  */
34
- public function __construct() {
 
35
  parent::__construct();
36
  $this->setId('novalnet_sales_order_grid');
37
  $this->setUseAjax(true);
@@ -58,23 +59,25 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_B
58
  *
59
  * @return string
60
  */
61
- protected function _getCollectionClass() {
 
62
  return 'sales/order_grid_collection';
63
  }
64
 
65
  /**
66
  * @return Mage_Adminhtml_Block_Widget_Grid
67
  */
68
- protected function _prepareCollection() {
 
69
  $collection = Mage::getResourceModel($this->_getCollectionClass());
70
- if (version_compare(Mage::helper('novalnet_payment')->getMagentoVersion(), '1.6.0.0', '>')) {
71
- $collection->join(array('payment' => 'sales/order_payment'), 'main_table.entity_id = parent_id', 'method')
72
- ->getSelect()->where("`payment`.`method` like '%novalnet%'");
73
- }else{
74
- $flat_order_payment = $collection->getTable('sales/order_payment');
75
- $collection->getSelect()->join(array('payment' => $flat_order_payment), 'main_table.entity_id = payment.parent_id', 'method')
76
- ->where("`payment`.`method` like '%novalnet%'");
77
- }
78
  //$collection->load(true); //debugging
79
  $this->setCollection($collection);
80
  return parent::_prepareCollection();
@@ -83,7 +86,8 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_B
83
  /**
84
  * @return Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid
85
  */
86
- public function _prepareColumns() {
 
87
  $this->addColumn('real_order_id', array(
88
  'header' => Mage::helper('sales')->__('Order #'),
89
  'width' => '80px',
@@ -180,7 +184,8 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_B
180
  /**
181
  * @return Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid
182
  */
183
- protected function _prepareMassaction() {
 
184
  $this->setMassactionIdField('entity_id');
185
  $this->getMassactionBlock()->setFormFieldName('order_ids');
186
  $this->getMassactionBlock()->setUseSelectAll(false);
@@ -238,15 +243,17 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_B
238
  * @param $row
239
  * @return string
240
  */
241
- public function getRowUrl($row) {
 
242
  return $this->getUrl('adminhtml/sales_order/view', array('order_id' => $row->getId()));
243
  }
244
 
245
  /**
246
  * @return string
247
  */
248
- public function getGridUrl() {
 
249
  return $this->getUrl('*/*/grid', array('_current' => true));
250
  }
251
 
252
- }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_Block_Widget_Grid
27
+ {
28
 
29
  var $novalnetPayments = array();
30
 
31
  /**
32
  *
33
  */
34
+ public function __construct()
35
+ {
36
  parent::__construct();
37
  $this->setId('novalnet_sales_order_grid');
38
  $this->setUseAjax(true);
59
  *
60
  * @return string
61
  */
62
+ protected function _getCollectionClass()
63
+ {
64
  return 'sales/order_grid_collection';
65
  }
66
 
67
  /**
68
  * @return Mage_Adminhtml_Block_Widget_Grid
69
  */
70
+ protected function _prepareCollection()
71
+ {
72
  $collection = Mage::getResourceModel($this->_getCollectionClass());
73
+ if (version_compare(Mage::helper('novalnet_payment')->getMagentoVersion(), '1.6.0.0', '>')) {
74
+ $collection->join(array('payment' => 'sales/order_payment'), 'main_table.entity_id = parent_id', 'method')
75
+ ->getSelect()->where("`payment`.`method` like '%novalnet%'");
76
+ } else {
77
+ $flatOrderPayment = $collection->getTable('sales/order_payment');
78
+ $collection->getSelect()->join(array('payment' => $flatOrderPayment), 'main_table.entity_id = payment.parent_id', 'method')
79
+ ->where("`payment`.`method` like '%novalnet%'");
80
+ }
81
  //$collection->load(true); //debugging
82
  $this->setCollection($collection);
83
  return parent::_prepareCollection();
86
  /**
87
  * @return Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid
88
  */
89
+ public function _prepareColumns()
90
+ {
91
  $this->addColumn('real_order_id', array(
92
  'header' => Mage::helper('sales')->__('Order #'),
93
  'width' => '80px',
184
  /**
185
  * @return Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid
186
  */
187
+ protected function _prepareMassaction()
188
+ {
189
  $this->setMassactionIdField('entity_id');
190
  $this->getMassactionBlock()->setFormFieldName('order_ids');
191
  $this->getMassactionBlock()->setUseSelectAll(false);
243
  * @param $row
244
  * @return string
245
  */
246
+ public function getRowUrl($row)
247
+ {
248
  return $this->getUrl('adminhtml/sales_order/view', array('order_id' => $row->getId()));
249
  }
250
 
251
  /**
252
  * @return string
253
  */
254
+ public function getGridUrl()
255
+ {
256
  return $this->getUrl('*/*/grid', array('_current' => true));
257
  }
258
 
259
+ }
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/Invoice/View.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,19 +23,44 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
 
 
27
 
28
- class Novalnet_Payment_Block_Adminhtml_Sales_Order_Invoice_View extends Mage_Adminhtml_Block_Sales_Order_Invoice_View {
29
-
30
- public function __construct() {
31
  parent::__construct();
32
-
33
  $payment = $this->getInvoice()->getOrder()->getPayment();
34
- $paymentMethod = $payment->getMethodInstance()->getCode();
 
35
 
36
- if (preg_match("/novalnet/i", $paymentMethod)) {
37
- if ($paymentMethod == Novalnet_Payment_Model_Config::NN_SEPA) {
38
- $this->_removeButton('capture');
39
- }
40
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
41
  }
 
42
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Sales_Order_Invoice_View extends Mage_Adminhtml_Block_Sales_Order_Invoice_View
27
+ {
28
 
29
+ public function __construct()
30
+ {
 
31
  parent::__construct();
 
32
  $payment = $this->getInvoice()->getOrder()->getPayment();
33
+ $paymentCode = $payment->getMethodInstance()->getCode();
34
+ $helper = Mage::helper('novalnet_payment');
35
 
36
+ if (preg_match("/novalnet/i", $paymentCode) && $paymentCode == Novalnet_Payment_Model_Config::NN_INVOICE) {
37
+ $this->_removeButton('print');
38
+ $this->_removeButton('capture');
39
+ $baseGrandTotal = $payment->getOrder()->getBaseGrandTotal();
40
+ $orderPayment = $this->getInvoice()->getOrder()->getPayment();
41
+ $orderId = $this->getInvoice()->getOrder()->getIncrementId();
42
+ $refundedAmount = $helper->getFormatedAmount($orderPayment->getAmountRefunded());
43
+ $callbackTrans = $helper->loadCallbackValue($orderId);
44
+ $callbackValue = $callbackTrans && $callbackTrans->getCallbackAmount()
45
+ != NULL ? $callbackTrans->getCallbackAmount() : '';
46
+ if ($callbackValue && $callbackValue > (string) $refundedAmount && $baseGrandTotal
47
+ != $orderPayment->getAmountRefunded()) {
48
+ $this->_addButton('capture', array(// capture?
49
+ 'label' => Mage::helper('sales')->__('Credit Memo'),
50
+ 'class' => 'go',
51
+ 'onclick' => 'setLocation(\'' . $this->getCreditMemoUrl() . '\')'
52
+ )
53
+ );
54
+ }
55
+ if ($this->getInvoice()->getId()) {
56
+ $this->_addButton('print', array(
57
+ 'label' => Mage::helper('sales')->__('Print'),
58
+ 'class' => 'save',
59
+ 'onclick' => 'setLocation(\'' . $this->getPrintUrl() . '\')'
60
+ )
61
+ );
62
+ }
63
+ }
64
  }
65
+
66
  }
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,9 +23,11 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Sales_Order_View extends Mage_Adminhtml_Block_Sales_Order_View {
 
28
 
29
- public function __construct() {
 
30
 
31
  parent::__construct();
32
 
@@ -35,37 +36,47 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View extends Mage_Adminhtml_B
35
  $paymentMethod = $payment->getMethodInstance()->getCode();
36
  $helper = Mage::helper('novalnet_payment');
37
  $getTid = $helper->makeValidNumber($payment->getLastTransId());
38
- $sepaType = $helper->getModel('novalnetSepa')->_getConfigData('sepatypes');
39
  if (preg_match("/novalnet/i", $paymentMethod)) {
40
  $this->_removeButton('order_creditmemo');
41
-
42
- if ($paymentMethod == Novalnet_Payment_Model_Config::NN_SEPA) {
43
- $this->_removeButton('Capture');
44
- }
45
- $getTransactionStatus = $helper->loadTransactionStatus($getTid);
46
 
47
- $this->_updateButton('order_invoice', 'label', Mage::helper('novalnet_payment')->__('Capture'));
 
 
48
 
49
- if (in_array($paymentMethod, array(Novalnet_Payment_Model_Config::NN_PAYPAL, Novalnet_Payment_Model_Config::NN_SEPA, Novalnet_Payment_Model_Config::NN_TELEPHONE))) {
50
- $this->_removeButton('order_invoice');
51
- }
 
52
 
53
- if ($getTransactionStatus->getTransactionStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED || ($paymentMethod == Novalnet_Payment_Model_Config::NN_SEPA))
54
- $this->_removeButton('void_payment');
 
55
 
56
- if ($getTransactionStatus->getTransactionStatus() == Novalnet_Payment_Model_Config::PAYMENT_VOID_STATUS)
57
- $this->_removeButton('order_invoice');
 
58
 
59
- if (in_array($paymentMethod, array(Novalnet_Payment_Model_Config::NN_INVOICE, Novalnet_Payment_Model_Config::NN_PREPAYMENT))) {
60
- $this->_removeButton('order_invoice');
61
- if($getTransactionStatus->getTransactionStatus() == 91) {
62
- $this->_addButton('novalnet_confirm', array(
63
- 'label' => 'Novalnet Capture',
64
- 'onclick' => 'setLocation(\'' . $this->getUrl('*/*/novalnetconfirm') . '\')',
65
- ), 0);
66
- }
67
- }
 
68
 
 
 
 
 
 
 
 
 
 
69
  }
70
  }
71
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View extends Mage_Adminhtml_Block_Sales_Order_View
27
+ {
28
 
29
+ public function __construct()
30
+ {
31
 
32
  parent::__construct();
33
 
36
  $paymentMethod = $payment->getMethodInstance()->getCode();
37
  $helper = Mage::helper('novalnet_payment');
38
  $getTid = $helper->makeValidNumber($payment->getLastTransId());
39
+
40
  if (preg_match("/novalnet/i", $paymentMethod)) {
41
  $this->_removeButton('order_creditmemo');
 
 
 
 
 
42
 
43
+ $getTransactionStatus = $helper->loadTransactionStatus($getTid);
44
+
45
+ $this->_updateButton('order_invoice', 'label', Mage::helper('novalnet_payment')->__('Capture'));
46
 
47
+ if (in_array($paymentMethod, array(Novalnet_Payment_Model_Config::NN_PAYPAL,
48
+ Novalnet_Payment_Model_Config::NN_TELEPHONE))) {
49
+ $this->_removeButton('order_invoice');
50
+ }
51
 
52
+ if ($getTransactionStatus->getTransactionStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
53
+ $this->_removeButton('void_payment');
54
+ }
55
 
56
+ if ($getTransactionStatus->getTransactionStatus() == Novalnet_Payment_Model_Config::PAYMENT_VOID_STATUS) {
57
+ $this->_removeButton('order_invoice');
58
+ }
59
 
60
+ if (in_array($paymentMethod, array(Novalnet_Payment_Model_Config::NN_INVOICE,
61
+ Novalnet_Payment_Model_Config::NN_PREPAYMENT))) {
62
+ $this->_removeButton('order_invoice');
63
+ if ($getTransactionStatus->getTransactionStatus() == 91) {
64
+ $this->_addButton('novalnet_confirm', array(
65
+ 'label' => Mage::helper('novalnet_payment')->__('Novalnet Capture'),
66
+ 'onclick' => 'setLocation(\'' . $this->getUrl('*/*/novalnetconfirm') . '\')',
67
+ ), 0);
68
+ }
69
+ }
70
 
71
+ if ($order->canCancel() && $getTransactionStatus->getTransactionStatus()
72
+ < Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
73
+ $this->_removeButton('void_payment');
74
+ $message = Mage::helper('sales')->__('Are you sure you want to void the payment?');
75
+ $this->addButton('void_payment', array(
76
+ 'label' => Mage::helper('sales')->__('Void'),
77
+ 'onclick' => "confirmSetLocation('{$message}', '{$this->getVoidPaymentUrl()}')",
78
+ ));
79
+ }
80
  }
81
  }
82
 
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View/Tab/TransactionOverview.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,44 +23,53 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionOverview extends Mage_Adminhtml_Block_Widget implements Mage_Adminhtml_Block_Widget_Tab_Interface {
 
 
28
 
29
- public function __construct() {
30
- //parent::__construct();
31
- $this->setTemplate('novalnet/sales/order/view/tab/transactionoverview.phtml');
32
  }
33
 
34
- public function getTabLabel() {
 
35
  return Mage::helper('novalnet_payment')->__('Novalnet - Transaction Log');
36
  }
37
 
38
- public function getTabTitle() {
 
39
  return Mage::helper('novalnet_payment')->__('Novalnet - Transaction Log');
40
  }
41
 
42
- public function canShowTab() {
 
43
  return true;
44
  }
45
 
46
- public function isHidden() {
 
47
  return false;
48
  }
49
 
50
- public function getTabClass() {
 
51
  return 'ajax novalnet-widget-tab';
52
  }
53
 
54
  /**
55
  * @return Mage_Sales_Model_Order
56
  */
57
- public function getOrder() {
 
58
  return Mage::registry('current_order');
59
  }
60
 
61
  /**
62
  * @return Novalnet_Payment_Model_TransactionOverview
63
  */
64
- public function getTransactionOverview() {
 
65
  if (!Mage::registry('novalnet_payment_transactionoverview_collection')) {
66
  $order = $this->getOrder();
67
 
@@ -77,7 +85,8 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionOverview
77
  *
78
  * @return Novalnet_Payment_Helper_Data
79
  */
80
- protected function helperNovalnetPayment() {
 
81
  return Mage::helper('novalnet_payment');
82
  }
83
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionOverview extends Mage_Adminhtml_Block_Widget
27
+ implements Mage_Adminhtml_Block_Widget_Tab_Interface
28
+ {
29
 
30
+ public function __construct()
31
+ {
32
+ $this->setTemplate('novalnet/sales/order/transactionoverview.phtml');
33
  }
34
 
35
+ public function getTabLabel()
36
+ {
37
  return Mage::helper('novalnet_payment')->__('Novalnet - Transaction Log');
38
  }
39
 
40
+ public function getTabTitle()
41
+ {
42
  return Mage::helper('novalnet_payment')->__('Novalnet - Transaction Log');
43
  }
44
 
45
+ public function canShowTab()
46
+ {
47
  return true;
48
  }
49
 
50
+ public function isHidden()
51
+ {
52
  return false;
53
  }
54
 
55
+ public function getTabClass()
56
+ {
57
  return 'ajax novalnet-widget-tab';
58
  }
59
 
60
  /**
61
  * @return Mage_Sales_Model_Order
62
  */
63
+ public function getOrder()
64
+ {
65
  return Mage::registry('current_order');
66
  }
67
 
68
  /**
69
  * @return Novalnet_Payment_Model_TransactionOverview
70
  */
71
+ public function getTransactionOverview()
72
+ {
73
  if (!Mage::registry('novalnet_payment_transactionoverview_collection')) {
74
  $order = $this->getOrder();
75
 
85
  *
86
  * @return Novalnet_Payment_Helper_Data
87
  */
88
+ protected function helperNovalnetPayment()
89
+ {
90
  return Mage::helper('novalnet_payment');
91
  }
92
 
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View/Tab/TransactionStatus.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,9 +23,12 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus extends Mage_Adminhtml_Block_Widget_Grid implements Mage_Adminhtml_Block_Widget_Tab_Interface {
 
 
28
 
29
- public function __construct() {
 
30
  parent::__construct();
31
  $this->setId('novalnet_payment_block_adminhtml_sales_order_view_tab_transactionstatus');
32
  $this->setDefaultSort('created_at');
@@ -36,30 +38,36 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus ex
36
  $this->setSkipGenerateContent(true);
37
  }
38
 
39
- public function getTabLabel() {
 
40
  return Mage::helper('novalnet_payment')->__('Novalnet - Transaction Overview');
41
  }
42
 
43
- public function getTabTitle() {
 
44
  return Mage::helper('novalnet_payment')->__('Novalnet - Transaction Overview');
45
  }
46
 
47
- public function canShowTab() {
 
48
  return true;
49
  }
50
 
51
- public function isHidden() {
 
52
  return false;
53
  }
54
 
55
- public function getTabClass() {
 
56
  return 'ajax novalnet-widget-tab';
57
  }
58
 
59
  /**
60
  * @return Mage_Sales_Model_Order
61
  */
62
- public function getOrder() {
 
63
  return Mage::registry('current_order');
64
  }
65
 
@@ -67,28 +75,32 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus ex
67
  * @return Novalnet_Payment_Tab
68
  * Order left column Tab
69
  */
70
- public function getTabUrl() {
 
71
  return $this->getUrl('novalnet_payment/adminhtml_sales_order/transactionStatusGrid', array(
72
  '_current' => true
73
  )
74
  );
75
  }
76
 
77
- public function getGridUrl() {
 
78
  return $this->getUrl('novalnet_payment/adminhtml_sales_order/transactionStatusGrid', array(
79
  '_current' => true
80
  )
81
  );
82
  }
83
 
84
- public function getRowUrl($row) {
 
85
  return $this->getUrl('novalnet_payment/adminhtml_transaction/view', array(
86
  'nntxn_id' => $row->getId()
87
  )
88
  );
89
  }
90
 
91
- protected function _prepareCollection() {
 
92
  $collection = $this->getTransactionStatusCollection();
93
  $this->setCollection($collection);
94
  return parent::_prepareCollection();
@@ -97,72 +109,67 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus ex
97
  /**
98
  * @return Novalnet_Payment_Model_TransactionStatus
99
  */
100
- public function getTransactionStatusCollection() {
 
101
  $order = $this->getOrder();
102
 
103
- // @var $transactionStatusCollection Novalnet_Payment_Model_TransactionStatus_Collection
104
- $transactionStatusCollection = $this->helperNovalnetPayment()->getModelTransactionStatus()->getCollection();
105
- $transactionStatusCollection->getByOrder($order);
106
- return $transactionStatusCollection;
107
  }
108
 
109
- protected function _prepareColumns() {
110
- $helperNovalnetPayment = $this->helperNovalnetPayment();
 
111
  $this->setColumn('txid', array(
112
- 'header' => $helperNovalnetPayment->__('Transaction no'),
113
  'width' => '200px',
114
  'type' => 'text',
115
  'index' => 'transaction_no',
116
  )
117
  );
118
  $this->setColumn('order_id', array(
119
- 'header' => $helperNovalnetPayment->__('Order no'),
120
  'width' => '200px',
121
  'type' => 'text',
122
  'index' => 'order_id',
123
  )
124
  );
125
  $this->setColumn('transaction_status', array(
126
- 'header' => $helperNovalnetPayment->__('Transaction Status'),
127
  'width' => '200px',
128
  'type' => 'text',
129
  'index' => 'transaction_status',
130
  )
131
  );
132
  $this->setColumn('ncno', array(
133
- 'header' => $helperNovalnetPayment->__('NC No'),
134
  'width' => '200px',
135
  'type' => 'text',
136
  'index' => 'nc_no',
137
  )
138
  );
139
  $this->setColumn('customer_id', array(
140
- 'header' => $helperNovalnetPayment->__('Customer ID'),
141
  'width' => '200px',
142
  'type' => 'text',
143
  'index' => 'customer_id',
144
  )
145
  );
146
  $this->setColumn('store_id', array(
147
- 'header' => $helperNovalnetPayment->__('Store ID'),
148
  'width' => '200px',
149
  'type' => 'text',
150
  'index' => 'store_id',
151
  )
152
  );
153
- /* $this->setColumn('shop_url',
154
- array(
155
- 'header' => $helperNovalnetPayment->__('Shop URL'),
156
- 'width' => '200px',
157
- 'type' => 'text',
158
- 'index' => 'shop_url',
159
- )
160
- ); */
161
 
162
  return parent::_prepareColumns();
163
  }
164
 
165
- private function setColumn($field, $fieldColumnMap) {
 
166
  $this->addColumn($field, $fieldColumnMap);
167
  }
168
 
@@ -170,7 +177,8 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus ex
170
  *
171
  * @return Novalnet_Payment_Helper_Data
172
  */
173
- protected function helperNovalnetPayment() {
 
174
  return Mage::helper('novalnet_payment');
175
  }
176
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus extends Mage_Adminhtml_Block_Widget_Grid
27
+ implements Mage_Adminhtml_Block_Widget_Tab_Interface
28
+ {
29
 
30
+ public function __construct()
31
+ {
32
  parent::__construct();
33
  $this->setId('novalnet_payment_block_adminhtml_sales_order_view_tab_transactionstatus');
34
  $this->setDefaultSort('created_at');
38
  $this->setSkipGenerateContent(true);
39
  }
40
 
41
+ public function getTabLabel()
42
+ {
43
  return Mage::helper('novalnet_payment')->__('Novalnet - Transaction Overview');
44
  }
45
 
46
+ public function getTabTitle()
47
+ {
48
  return Mage::helper('novalnet_payment')->__('Novalnet - Transaction Overview');
49
  }
50
 
51
+ public function canShowTab()
52
+ {
53
  return true;
54
  }
55
 
56
+ public function isHidden()
57
+ {
58
  return false;
59
  }
60
 
61
+ public function getTabClass()
62
+ {
63
  return 'ajax novalnet-widget-tab';
64
  }
65
 
66
  /**
67
  * @return Mage_Sales_Model_Order
68
  */
69
+ public function getOrder()
70
+ {
71
  return Mage::registry('current_order');
72
  }
73
 
75
  * @return Novalnet_Payment_Tab
76
  * Order left column Tab
77
  */
78
+ public function getTabUrl()
79
+ {
80
  return $this->getUrl('novalnet_payment/adminhtml_sales_order/transactionStatusGrid', array(
81
  '_current' => true
82
  )
83
  );
84
  }
85
 
86
+ public function getGridUrl()
87
+ {
88
  return $this->getUrl('novalnet_payment/adminhtml_sales_order/transactionStatusGrid', array(
89
  '_current' => true
90
  )
91
  );
92
  }
93
 
94
+ public function getRowUrl($row)
95
+ {
96
  return $this->getUrl('novalnet_payment/adminhtml_transaction/view', array(
97
  'nntxn_id' => $row->getId()
98
  )
99
  );
100
  }
101
 
102
+ protected function _prepareCollection()
103
+ {
104
  $collection = $this->getTransactionStatusCollection();
105
  $this->setCollection($collection);
106
  return parent::_prepareCollection();
109
  /**
110
  * @return Novalnet_Payment_Model_TransactionStatus
111
  */
112
+ public function getTransactionStatusCollection()
113
+ {
114
  $order = $this->getOrder();
115
 
116
+ // @var $transStatCollection Novalnet_Payment_Model_TransactionStatus_Collection
117
+ $transStatCollection = $this->helperNovalnetPayment()->getModelTransactionStatus()->getCollection();
118
+ $transStatCollection->getByOrder($order);
119
+ return $transStatCollection;
120
  }
121
 
122
+ protected function _prepareColumns()
123
+ {
124
+ $helperNnPayment = $this->helperNovalnetPayment();
125
  $this->setColumn('txid', array(
126
+ 'header' => $helperNnPayment->__('Transaction no'),
127
  'width' => '200px',
128
  'type' => 'text',
129
  'index' => 'transaction_no',
130
  )
131
  );
132
  $this->setColumn('order_id', array(
133
+ 'header' => $helperNnPayment->__('Order no'),
134
  'width' => '200px',
135
  'type' => 'text',
136
  'index' => 'order_id',
137
  )
138
  );
139
  $this->setColumn('transaction_status', array(
140
+ 'header' => $helperNnPayment->__('Transaction Status'),
141
  'width' => '200px',
142
  'type' => 'text',
143
  'index' => 'transaction_status',
144
  )
145
  );
146
  $this->setColumn('ncno', array(
147
+ 'header' => $helperNnPayment->__('NC No'),
148
  'width' => '200px',
149
  'type' => 'text',
150
  'index' => 'nc_no',
151
  )
152
  );
153
  $this->setColumn('customer_id', array(
154
+ 'header' => $helperNnPayment->__('Customer ID'),
155
  'width' => '200px',
156
  'type' => 'text',
157
  'index' => 'customer_id',
158
  )
159
  );
160
  $this->setColumn('store_id', array(
161
+ 'header' => $helperNnPayment->__('Store ID'),
162
  'width' => '200px',
163
  'type' => 'text',
164
  'index' => 'store_id',
165
  )
166
  );
 
 
 
 
 
 
 
 
167
 
168
  return parent::_prepareColumns();
169
  }
170
 
171
+ private function setColumn($field, $fieldColumnMap)
172
+ {
173
  $this->addColumn($field, $fieldColumnMap);
174
  }
175
 
177
  *
178
  * @return Novalnet_Payment_Helper_Data
179
  */
180
+ protected function helperNovalnetPayment()
181
+ {
182
  return Mage::helper('novalnet_payment');
183
  }
184
 
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Sales.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,9 +23,11 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Sales_Sales extends Mage_Adminhtml_Block_Widget_Grid_Container {
 
28
 
29
- public function __construct() {
 
30
  $this->_controller = 'report_sales_sales';
31
  $this->_headerText = Mage::helper('reports')->__('Total Ordered Report');
32
  parent::__construct();
@@ -38,7 +39,8 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Sales extends Mage_Adminhtml_Block_
38
  ));
39
  }
40
 
41
- public function getFilterUrl() {
 
42
  $this->getRequest()->setParam('filter', null);
43
  return $this->getUrl('*/*/sales', array('_current' => true));
44
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Sales_Sales extends Mage_Adminhtml_Block_Widget_Grid_Container
27
+ {
28
 
29
+ public function __construct()
30
+ {
31
  $this->_controller = 'report_sales_sales';
32
  $this->_headerText = Mage::helper('reports')->__('Total Ordered Report');
33
  parent::__construct();
39
  ));
40
  }
41
 
42
+ public function getFilterUrl()
43
+ {
44
  $this->getRequest()->setParam('filter', null);
45
  return $this->getUrl('*/*/sales', array('_current' => true));
46
  }
app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,13 +23,15 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Transaction extends Mage_Adminhtml_Block_Widget_Grid_Container {
 
28
 
29
  /**
30
  * Initialize the transaction grid block
31
- *
32
  */
33
- public function __construct() {
 
34
  $this->_blockGroup = 'novalnet_payment';
35
  $this->_controller = 'adminhtml_transaction';
36
  $this->_headerText = Mage::helper('novalnet_payment')->__('Novalnet Transactions Overview');
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Transaction extends Mage_Adminhtml_Block_Widget_Grid_Container
27
+ {
28
 
29
  /**
30
  * Initialize the transaction grid block
31
+ *
32
  */
33
+ public function __construct()
34
+ {
35
  $this->_blockGroup = 'novalnet_payment';
36
  $this->_controller = 'adminhtml_transaction';
37
  $this->_headerText = Mage::helper('novalnet_payment')->__('Novalnet Transactions Overview');
app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction/Grid.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,14 +23,16 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Transaction_Grid extends Mage_Adminhtml_Block_Widget_Grid {
 
28
 
29
  var $novalnetPayments = array();
30
 
31
  /**
32
  *
33
  */
34
- public function __construct() {
 
35
  parent::__construct();
36
 
37
  $this->setId('novalnet_transaction_grid');
@@ -43,7 +44,8 @@ class Novalnet_Payment_Block_Adminhtml_Transaction_Grid extends Mage_Adminhtml_B
43
  /**
44
  * @return Mage_Adminhtml_Block_Widget_Grid
45
  */
46
- protected function _prepareCollection() {
 
47
  $collection = Mage::getModel('novalnet_payment/transactionstatus')->getCollection();
48
  $this->setCollection($collection);
49
  return parent::_prepareCollection();
@@ -52,7 +54,8 @@ class Novalnet_Payment_Block_Adminhtml_Transaction_Grid extends Mage_Adminhtml_B
52
  /**
53
  * @return
54
  */
55
- public function _prepareColumns() {
 
56
  $this->addColumn('order_id', array(
57
  'header' => Mage::helper('sales')->__('Order no #'),
58
  'width' => '80px',
@@ -91,14 +94,16 @@ class Novalnet_Payment_Block_Adminhtml_Transaction_Grid extends Mage_Adminhtml_B
91
  * @param $row
92
  * @return bool|string
93
  */
94
- public function getRowUrl($row) {
 
95
  return $this->getUrl('novalnet_payment/adminhtml_transaction/view', array(
96
  'nntxn_id' => $row->getId()
97
  )
98
  );
99
  }
100
 
101
- public function getGridUrl() {
 
102
  return $this->getUrl('*/*/grid', array('_current' => true));
103
  }
104
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Transaction_Grid extends Mage_Adminhtml_Block_Widget_Grid
27
+ {
28
 
29
  var $novalnetPayments = array();
30
 
31
  /**
32
  *
33
  */
34
+ public function __construct()
35
+ {
36
  parent::__construct();
37
 
38
  $this->setId('novalnet_transaction_grid');
44
  /**
45
  * @return Mage_Adminhtml_Block_Widget_Grid
46
  */
47
+ protected function _prepareCollection()
48
+ {
49
  $collection = Mage::getModel('novalnet_payment/transactionstatus')->getCollection();
50
  $this->setCollection($collection);
51
  return parent::_prepareCollection();
54
  /**
55
  * @return
56
  */
57
+ public function _prepareColumns()
58
+ {
59
  $this->addColumn('order_id', array(
60
  'header' => Mage::helper('sales')->__('Order no #'),
61
  'width' => '80px',
94
  * @param $row
95
  * @return bool|string
96
  */
97
+ public function getRowUrl($row)
98
+ {
99
  return $this->getUrl('novalnet_payment/adminhtml_transaction/view', array(
100
  'nntxn_id' => $row->getId()
101
  )
102
  );
103
  }
104
 
105
+ public function getGridUrl()
106
+ {
107
  return $this->getUrl('*/*/grid', array('_current' => true));
108
  }
109
 
app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction/View.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,9 +23,11 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Transaction_View extends Mage_Adminhtml_Block_Widget_Form_Container {
 
28
 
29
- public function __construct() {
 
30
  $this->_objectId = 'nntxn_id';
31
  $this->_mode = 'view';
32
  $this->_blockGroup = 'novalnet_payment';
@@ -46,20 +47,24 @@ class Novalnet_Payment_Block_Adminhtml_Transaction_View extends Mage_Adminhtml_B
46
  *
47
  * @return Mage_Sales_Model_Order_Invoice
48
  */
49
- public function getOrder() {
 
50
  return Mage::registry('current_order');
51
  }
52
 
53
- public function getNovalnetTransactionStatus() {
 
54
  return Mage::registry('novalnet_payment_transactionstatus');
55
  }
56
 
57
- public function getCurrencyCode() {
 
58
  $order = Mage::getModel("sales/order")->loadByIncrementId(trim($this->getNovalnetTransactionStatus()->getOrderId()));
59
  return $order->getOrderCurrencyCode();
60
  }
61
 
62
- public function getPaymentTitle() {
 
63
  $transactionStatus = $this->getNovalnetTransactionStatus();
64
  $title = Mage::helper("novalnet_payment")->getModel($transactionStatus->getPaymentName())->_getConfigData('title');
65
  return $title;
@@ -68,7 +73,8 @@ class Novalnet_Payment_Block_Adminhtml_Transaction_View extends Mage_Adminhtml_B
68
  /**
69
  * @return string
70
  */
71
- public function getHeaderText() {
 
72
  $transStatus = $this->getNovalnetTransactionStatus();
73
  $text = Mage::helper('novalnet_payment')->__(
74
  'Order #%s | TID : %s ', $transStatus->getOrderId(), $transStatus->getTransactionNo()
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Transaction_View extends Mage_Adminhtml_Block_Widget_Form_Container
27
+ {
28
 
29
+ public function __construct()
30
+ {
31
  $this->_objectId = 'nntxn_id';
32
  $this->_mode = 'view';
33
  $this->_blockGroup = 'novalnet_payment';
47
  *
48
  * @return Mage_Sales_Model_Order_Invoice
49
  */
50
+ public function getOrder()
51
+ {
52
  return Mage::registry('current_order');
53
  }
54
 
55
+ public function getNovalnetTransactionStatus()
56
+ {
57
  return Mage::registry('novalnet_payment_transactionstatus');
58
  }
59
 
60
+ public function getCurrencyCode()
61
+ {
62
  $order = Mage::getModel("sales/order")->loadByIncrementId(trim($this->getNovalnetTransactionStatus()->getOrderId()));
63
  return $order->getOrderCurrencyCode();
64
  }
65
 
66
+ public function getPaymentTitle()
67
+ {
68
  $transactionStatus = $this->getNovalnetTransactionStatus();
69
  $title = Mage::helper("novalnet_payment")->getModel($transactionStatus->getPaymentName())->_getConfigData('title');
70
  return $title;
73
  /**
74
  * @return string
75
  */
76
+ public function getHeaderText()
77
+ {
78
  $transStatus = $this->getNovalnetTransactionStatus();
79
  $text = Mage::helper('novalnet_payment')->__(
80
  'Order #%s | TID : %s ', $transStatus->getOrderId(), $transStatus->getTransactionNo()
app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction/View/Form.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,9 +23,11 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Transaction_View_Form extends Mage_Adminhtml_Block_Widget {
 
28
 
29
- public function __construct() {
 
30
  $this->_blockGroup = 'novalnet_payment';
31
  $this->_controller = 'adminhtml_transaction';
32
  $this->_headerText = Mage::helper('novalnet_payment')->__('Transactions');
@@ -34,4 +35,4 @@ class Novalnet_Payment_Block_Adminhtml_Transaction_View_Form extends Mage_Adminh
34
  parent::__construct();
35
  }
36
 
37
- }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Transaction_View_Form extends Mage_Adminhtml_Block_Widget
27
+ {
28
 
29
+ public function __construct()
30
+ {
31
  $this->_blockGroup = 'novalnet_payment';
32
  $this->_controller = 'adminhtml_transaction';
33
  $this->_headerText = Mage::helper('novalnet_payment')->__('Transactions');
35
  parent::__construct();
36
  }
37
 
38
+ }
app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Transactionoverview extends Mage_Adminhtml_Block_Widget_Grid_Container {
 
28
 
29
  /**
30
  *
31
  */
32
- public function __construct() {
 
33
  $this->_blockGroup = 'novalnet_payment';
34
  $this->_controller = 'adminhtml_transactionoverview';
35
  $this->_headerText = Mage::helper('novalnet_payment')->__('Novalnet Transactions Log');
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Transactionoverview extends Mage_Adminhtml_Block_Widget_Grid_Container
27
+ {
28
 
29
  /**
30
  *
31
  */
32
+ public function __construct()
33
+ {
34
  $this->_blockGroup = 'novalnet_payment';
35
  $this->_controller = 'adminhtml_transactionoverview';
36
  $this->_headerText = Mage::helper('novalnet_payment')->__('Novalnet Transactions Log');
app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview/Grid.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Transactionoverview_Grid extends Mage_Adminhtml_Block_Widget_Grid {
 
28
 
29
  /**
30
  *
31
  */
32
- public function __construct() {
 
33
  parent::__construct();
34
  $this->setId('novlanet_transactionoverview_grid');
35
  $this->setUseAjax(true);
@@ -40,7 +41,8 @@ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_Grid extends Mage_Adm
40
  /**
41
  * @return Mage_Adminhtml_Block_Widget_Grid
42
  */
43
- protected function _prepareCollection() {
 
44
  $collection = Mage::getModel('novalnet_payment/transactionoverview')->getCollection();
45
  $this->setCollection($collection);
46
  return parent::_prepareCollection();
@@ -49,23 +51,24 @@ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_Grid extends Mage_Adm
49
  /**
50
  * @return
51
  */
52
- protected function _prepareColumns() {
53
- $helperNovalnetPayment = $this->helperNovalnetPayment();
 
54
 
55
  $this->addColumn('order_id', array(
56
- 'header' => $helperNovalnetPayment->__('Order no #'),
57
  'width' => '80px',
58
  'type' => 'text',
59
  'index' => 'order_id',
60
  ));
61
  $this->addColumn('transaction_no', array(
62
- 'header' => $helperNovalnetPayment->__('Transaction #'),
63
  'width' => '80px',
64
  'type' => 'text',
65
  'index' => 'transaction_id',
66
  ));
67
  $this->addColumn('id', array(
68
- 'header' => $helperNovalnetPayment->__('Store id #'),
69
  'width' => '80px',
70
  'type' => 'text',
71
  'index' => 'store_id',
@@ -78,7 +81,8 @@ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_Grid extends Mage_Adm
78
  *
79
  * @return Novalnet_Payment_Helper_Data
80
  */
81
- protected function helperNovalnetPayment() {
 
82
  return Mage::helper('novalnet_payment');
83
  }
84
 
@@ -86,14 +90,16 @@ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_Grid extends Mage_Adm
86
  * @param $row
87
  * @return string
88
  */
89
- public function getRowUrl($row) {
 
90
  return $this->getUrl('novalnet_payment/adminhtml_transactionoverview/view', array(
91
  'nnlog_id' => $row->getId()
92
  )
93
  );
94
  }
95
 
96
- public function getGridUrl() {
 
97
  return $this->getUrl('*/*/grid', array('_current' => true));
98
  }
99
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_Grid extends Mage_Adminhtml_Block_Widget_Grid
27
+ {
28
 
29
  /**
30
  *
31
  */
32
+ public function __construct()
33
+ {
34
  parent::__construct();
35
  $this->setId('novlanet_transactionoverview_grid');
36
  $this->setUseAjax(true);
41
  /**
42
  * @return Mage_Adminhtml_Block_Widget_Grid
43
  */
44
+ protected function _prepareCollection()
45
+ {
46
  $collection = Mage::getModel('novalnet_payment/transactionoverview')->getCollection();
47
  $this->setCollection($collection);
48
  return parent::_prepareCollection();
51
  /**
52
  * @return
53
  */
54
+ protected function _prepareColumns()
55
+ {
56
+ $helperNnPayment = $this->helperNovalnetPayment();
57
 
58
  $this->addColumn('order_id', array(
59
+ 'header' => $helperNnPayment->__('Order no #'),
60
  'width' => '80px',
61
  'type' => 'text',
62
  'index' => 'order_id',
63
  ));
64
  $this->addColumn('transaction_no', array(
65
+ 'header' => $helperNnPayment->__('Transaction #'),
66
  'width' => '80px',
67
  'type' => 'text',
68
  'index' => 'transaction_id',
69
  ));
70
  $this->addColumn('id', array(
71
+ 'header' => $helperNnPayment->__('Store id #'),
72
  'width' => '80px',
73
  'type' => 'text',
74
  'index' => 'store_id',
81
  *
82
  * @return Novalnet_Payment_Helper_Data
83
  */
84
+ protected function helperNovalnetPayment()
85
+ {
86
  return Mage::helper('novalnet_payment');
87
  }
88
 
90
  * @param $row
91
  * @return string
92
  */
93
+ public function getRowUrl($row)
94
+ {
95
  return $this->getUrl('novalnet_payment/adminhtml_transactionoverview/view', array(
96
  'nnlog_id' => $row->getId()
97
  )
98
  );
99
  }
100
 
101
+ public function getGridUrl()
102
+ {
103
  return $this->getUrl('*/*/grid', array('_current' => true));
104
  }
105
 
app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview/View.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,14 +23,16 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Transactionoverview_View extends Mage_Adminhtml_Block_Widget_Form_Container {
 
28
 
29
  var $novalnetPayments = array();
30
 
31
  /**
32
  *
33
  */
34
- public function __construct() {
 
35
  $this->_objectId = 'nnlog_id';
36
  $this->_mode = 'view';
37
  $this->_blockGroup = 'novalnet_payment';
@@ -49,27 +50,31 @@ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_View extends Mage_Adm
49
  $this->_removeButton('save');
50
  }
51
 
52
- public function getNovalnetTransactionOverview() {
 
53
  return Mage::registry('novalnet_payment_transactionoverview');
54
  ;
55
  }
56
 
57
- public function getPaymentTitle() {
 
58
  $order = Mage::getModel("sales/order")->loadByIncrementId(trim($this->getNovalnetTransactionOverview()->getOrderId()));
59
- if($order->getPayment()) {
60
- $paymentMethod = $order->getPayment()->getMethod();
61
- $title = Mage::helper("novalnet_payment")->getModel($paymentMethod)->_getConfigData('title');
62
- } else {
63
- $title = '';
64
- }
65
  return $title;
66
  }
67
 
68
- public function getHeaderText() {
 
69
  $transStatus = $this->getNovalnetTransactionOverview();
70
  $text = Mage::helper('novalnet_payment')->__(
71
  'Order #%s | TID : %s ', $transStatus->getOrderId(), $transStatus->getTransactionId()
72
  );
73
  return $text;
74
  }
 
75
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_View extends Mage_Adminhtml_Block_Widget_Form_Container
27
+ {
28
 
29
  var $novalnetPayments = array();
30
 
31
  /**
32
  *
33
  */
34
+ public function __construct()
35
+ {
36
  $this->_objectId = 'nnlog_id';
37
  $this->_mode = 'view';
38
  $this->_blockGroup = 'novalnet_payment';
50
  $this->_removeButton('save');
51
  }
52
 
53
+ public function getNovalnetTransactionOverview()
54
+ {
55
  return Mage::registry('novalnet_payment_transactionoverview');
56
  ;
57
  }
58
 
59
+ public function getPaymentTitle()
60
+ {
61
  $order = Mage::getModel("sales/order")->loadByIncrementId(trim($this->getNovalnetTransactionOverview()->getOrderId()));
62
+ if ($order->getPayment()) {
63
+ $paymentMethod = $order->getPayment()->getMethod();
64
+ $title = Mage::helper("novalnet_payment")->getModel($paymentMethod)->_getConfigData('title');
65
+ } else {
66
+ $title = '';
67
+ }
68
  return $title;
69
  }
70
 
71
+ public function getHeaderText()
72
+ {
73
  $transStatus = $this->getNovalnetTransactionOverview();
74
  $text = Mage::helper('novalnet_payment')->__(
75
  'Order #%s | TID : %s ', $transStatus->getOrderId(), $transStatus->getTransactionId()
76
  );
77
  return $text;
78
  }
79
+
80
  }
app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview/View/Form.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,9 +23,11 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Transactionoverview_View_Form extends Mage_Adminhtml_Block_Widget {
 
28
 
29
- public function __construct() {
 
30
  $this->_headerText = Mage::helper('novalnet_payment')->__('Transaction Overview');
31
  parent::__construct();
32
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_View_Form extends Mage_Adminhtml_Block_Widget
27
+ {
28
 
29
+ public function __construct()
30
+ {
31
  $this->_headerText = Mage::helper('novalnet_payment')->__('Transaction Overview');
32
  parent::__construct();
33
  }
app/code/community/Novalnet/Payment/Block/Adminhtml/Widget.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,9 +23,11 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Adminhtml_Widget extends Mage_Adminhtml_Block_Widget_Form_Container {
 
28
 
29
- public function __construct() {
 
30
  parent::__construct();
31
  $this->setTemplate('configuration/wizard/index.phtml');
32
  }
@@ -36,9 +37,10 @@ class Novalnet_Payment_Block_Adminhtml_Widget extends Mage_Adminhtml_Block_Widge
36
  *
37
  * @return string
38
  */
39
- public function getFormHtml() {
 
40
  $this->getChild('form')->setData('action1', $this->getSaveUrl());
41
  return $this->getChildHtml('form');
42
  }
43
 
44
- }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Adminhtml_Widget extends Mage_Adminhtml_Block_Widget_Form_Container
27
+ {
28
 
29
+ public function __construct()
30
+ {
31
  parent::__construct();
32
  $this->setTemplate('configuration/wizard/index.phtml');
33
  }
37
  *
38
  * @return string
39
  */
40
+ public function getFormHtml()
41
+ {
42
  $this->getChild('form')->setData('action1', $this->getSaveUrl());
43
  return $this->getChildHtml('form');
44
  }
45
 
46
+ }
app/code/community/Novalnet/Payment/Block/Adminhtml/Widget/Grid/Container.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -26,8 +25,10 @@
26
  */
27
  class Novalnet_Payment_Block_Adminhtml_Widget_Grid_Container extends Mage_Adminhtml_Block_Widget_Grid_Container
28
  {
 
29
  public function getHeaderCssClass()
30
  {
31
  return 'novalnet-adminhtml-head ' . parent::getHeaderCssClass();
32
  }
 
33
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Widget_Grid_Container extends Mage_Adminhtml_Block_Widget_Grid_Container
27
  {
28
+
29
  public function getHeaderCssClass()
30
  {
31
  return 'novalnet-adminhtml-head ' . parent::getHeaderCssClass();
32
  }
33
+
34
  }
app/code/community/Novalnet/Payment/Block/Adminhtml/Widget/View/Container.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -26,8 +25,10 @@
26
  */
27
  class Novalnet_Payment_Block_Adminhtml_Widget_View_Container extends Mage_Adminhtml_Block_Widget_View_Container
28
  {
 
29
  public function getHeaderCssClass()
30
  {
31
  return 'novalnet-adminhtml-head ' . parent::getHeaderCssClass();
32
  }
33
- }
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Widget_View_Container extends Mage_Adminhtml_Block_Widget_View_Container
27
  {
28
+
29
  public function getHeaderCssClass()
30
  {
31
  return 'novalnet-adminhtml-head ' . parent::getHeaderCssClass();
32
  }
33
+
34
+ }
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Cc.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,9 +23,11 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_Form_Cc extends Mage_Payment_Block_Form {
 
28
 
29
- protected function _construct() {
 
30
  parent::_construct();
31
  $this->setTemplate('novalnet/payment/method/form/Cc.phtml');
32
  }
@@ -36,7 +37,8 @@ class Novalnet_Payment_Block_Payment_Method_Form_Cc extends Mage_Payment_Block_F
36
  *
37
  * @return bool
38
  */
39
- public function isCallbackTypeCall() {
 
40
  return $this->getMethod()->isCallbackTypeCall();
41
  //return false;
42
  }
@@ -46,7 +48,8 @@ class Novalnet_Payment_Block_Payment_Method_Form_Cc extends Mage_Payment_Block_F
46
  *
47
  * @return string
48
  */
49
- public function getCallbackConfigData() {
 
50
  return $this->getMethod()->_getConfigData('callback');
51
  }
52
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_Form_Cc extends Mage_Payment_Block_Form
27
+ {
28
 
29
+ protected function _construct()
30
+ {
31
  parent::_construct();
32
  $this->setTemplate('novalnet/payment/method/form/Cc.phtml');
33
  }
37
  *
38
  * @return bool
39
  */
40
+ public function isCallbackTypeCall()
41
+ {
42
  return $this->getMethod()->isCallbackTypeCall();
43
  //return false;
44
  }
48
  *
49
  * @return string
50
  */
51
+ public function getCallbackConfigData()
52
+ {
53
  return $this->getMethod()->_getConfigData('callback');
54
  }
55
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Ccsecure.php DELETED
@@ -1,130 +0,0 @@
1
- <?php
2
-
3
- /**
4
- * Magento
5
- *
6
- * NOTICE OF LICENSE
7
- *
8
- * This source file is subject to the Open Software License (OSL 3.0)
9
- * that is bundled with this package in the file LICENSE.txt.
10
- * It is also available through the world-wide-web at this URL:
11
- * http://opensource.org/licenses/osl-3.0.php
12
- * If you did not receive a copy of the license and are unable to
13
- * obtain it through the world-wide-web, please send an email
14
- * to license@magentocommerce.com so we can send you a copy immediately.
15
- *
16
- * Part of the Paymentmodule of Novalnet AG
17
- * https://www.novalnet.de
18
- * If you have found this script usefull a small
19
- * recommendation as well as a comment on merchant form
20
- * would be greatly appreciated.
21
- *
22
- * @category Novalnet
23
- * @package Novalnet_Payment
24
- * @copyright Novalnet AG
25
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
- */
27
- class Novalnet_Payment_Block_Payment_Method_Form_CcSecure extends Mage_Payment_Block_Form {
28
-
29
- protected function _construct() {
30
- parent::_construct();
31
- $this->setTemplate('novalnet/payment/method/form/Ccsecure.phtml');
32
- }
33
-
34
- /**
35
- * Retrieve payment configuration object
36
- *
37
- * @return Mage_Payment_Model_Config
38
- */
39
- protected function _getConfig() {
40
- if (!$this->_localConfig) {
41
- $this->_localConfig = Mage::getModel('payment/config');
42
- }
43
- return $this->_localConfig;
44
- }
45
-
46
- /**
47
- * Retrieve availables credit card types
48
- *
49
- * @return array
50
- */
51
- public function getCcAvailableTypes() {
52
- $types = $this->_getConfig()->getCcTypes();
53
- $method = $this->getMethod();
54
- if ($method) {
55
- $availableTypes = $method->getConfigData('cctypes');
56
- if ($availableTypes) {
57
- $availableTypes = explode(',', $availableTypes);
58
- foreach ($types as $code => $name) {
59
- if (!in_array($code, $availableTypes)) {
60
- unset($types[$code]);
61
- }
62
- }
63
- }
64
- }
65
- return $types;
66
- }
67
-
68
- /**
69
- * Retrieve credit card expire months
70
- *
71
- * @return array
72
- */
73
- public function getCcMonths() {
74
- $months = $this->getData('cc_months');
75
- if (is_null($months)) {
76
- $months = $this->_getConfig()->getMonths();
77
- $this->setData('cc_months', $months);
78
- }
79
- return $months;
80
- }
81
-
82
- /**
83
- * Retrieve credit card expire years
84
- *
85
- * @return array
86
- */
87
- public function getCcYears() {
88
- $years = $this->getData('cc_years');
89
- if (is_null($years)) {
90
- $years = $this->_getConfig()->getYears();
91
- $this->setData('cc_years', $years);
92
- }
93
- return $years;
94
- }
95
-
96
- /**
97
- * Retrive has verification configuration
98
- *
99
- * @return boolean
100
- */
101
- public function hasVerification() {
102
- if ($this->getMethod()) {
103
- $configData = $this->getMethod()->getConfigData('useccv');
104
- if (is_null($configData)) {
105
- return true;
106
- }
107
- return (bool) $configData;
108
- }
109
- return true;
110
- }
111
-
112
- /**
113
- * Get information to end user from config
114
- *
115
- * @return string
116
- */
117
- public function getUserInfo() {
118
- return $this->getMethod()->getConfigData('booking_reference');
119
- }
120
-
121
- /**
122
- * Retrieve Novalnet Mode in Configuration
123
- *
124
- * @return bool
125
- */
126
- public function getLiveMode() {
127
- return $this->getMethod()->_getConfigData('live_mode');
128
- }
129
-
130
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Elvaustria.php DELETED
@@ -1,107 +0,0 @@
1
- <?php
2
-
3
- /**
4
- * Magento
5
- *
6
- * NOTICE OF LICENSE
7
- *
8
- * This source file is subject to the Open Software License (OSL 3.0)
9
- * that is bundled with this package in the file LICENSE.txt.
10
- * It is also available through the world-wide-web at this URL:
11
- * http://opensource.org/licenses/osl-3.0.php
12
- * If you did not receive a copy of the license and are unable to
13
- * obtain it through the world-wide-web, please send an email
14
- * to license@magentocommerce.com so we can send you a copy immediately.
15
- *
16
- * Part of the Paymentmodule of Novalnet AG
17
- * https://www.novalnet.de
18
- * If you have found this script usefull a small
19
- * recommendation as well as a comment on merchant form
20
- * would be greatly appreciated.
21
- *
22
- * @category Novalnet
23
- * @package Novalnet_Payment
24
- * @copyright Novalnet AG
25
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
- */
27
- class Novalnet_Payment_Block_Payment_Method_Form_Elvaustria extends Mage_Payment_Block_Form {
28
-
29
- protected function _construct() {
30
- parent::_construct();
31
- $this->setTemplate('novalnet/payment/method/form/Elvaustria.phtml');
32
- }
33
-
34
- /**
35
- * Get ACDC details from config
36
- *
37
- * @return bool
38
- */
39
- public function getAcdc() {
40
- $method = $this->getMethod();
41
- return $method->getConfigData('acdc_check');
42
- }
43
-
44
- /**
45
- * Check whether Callback type allowed
46
- *
47
- * @return bool
48
- */
49
- public function isCallbackTypeCall() {
50
- return $this->getMethod()->isCallbackTypeCall();
51
- //return false;
52
- }
53
-
54
- /**
55
- * Novalnet Callback data getter
56
- *
57
- * @return string
58
- */
59
- public function getCallbackConfigData() {
60
- return $this->getMethod()->_getConfigData('callback');
61
- }
62
-
63
- /**
64
- * Get Customer Telephone no
65
- *
66
- * @return int
67
- */
68
- public function getCustomersTelephone() {
69
- $customer = Mage::getSingleton('customer/session')
70
- ->getCustomer()->getDefaultBillingAddress();
71
- if ($customer) {
72
- return $customer->getTelephone();
73
- }
74
- }
75
-
76
- /**
77
- * Get Customer Email address
78
- *
79
- * @return string
80
- */
81
- public function getCustomersEmail() {
82
- $customer = Mage::getSingleton('customer/session')
83
- ->getCustomer()->getEmail();
84
- if ($customer) {
85
- return $customer;
86
- }
87
- }
88
-
89
- /**
90
- * Get information to end user from config
91
- *
92
- * @return string
93
- */
94
- public function getUserInfo() {
95
- return $this->getMethod()->getConfigData('booking_reference');
96
- }
97
-
98
- /**
99
- * Retrieve Novalnet Mode in Configuration
100
- *
101
- * @return bool
102
- */
103
- public function getLiveMode() {
104
- return $this->getMethod()->_getConfigData('live_mode');
105
- }
106
-
107
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Elvgerman.php DELETED
@@ -1,107 +0,0 @@
1
- <?php
2
-
3
- /**
4
- * Magento
5
- *
6
- * NOTICE OF LICENSE
7
- *
8
- * This source file is subject to the Open Software License (OSL 3.0)
9
- * that is bundled with this package in the file LICENSE.txt.
10
- * It is also available through the world-wide-web at this URL:
11
- * http://opensource.org/licenses/osl-3.0.php
12
- * If you did not receive a copy of the license and are unable to
13
- * obtain it through the world-wide-web, please send an email
14
- * to license@magentocommerce.com so we can send you a copy immediately.
15
- *
16
- * Part of the Paymentmodule of Novalnet AG
17
- * https://www.novalnet.de
18
- * If you have found this script usefull a small
19
- * recommendation as well as a comment on merchant form
20
- * would be greatly appreciated.
21
- *
22
- * @category Novalnet
23
- * @package Novalnet_Payment
24
- * @copyright Novalnet AG
25
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
- */
27
- class Novalnet_Payment_Block_Payment_Method_Form_Elvgerman extends Mage_Payment_Block_Form {
28
-
29
- protected function _construct() {
30
- parent::_construct();
31
- $this->setTemplate('novalnet/payment/method/form/Elvgerman.phtml');
32
- }
33
-
34
- /**
35
- * Get ACDC details from config
36
- *
37
- * @return bool
38
- */
39
- public function getAcdc() {
40
- $method = $this->getMethod();
41
- return $method->getConfigData('acdc_check');
42
- }
43
-
44
- /**
45
- * Check whether Callback type allowed
46
- *
47
- * @return bool
48
- */
49
- public function isCallbackTypeCall() {
50
- return $this->getMethod()->isCallbackTypeCall();
51
- //return false;
52
- }
53
-
54
- /**
55
- * Novalnet Callback data getter
56
- *
57
- * @return string
58
- */
59
- public function getCallbackConfigData() {
60
- return $this->getMethod()->_getConfigData('callback');
61
- }
62
-
63
- /**
64
- * Get Customer Telephone no
65
- *
66
- * @return int
67
- */
68
- public function getCustomersTelephone() {
69
- $customer = Mage::getSingleton('customer/session')
70
- ->getCustomer()->getDefaultBillingAddress();
71
- if ($customer) {
72
- return $customer->getTelephone();
73
- }
74
- }
75
-
76
- /**
77
- * Get Customer Email address
78
- *
79
- * @return string
80
- */
81
- public function getCustomersEmail() {
82
- $customer = Mage::getSingleton('customer/session')
83
- ->getCustomer()->getEmail();
84
- if ($customer) {
85
- return $customer;
86
- }
87
- }
88
-
89
- /**
90
- * Get information to end user from config
91
- *
92
- * @return string
93
- */
94
- public function getUserInfo() {
95
- return $this->getMethod()->getConfigData('booking_reference');
96
- }
97
-
98
- /**
99
- * Retrieve Novalnet Mode in Configuration
100
- *
101
- * @return bool
102
- */
103
- public function getLiveMode() {
104
- return $this->getMethod()->_getConfigData('live_mode');
105
- }
106
-
107
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Ideal.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,41 +23,26 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_Form_Ideal extends Mage_Payment_Block_Form {
 
28
 
29
  /**
30
  * Init default template for block
31
  */
32
- protected function _construct() {
 
33
  parent::_construct();
34
  $this->setTemplate('novalnet/payment/method/form/Ideal.phtml');
35
  }
36
 
37
- /**
38
- * Retrieve payment configuration object
39
- *
40
- * @return Mage_Payment_Model_Config
41
- */
42
- protected function _getConfig() {
43
- return Mage::getSingleton('payment/config');
44
- }
45
-
46
  /**
47
  * Get information to end user from config
48
  *
49
  * @return string
50
  */
51
- public function getUserInfo() {
 
52
  return $this->getMethod()->getConfigData('booking_reference');
53
  }
54
 
55
- /**
56
- * Retrieve Novalnet Mode in Configuration
57
- *
58
- * @return bool
59
- */
60
- public function getLiveMode() {
61
- return $this->getMethod()->_getConfigData('live_mode');
62
- }
63
-
64
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_Form_Ideal extends Mage_Payment_Block_Form
27
+ {
28
 
29
  /**
30
  * Init default template for block
31
  */
32
+ protected function _construct()
33
+ {
34
  parent::_construct();
35
  $this->setTemplate('novalnet/payment/method/form/Ideal.phtml');
36
  }
37
 
 
 
 
 
 
 
 
 
 
38
  /**
39
  * Get information to end user from config
40
  *
41
  * @return string
42
  */
43
+ public function getUserInfo()
44
+ {
45
  return $this->getMethod()->getConfigData('booking_reference');
46
  }
47
 
 
 
 
 
 
 
 
 
 
48
  }
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Invoice.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,9 +23,11 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_Form_Invoice extends Mage_Payment_Block_Form {
 
28
 
29
- protected function _construct() {
 
30
  parent::_construct();
31
  $this->setTemplate('novalnet/payment/method/form/Invoice.phtml');
32
  }
@@ -36,7 +37,8 @@ class Novalnet_Payment_Block_Payment_Method_Form_Invoice extends Mage_Payment_Bl
36
  *
37
  * @return bool
38
  */
39
- public function isCallbackTypeCall() {
 
40
  return $this->getMethod()->isCallbackTypeCall();
41
  }
42
 
@@ -45,50 +47,19 @@ class Novalnet_Payment_Block_Payment_Method_Form_Invoice extends Mage_Payment_Bl
45
  *
46
  * @return string
47
  */
48
- public function getCallbackConfigData() {
 
49
  return $this->getMethod()->_getConfigData('callback');
50
  }
51
 
52
- /**
53
- * Get Customer Telephone no
54
- *
55
- * @return int
56
- */
57
- public function getCustomersTelephone() {
58
- $customer = Mage::getSingleton('customer/session')->getCustomer()->getDefaultBillingAddress();
59
- if ($customer) {
60
- return $customer->getTelephone();
61
- }
62
- }
63
-
64
- /**
65
- * Get Customer Email address
66
- *
67
- * @return string
68
- */
69
- public function getCustomersEmail() {
70
- $customer = Mage::getSingleton('customer/session')->getCustomer()->getEmail();
71
- if ($customer) {
72
- return $customer;
73
- }
74
- }
75
-
76
  /**
77
  * Get information to end user from config
78
  *
79
  * @return string
80
  */
81
- public function getUserInfo() {
 
82
  return $this->getMethod()->getConfigData('booking_reference');
83
  }
84
 
85
- /**
86
- * Retrieve Novalnet Mode in Configuration
87
- *
88
- * @return bool
89
- */
90
- public function getLiveMode() {
91
- return $this->getMethod()->_getConfigData('live_mode');
92
- }
93
-
94
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_Form_Invoice extends Mage_Payment_Block_Form
27
+ {
28
 
29
+ protected function _construct()
30
+ {
31
  parent::_construct();
32
  $this->setTemplate('novalnet/payment/method/form/Invoice.phtml');
33
  }
37
  *
38
  * @return bool
39
  */
40
+ public function isCallbackTypeCall()
41
+ {
42
  return $this->getMethod()->isCallbackTypeCall();
43
  }
44
 
47
  *
48
  * @return string
49
  */
50
+ public function getCallbackConfigData()
51
+ {
52
  return $this->getMethod()->_getConfigData('callback');
53
  }
54
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
55
  /**
56
  * Get information to end user from config
57
  *
58
  * @return string
59
  */
60
+ public function getUserInfo()
61
+ {
62
  return $this->getMethod()->getConfigData('booking_reference');
63
  }
64
 
 
 
 
 
 
 
 
 
 
65
  }
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Paypal.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,41 +23,26 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_Form_Paypal extends Mage_Payment_Block_Form {
 
28
 
29
  /**
30
  * Init default template for block
31
  */
32
- protected function _construct() {
 
33
  parent::_construct();
34
  $this->setTemplate('novalnet/payment/method/form/Paypal.phtml');
35
  }
36
 
37
- /**
38
- * Retrieve payment configuration object
39
- *
40
- * @return Mage_Payment_Model_Config
41
- */
42
- protected function _getConfig() {
43
- return Mage::getSingleton('payment/config');
44
- }
45
-
46
  /**
47
  * Get information to end user from config
48
  *
49
  * @return string
50
  */
51
- public function getUserInfo() {
 
52
  return $this->getMethod()->getConfigData('booking_reference');
53
  }
54
 
55
- /**
56
- * Retrieve Novalnet Mode in Configuration
57
- *
58
- * @return bool
59
- */
60
- public function getLiveMode() {
61
- return $this->getMethod()->_getConfigData('live_mode');
62
- }
63
-
64
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_Form_Paypal extends Mage_Payment_Block_Form
27
+ {
28
 
29
  /**
30
  * Init default template for block
31
  */
32
+ protected function _construct()
33
+ {
34
  parent::_construct();
35
  $this->setTemplate('novalnet/payment/method/form/Paypal.phtml');
36
  }
37
 
 
 
 
 
 
 
 
 
 
38
  /**
39
  * Get information to end user from config
40
  *
41
  * @return string
42
  */
43
+ public function getUserInfo()
44
+ {
45
  return $this->getMethod()->getConfigData('booking_reference');
46
  }
47
 
 
 
 
 
 
 
 
 
 
48
  }
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Phonepayment.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,71 +23,23 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_Form_Phonepayment extends Mage_Payment_Block_Form {
 
28
 
29
- protected function _construct() {
 
30
  parent::_construct();
31
  $this->setTemplate('novalnet/payment/method/form/Phonepayment.phtml');
32
  }
33
 
34
- /**
35
- * Check whether Callback type allowed
36
- *
37
- * @return bool
38
- */
39
- public function isCallbackTypeCall() {
40
- return $this->getMethod()->isCallbackTypeCall();
41
- }
42
-
43
- /**
44
- * Novalnet Callback data getter
45
- *
46
- * @return string
47
- */
48
- public function getCallbackConfigData() {
49
- return $this->getMethod()->getCallbackConfigData();
50
- }
51
-
52
- /**
53
- * Get Customer Telephone no
54
- *
55
- * @return int
56
- */
57
- public function getCustomersTelephone() {
58
- $customer = Mage::getSingleton('customer/session')->getCustomer()->getDefaultBillingAddress();
59
- if ($customer) {
60
- return $customer->getTelephone();
61
- }
62
- }
63
-
64
- /**
65
- * Get Customer Email address
66
- *
67
- * @return string
68
- */
69
- public function getCustomersEmail() {
70
- $customer = Mage::getSingleton('customer/session')->getCustomer()->getEmail();
71
- if ($customer) {
72
- return $customer;
73
- }
74
- }
75
-
76
  /**
77
  * Get information to end user from config
78
  *
79
  * @return string
80
  */
81
- public function getUserInfo() {
 
82
  return $this->getMethod()->getConfigData('booking_reference');
83
  }
84
 
85
- /**
86
- * Retrieve Novalnet Mode in Configuration
87
- *
88
- * @return bool
89
- */
90
- public function getLiveMode() {
91
- return $this->getMethod()->_getConfigData('live_mode');
92
- }
93
-
94
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_Form_Phonepayment extends Mage_Payment_Block_Form
27
+ {
28
 
29
+ protected function _construct()
30
+ {
31
  parent::_construct();
32
  $this->setTemplate('novalnet/payment/method/form/Phonepayment.phtml');
33
  }
34
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
35
  /**
36
  * Get information to end user from config
37
  *
38
  * @return string
39
  */
40
+ public function getUserInfo()
41
+ {
42
  return $this->getMethod()->getConfigData('booking_reference');
43
  }
44
 
 
 
 
 
 
 
 
 
 
45
  }
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Prepayment.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,71 +23,23 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_Form_Prepayment extends Mage_Payment_Block_Form {
 
28
 
29
- protected function _construct() {
 
30
  parent::_construct();
31
  $this->setTemplate('novalnet/payment/method/form/Prepayment.phtml');
32
  }
33
 
34
- /**
35
- * Check whether Callback type allowed
36
- *
37
- * @return bool
38
- */
39
- public function isCallbackTypeCall() {
40
- return $this->getMethod()->isCallbackTypeCall();
41
- }
42
-
43
- /**
44
- * Novalnet Callback data getter
45
- *
46
- * @return string
47
- */
48
- public function getCallbackConfigData() {
49
- return $this->getMethod()->getCallbackConfigData();
50
- }
51
-
52
- /**
53
- * Get Customer Telephone no
54
- *
55
- * @return int
56
- */
57
- public function getCustomersTelephone() {
58
- $customer = Mage::getSingleton('customer/session')->getCustomer()->getDefaultBillingAddress();
59
- if ($customer) {
60
- return $customer->getTelephone();
61
- }
62
- }
63
-
64
- /**
65
- * Get Customer Email address
66
- *
67
- * @return string
68
- */
69
- public function getCustomersEmail() {
70
- $customer = Mage::getSingleton('customer/session')->getCustomer()->getEmail();
71
- if ($customer) {
72
- return $customer;
73
- }
74
- }
75
-
76
  /**
77
  * Get information to end user from config
78
  *
79
  * @return string
80
  */
81
- public function getUserInfo() {
 
82
  return $this->getMethod()->getConfigData('booking_reference');
83
  }
84
 
85
- /**
86
- * Retrieve Novalnet Mode in Configuration
87
- *
88
- * @return bool
89
- */
90
- public function getLiveMode() {
91
- return $this->getMethod()->_getConfigData('live_mode');
92
- }
93
-
94
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_Form_Prepayment extends Mage_Payment_Block_Form
27
+ {
28
 
29
+ protected function _construct()
30
+ {
31
  parent::_construct();
32
  $this->setTemplate('novalnet/payment/method/form/Prepayment.phtml');
33
  }
34
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
35
  /**
36
  * Get information to end user from config
37
  *
38
  * @return string
39
  */
40
+ public function getUserInfo()
41
+ {
42
  return $this->getMethod()->getConfigData('booking_reference');
43
  }
44
 
 
 
 
 
 
 
 
 
 
45
  }
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Safetypay.php DELETED
@@ -1,64 +0,0 @@
1
- <?php
2
-
3
- /**
4
- * Magento
5
- *
6
- * NOTICE OF LICENSE
7
- *
8
- * This source file is subject to the Open Software License (OSL 3.0)
9
- * that is bundled with this package in the file LICENSE.txt.
10
- * It is also available through the world-wide-web at this URL:
11
- * http://opensource.org/licenses/osl-3.0.php
12
- * If you did not receive a copy of the license and are unable to
13
- * obtain it through the world-wide-web, please send an email
14
- * to license@magentocommerce.com so we can send you a copy immediately.
15
- *
16
- * Part of the Paymentmodule of Novalnet AG
17
- * https://www.novalnet.de
18
- * If you have found this script usefull a small
19
- * recommendation as well as a comment on merchant form
20
- * would be greatly appreciated.
21
- *
22
- * @category Novalnet
23
- * @package Novalnet_Payment
24
- * @copyright Novalnet AG
25
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
- */
27
- class Novalnet_Payment_Block_Payment_Method_Form_Safetypay extends Mage_Payment_Block_Form {
28
-
29
- /**
30
- * Init default template for block
31
- */
32
- protected function _construct() {
33
- parent::_construct();
34
- $this->setTemplate('novalnet/payment/method/form/Safetypay.phtml');
35
- }
36
-
37
- /**
38
- * Retrieve payment configuration object
39
- *
40
- * @return Mage_Payment_Model_Config
41
- */
42
- protected function _getConfig() {
43
- return Mage::getSingleton('payment/config');
44
- }
45
-
46
- /**
47
- * Get information to end user from config
48
- *
49
- * @return string
50
- */
51
- public function getUserInfo() {
52
- return $this->getMethod()->getConfigData('booking_reference');
53
- }
54
-
55
- /**
56
- * Retrieve Novalnet Mode in Configuration
57
- *
58
- * @return bool
59
- */
60
- public function getLiveMode() {
61
- return $this->getMethod()->_getConfigData('live_mode');
62
- }
63
-
64
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Sepa.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,11 +23,34 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_Form_Sepa extends Mage_Payment_Block_Form {
 
28
 
29
- protected function _construct() {
 
30
  parent::_construct();
31
  $this->setTemplate('novalnet/payment/method/form/Sepa.phtml');
32
  }
33
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
34
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_Form_Sepa extends Mage_Payment_Block_Form
27
+ {
28
 
29
+ protected function _construct()
30
+ {
31
  parent::_construct();
32
  $this->setTemplate('novalnet/payment/method/form/Sepa.phtml');
33
  }
34
 
35
+ /**
36
+ * Check whether Callback type allowed
37
+ *
38
+ * @return bool
39
+ */
40
+ public function isCallbackTypeCall()
41
+ {
42
+ return $this->getMethod()->isCallbackTypeCall();
43
+ //return false;
44
+ }
45
+
46
+ /**
47
+ * Novalnet Callback data getter
48
+ *
49
+ * @return string
50
+ */
51
+ public function getCallbackConfigData()
52
+ {
53
+ return $this->getMethod()->_getConfigData('callback');
54
+ }
55
+
56
  }
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Sofortueberweisung.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,41 +23,26 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_Form_Sofortueberweisung extends Mage_Payment_Block_Form {
 
28
 
29
  /**
30
  * Init default template for block
31
  */
32
- protected function _construct() {
 
33
  parent::_construct();
34
  $this->setTemplate('novalnet/payment/method/form/Sofortueberweisung.phtml');
35
  }
36
 
37
- /**
38
- * Retrieve payment configuration object
39
- *
40
- * @return Mage_Payment_Model_Config
41
- */
42
- protected function _getConfig() {
43
- return Mage::getSingleton('payment/config');
44
- }
45
-
46
  /**
47
  * Get information to end user from config
48
  *
49
  * @return string
50
  */
51
- public function getUserInfo() {
 
52
  return $this->getMethod()->getConfigData('booking_reference');
53
  }
54
 
55
- /**
56
- * Retrieve Novalnet Mode in Configuration
57
- *
58
- * @return bool
59
- */
60
- public function getLiveMode() {
61
- return $this->getMethod()->_getConfigData('live_mode');
62
- }
63
-
64
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_Form_Sofortueberweisung extends Mage_Payment_Block_Form
27
+ {
28
 
29
  /**
30
  * Init default template for block
31
  */
32
+ protected function _construct()
33
+ {
34
  parent::_construct();
35
  $this->setTemplate('novalnet/payment/method/form/Sofortueberweisung.phtml');
36
  }
37
 
 
 
 
 
 
 
 
 
 
38
  /**
39
  * Get information to end user from config
40
  *
41
  * @return string
42
  */
43
+ public function getUserInfo()
44
+ {
45
  return $this->getMethod()->getConfigData('booking_reference');
46
  }
47
 
 
 
 
 
 
 
 
 
 
48
  }
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Cc.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_Info_Cc extends Mage_Payment_Block_Info {
 
28
 
29
  /**
30
  * Init default template for block
31
  */
32
- protected function _construct() {
 
33
  parent::_construct();
34
  $this->setTemplate('novalnet/payment/method/info/Cc.phtml');
35
  }
@@ -38,7 +39,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Cc extends Mage_Payment_Block_I
38
  * Render as PDF
39
  * @return string
40
  */
41
- public function toPdf() {
 
42
  $this->setTemplate('novalnet/payment/method/pdf/Cc.phtml');
43
  return $this->toHtml();
44
  }
@@ -48,7 +50,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Cc extends Mage_Payment_Block_I
48
  *
49
  * @return array
50
  */
51
- public function getAdditionalData($key) {
 
52
  return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
53
  }
54
 
@@ -57,14 +60,16 @@ class Novalnet_Payment_Block_Payment_Method_Info_Cc extends Mage_Payment_Block_I
57
  *
58
  * @return Mage_Payment_Model_Method_Abstract
59
  */
60
- public function getMethod() {
 
61
  return $this->getInfo()->getMethodInstance();
62
  }
63
 
64
  /**
65
  * @return string
66
  */
67
- public function getPaymentMethod() {
 
68
  return $this->getMethod()->getConfigData('title');
69
  }
70
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_Info_Cc extends Mage_Payment_Block_Info
27
+ {
28
 
29
  /**
30
  * Init default template for block
31
  */
32
+ protected function _construct()
33
+ {
34
  parent::_construct();
35
  $this->setTemplate('novalnet/payment/method/info/Cc.phtml');
36
  }
39
  * Render as PDF
40
  * @return string
41
  */
42
+ public function toPdf()
43
+ {
44
  $this->setTemplate('novalnet/payment/method/pdf/Cc.phtml');
45
  return $this->toHtml();
46
  }
50
  *
51
  * @return array
52
  */
53
+ public function getAdditionalData($key)
54
+ {
55
  return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
56
  }
57
 
60
  *
61
  * @return Mage_Payment_Model_Method_Abstract
62
  */
63
+ public function getMethod()
64
+ {
65
  return $this->getInfo()->getMethodInstance();
66
  }
67
 
68
  /**
69
  * @return string
70
  */
71
+ public function getPaymentMethod()
72
+ {
73
  return $this->getMethod()->getConfigData('title');
74
  }
75
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Ccsecure.php DELETED
@@ -1,110 +0,0 @@
1
- <?php
2
-
3
- /**
4
- * Magento
5
- *
6
- * NOTICE OF LICENSE
7
- *
8
- * This source file is subject to the Open Software License (OSL 3.0)
9
- * that is bundled with this package in the file LICENSE.txt.
10
- * It is also available through the world-wide-web at this URL:
11
- * http://opensource.org/licenses/osl-3.0.php
12
- * If you did not receive a copy of the license and are unable to
13
- * obtain it through the world-wide-web, please send an email
14
- * to license@magentocommerce.com so we can send you a copy immediately.
15
- *
16
- * Part of the Paymentmodule of Novalnet AG
17
- * https://www.novalnet.de
18
- * If you have found this script usefull a small
19
- * recommendation as well as a comment on merchant form
20
- * would be greatly appreciated.
21
- *
22
- * @category Novalnet
23
- * @package Novalnet_Payment
24
- * @copyright Novalnet AG
25
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
- */
27
- class Novalnet_Payment_Block_Payment_Method_Info_Ccsecure extends Mage_Payment_Block_Info {
28
-
29
- /**
30
- * Init default template for block
31
- */
32
- protected function _construct() {
33
- parent::_construct();
34
- $this->setTemplate('novalnet/payment/method/info/Ccsecure.phtml');
35
- }
36
-
37
- /**
38
- * Retrieve credit card type name
39
- *
40
- * @return string
41
- */
42
- public function getCcTypeName() {
43
- $types = Mage::getSingleton('payment/config')->getCcTypes();
44
- if (isset($types[$this->getInfo()->getCcType()])) {
45
- return $types[$this->getInfo()->getCcType()];
46
- }
47
- return $this->getInfo()->getCcType();
48
- }
49
-
50
- /**
51
- * Retrieve CC expiration month
52
- *
53
- * @return string
54
- */
55
- public function getCcExpMonth() {
56
- $month = $this->getInfo()->getCcExpMonth();
57
- if ($month < 10) {
58
- $month = '0' . $month;
59
- }
60
- return $month;
61
- }
62
-
63
- /**
64
- * Retrieve CC expiration date
65
- *
66
- * @return Zend_Date
67
- */
68
- public function getCcExpDate() {
69
- $date = Mage::app()->getLocale()->date(0);
70
- $date->setYear($this->getInfo()->getCcExpYear());
71
- $date->setMonth($this->getInfo()->getCcExpMonth());
72
- return $date;
73
- }
74
-
75
- /**
76
- * Render as PDF
77
- * @return string
78
- */
79
- public function toPdf() {
80
- $this->setTemplate('novalnet/payment/method/pdf/Ccsecure.phtml');
81
- return $this->toHtml();
82
- }
83
-
84
- /**
85
- * Retrieve payment method model
86
- *
87
- * @return Mage_Payment_Model_Method_Abstract
88
- */
89
- public function getMethod() {
90
- return $this->getInfo()->getMethodInstance();
91
- // return Mage::helper('novalnet_payment')->getModel('novalnetSecure');
92
- }
93
-
94
- /**
95
- * @return string
96
- */
97
- public function getPaymentMethod() {
98
- return $this->htmlEscape($this->getMethod()->getConfigData('title'));
99
- }
100
-
101
- /**
102
- * Get some specific information
103
- *
104
- * @return array
105
- */
106
- public function getAdditionalData($key) {
107
- return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
108
- }
109
-
110
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Elvaustria.php DELETED
@@ -1,78 +0,0 @@
1
- <?php
2
-
3
- /**
4
- * Magento
5
- *
6
- * NOTICE OF LICENSE
7
- *
8
- * This source file is subject to the Open Software License (OSL 3.0)
9
- * that is bundled with this package in the file LICENSE.txt.
10
- * It is also available through the world-wide-web at this URL:
11
- * http://opensource.org/licenses/osl-3.0.php
12
- * If you did not receive a copy of the license and are unable to
13
- * obtain it through the world-wide-web, please send an email
14
- * to license@magentocommerce.com so we can send you a copy immediately.
15
- *
16
- * Part of the Paymentmodule of Novalnet AG
17
- * https://www.novalnet.de
18
- * If you have found this script usefull a small
19
- * recommendation as well as a comment on merchant form
20
- * would be greatly appreciated.
21
- *
22
- * @category Novalnet
23
- * @package Novalnet_Payment
24
- * @copyright Novalnet AG
25
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
- */
27
- class Novalnet_Payment_Block_Payment_Method_Info_Elvaustria extends Mage_Payment_Block_Info {
28
-
29
- protected function _construct() {
30
- parent::_construct();
31
- $this->setTemplate('novalnet/payment/method/info/Elvaustria.phtml');
32
- }
33
-
34
- /**
35
- * Render as PDF
36
- * @return string
37
- */
38
- public function toPdf() {
39
- $this->setTemplate('novalnet/payment/method/pdf/Elvaustria.phtml');
40
- return $this->toHtml();
41
- }
42
-
43
- /**
44
- * Retrieve payment method model
45
- *
46
- * @return Mage_Payment_Model_Method_Abstract
47
- */
48
- public function getMethod() {
49
- return $this->getInfo()->getMethodInstance();
50
- }
51
-
52
- /**
53
- * @return string
54
- */
55
- public function getPaymentMethod() {
56
- return $this->htmlEscape($this->getMethod()->getConfigData('title'));
57
- }
58
-
59
- /**
60
- * Retrieve field value data from payment info object
61
- *
62
- * @param string $field
63
- * @return mixed
64
- */
65
- public function getInfoData($field) {
66
- return $this->htmlEscape($this->getMethod()->getInfoInstance()->getData($field));
67
- }
68
-
69
- /**
70
- * Get some specific information
71
- *
72
- * @return array
73
- */
74
- public function getAdditionalData($key) {
75
- return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
76
- }
77
-
78
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Elvgerman.php DELETED
@@ -1,78 +0,0 @@
1
- <?php
2
-
3
- /**
4
- * Magento
5
- *
6
- * NOTICE OF LICENSE
7
- *
8
- * This source file is subject to the Open Software License (OSL 3.0)
9
- * that is bundled with this package in the file LICENSE.txt.
10
- * It is also available through the world-wide-web at this URL:
11
- * http://opensource.org/licenses/osl-3.0.php
12
- * If you did not receive a copy of the license and are unable to
13
- * obtain it through the world-wide-web, please send an email
14
- * to license@magentocommerce.com so we can send you a copy immediately.
15
- *
16
- * Part of the Paymentmodule of Novalnet AG
17
- * https://www.novalnet.de
18
- * If you have found this script usefull a small
19
- * recommendation as well as a comment on merchant form
20
- * would be greatly appreciated.
21
- *
22
- * @category Novalnet
23
- * @package Novalnet_Payment
24
- * @copyright Novalnet AG
25
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
- */
27
- class Novalnet_Payment_Block_Payment_Method_Info_Elvgerman extends Mage_Payment_Block_Info {
28
-
29
- protected function _construct() {
30
- parent::_construct();
31
- $this->setTemplate('novalnet/payment/method/info/Elvgerman.phtml');
32
- }
33
-
34
- /**
35
- * Render as PDF
36
- * @return string
37
- */
38
- public function toPdf() {
39
- $this->setTemplate('novalnet/payment/method/pdf/Elvgerman.phtml');
40
- return $this->toHtml();
41
- }
42
-
43
- /**
44
- * Retrieve payment method model
45
- *
46
- * @return Mage_Payment_Model_Method_Abstract
47
- */
48
- public function getMethod() {
49
- return $this->getInfo()->getMethodInstance();
50
- }
51
-
52
- /**
53
- * @return string
54
- */
55
- public function getPaymentMethod() {
56
- return $this->htmlEscape($this->getMethod()->getConfigData('title'));
57
- }
58
-
59
- /**
60
- * Retrieve field value data from payment info object
61
- *
62
- * @param string $field
63
- * @return mixed
64
- */
65
- public function getInfoData($field) {
66
- return $this->htmlEscape($this->getMethod()->getInfoInstance()->getData($field));
67
- }
68
-
69
- /**
70
- * Get some specific information
71
- *
72
- * @return array
73
- */
74
- public function getAdditionalData($key) {
75
- return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
76
- }
77
-
78
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Ideal.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_Info_Ideal extends Mage_Payment_Block_Info {
 
28
 
29
  /**
30
  * Init default template for block
31
  */
32
- protected function _construct() {
 
33
  parent::_construct();
34
  $this->setTemplate('novalnet/payment/method/info/Ideal.phtml');
35
  }
@@ -39,7 +40,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Ideal extends Mage_Payment_Bloc
39
  *
40
  * @return Mage_Payment_Model_Method_Abstract
41
  */
42
- public function getMethod() {
 
43
  return $this->getInfo()->getMethodInstance();
44
  }
45
 
@@ -47,7 +49,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Ideal extends Mage_Payment_Bloc
47
  * Render as PDF
48
  * @return string
49
  */
50
- public function toPdf() {
 
51
  $this->setTemplate('novalnet/payment/method/pdf/Ideal.phtml');
52
  return $this->toHtml();
53
  }
@@ -57,7 +60,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Ideal extends Mage_Payment_Bloc
57
  *
58
  * @return array
59
  */
60
- public function getAdditionalData($key) {
 
61
  return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
62
  }
63
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_Info_Ideal extends Mage_Payment_Block_Info
27
+ {
28
 
29
  /**
30
  * Init default template for block
31
  */
32
+ protected function _construct()
33
+ {
34
  parent::_construct();
35
  $this->setTemplate('novalnet/payment/method/info/Ideal.phtml');
36
  }
40
  *
41
  * @return Mage_Payment_Model_Method_Abstract
42
  */
43
+ public function getMethod()
44
+ {
45
  return $this->getInfo()->getMethodInstance();
46
  }
47
 
49
  * Render as PDF
50
  * @return string
51
  */
52
+ public function toPdf()
53
+ {
54
  $this->setTemplate('novalnet/payment/method/pdf/Ideal.phtml');
55
  return $this->toHtml();
56
  }
60
  *
61
  * @return array
62
  */
63
+ public function getAdditionalData($key)
64
+ {
65
  return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
66
  }
67
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Invoice.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,9 +23,11 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_Info_Invoice extends Mage_Payment_Block_Info {
 
28
 
29
- protected function _construct() {
 
30
  parent::_construct();
31
  $this->setTemplate('novalnet/payment/method/info/Invoice.phtml');
32
  }
@@ -35,7 +36,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Invoice extends Mage_Payment_Bl
35
  * Render as PDF
36
  * @return string
37
  */
38
- public function toPdf() {
 
39
  $this->setTemplate('novalnet/payment/method/pdf/Invoice.phtml');
40
  return $this->toHtml();
41
  }
@@ -45,7 +47,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Invoice extends Mage_Payment_Bl
45
  *
46
  * @return Mage_Payment_Model_Method_Abstract
47
  */
48
- public function getMethod() {
 
49
  return $this->getInfo()->getMethodInstance();
50
  }
51
 
@@ -55,14 +58,16 @@ class Novalnet_Payment_Block_Payment_Method_Info_Invoice extends Mage_Payment_Bl
55
  * @param string $field
56
  * @return mixed
57
  */
58
- public function getInfoData($field) {
 
59
  return $this->htmlEscape($this->getMethod()->getInfoInstance()->getData($field));
60
  }
61
 
62
  /**
63
  * @return string
64
  */
65
- public function getPaymentMethod() {
 
66
  return $this->htmlEscape($this->getMethod()->getConfigData('title'));
67
  }
68
 
@@ -71,7 +76,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Invoice extends Mage_Payment_Bl
71
  *
72
  * @return array
73
  */
74
- public function getAdditionalData($key) {
 
75
  return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
76
  }
77
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_Info_Invoice extends Mage_Payment_Block_Info
27
+ {
28
 
29
+ protected function _construct()
30
+ {
31
  parent::_construct();
32
  $this->setTemplate('novalnet/payment/method/info/Invoice.phtml');
33
  }
36
  * Render as PDF
37
  * @return string
38
  */
39
+ public function toPdf()
40
+ {
41
  $this->setTemplate('novalnet/payment/method/pdf/Invoice.phtml');
42
  return $this->toHtml();
43
  }
47
  *
48
  * @return Mage_Payment_Model_Method_Abstract
49
  */
50
+ public function getMethod()
51
+ {
52
  return $this->getInfo()->getMethodInstance();
53
  }
54
 
58
  * @param string $field
59
  * @return mixed
60
  */
61
+ public function getInfoData($field)
62
+ {
63
  return $this->htmlEscape($this->getMethod()->getInfoInstance()->getData($field));
64
  }
65
 
66
  /**
67
  * @return string
68
  */
69
+ public function getPaymentMethod()
70
+ {
71
  return $this->htmlEscape($this->getMethod()->getConfigData('title'));
72
  }
73
 
76
  *
77
  * @return array
78
  */
79
+ public function getAdditionalData($key)
80
+ {
81
  return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
82
  }
83
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Paypal.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_Info_Paypal extends Mage_Payment_Block_Info {
 
28
 
29
  /**
30
  * Init default template for block
31
  */
32
- protected function _construct() {
 
33
  parent::_construct();
34
  $this->setTemplate('novalnet/payment/method/info/Paypal.phtml');
35
  }
@@ -39,7 +40,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Paypal extends Mage_Payment_Blo
39
  *
40
  * @return Mage_Payment_Model_Method_Abstract
41
  */
42
- public function getMethod() {
 
43
  return $this->getInfo()->getMethodInstance();
44
  }
45
 
@@ -47,7 +49,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Paypal extends Mage_Payment_Blo
47
  * Render as PDF
48
  * @return string
49
  */
50
- public function toPdf() {
 
51
  $this->setTemplate('novalnet/payment/method/pdf/Paypal.phtml');
52
  return $this->toHtml();
53
  }
@@ -57,7 +60,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Paypal extends Mage_Payment_Blo
57
  *
58
  * @return array
59
  */
60
- public function getAdditionalData($key) {
 
61
  return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
62
  }
63
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_Info_Paypal extends Mage_Payment_Block_Info
27
+ {
28
 
29
  /**
30
  * Init default template for block
31
  */
32
+ protected function _construct()
33
+ {
34
  parent::_construct();
35
  $this->setTemplate('novalnet/payment/method/info/Paypal.phtml');
36
  }
40
  *
41
  * @return Mage_Payment_Model_Method_Abstract
42
  */
43
+ public function getMethod()
44
+ {
45
  return $this->getInfo()->getMethodInstance();
46
  }
47
 
49
  * Render as PDF
50
  * @return string
51
  */
52
+ public function toPdf()
53
+ {
54
  $this->setTemplate('novalnet/payment/method/pdf/Paypal.phtml');
55
  return $this->toHtml();
56
  }
60
  *
61
  * @return array
62
  */
63
+ public function getAdditionalData($key)
64
+ {
65
  return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
66
  }
67
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Phonepayment.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,9 +23,11 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_Info_Phonepayment extends Mage_Payment_Block_Info {
 
28
 
29
- protected function _construct() {
 
30
  parent::_construct();
31
  $this->setTemplate('novalnet/payment/method/info/Phonepayment.phtml');
32
  }
@@ -35,7 +36,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Phonepayment extends Mage_Payme
35
  * Render as PDF
36
  * @return string
37
  */
38
- public function toPdf() {
 
39
  $this->setTemplate('novalnet/payment/method/pdf/Phonepayment.phtml');
40
  return $this->toHtml();
41
  }
@@ -45,7 +47,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Phonepayment extends Mage_Payme
45
  *
46
  * @return Mage_Payment_Model_Method_Abstract
47
  */
48
- public function getMethod() {
 
49
  return $this->getInfo()->getMethodInstance();
50
  }
51
 
@@ -55,14 +58,16 @@ class Novalnet_Payment_Block_Payment_Method_Info_Phonepayment extends Mage_Payme
55
  * @param string $field
56
  * @return mixed
57
  */
58
- public function getInfoData($field) {
 
59
  return $this->htmlEscape($this->getMethod()->getInfoInstance()->getData($field));
60
  }
61
 
62
  /**
63
  * @return string
64
  */
65
- public function getPaymentMethod() {
 
66
  return $this->htmlEscape($this->getMethod()->getConfigData('title'));
67
  }
68
 
@@ -71,7 +76,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Phonepayment extends Mage_Payme
71
  *
72
  * @return array
73
  */
74
- public function getAdditionalData($key) {
 
75
  return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
76
  }
77
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_Info_Phonepayment extends Mage_Payment_Block_Info
27
+ {
28
 
29
+ protected function _construct()
30
+ {
31
  parent::_construct();
32
  $this->setTemplate('novalnet/payment/method/info/Phonepayment.phtml');
33
  }
36
  * Render as PDF
37
  * @return string
38
  */
39
+ public function toPdf()
40
+ {
41
  $this->setTemplate('novalnet/payment/method/pdf/Phonepayment.phtml');
42
  return $this->toHtml();
43
  }
47
  *
48
  * @return Mage_Payment_Model_Method_Abstract
49
  */
50
+ public function getMethod()
51
+ {
52
  return $this->getInfo()->getMethodInstance();
53
  }
54
 
58
  * @param string $field
59
  * @return mixed
60
  */
61
+ public function getInfoData($field)
62
+ {
63
  return $this->htmlEscape($this->getMethod()->getInfoInstance()->getData($field));
64
  }
65
 
66
  /**
67
  * @return string
68
  */
69
+ public function getPaymentMethod()
70
+ {
71
  return $this->htmlEscape($this->getMethod()->getConfigData('title'));
72
  }
73
 
76
  *
77
  * @return array
78
  */
79
+ public function getAdditionalData($key)
80
+ {
81
  return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
82
  }
83
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Prepayment.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,9 +23,11 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_Info_Prepayment extends Mage_Payment_Block_Info {
 
28
 
29
- protected function _construct() {
 
30
  parent::_construct();
31
  $this->setTemplate('novalnet/payment/method/info/Prepayment.phtml');
32
  }
@@ -35,7 +36,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Prepayment extends Mage_Payment
35
  * Render as PDF
36
  * @return string
37
  */
38
- public function toPdf() {
 
39
  $this->setTemplate('novalnet/payment/method/pdf/Prepayment.phtml');
40
  return $this->toHtml();
41
  }
@@ -45,7 +47,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Prepayment extends Mage_Payment
45
  *
46
  * @return Mage_Payment_Model_Method_Abstract
47
  */
48
- public function getMethod() {
 
49
  return $this->getInfo()->getMethodInstance();
50
  }
51
 
@@ -55,14 +58,16 @@ class Novalnet_Payment_Block_Payment_Method_Info_Prepayment extends Mage_Payment
55
  * @param string $field
56
  * @return mixed
57
  */
58
- public function getInfoData($field) {
 
59
  return $this->htmlEscape($this->getMethod()->getInfoInstance()->getData($field));
60
  }
61
 
62
  /**
63
  * @return string
64
  */
65
- public function getPaymentMethod() {
 
66
  return $this->htmlEscape($this->getMethod()->getConfigData('title'));
67
  }
68
 
@@ -71,7 +76,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Prepayment extends Mage_Payment
71
  *
72
  * @return array
73
  */
74
- public function getAdditionalData($key) {
 
75
  return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
76
  }
77
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_Info_Prepayment extends Mage_Payment_Block_Info
27
+ {
28
 
29
+ protected function _construct()
30
+ {
31
  parent::_construct();
32
  $this->setTemplate('novalnet/payment/method/info/Prepayment.phtml');
33
  }
36
  * Render as PDF
37
  * @return string
38
  */
39
+ public function toPdf()
40
+ {
41
  $this->setTemplate('novalnet/payment/method/pdf/Prepayment.phtml');
42
  return $this->toHtml();
43
  }
47
  *
48
  * @return Mage_Payment_Model_Method_Abstract
49
  */
50
+ public function getMethod()
51
+ {
52
  return $this->getInfo()->getMethodInstance();
53
  }
54
 
58
  * @param string $field
59
  * @return mixed
60
  */
61
+ public function getInfoData($field)
62
+ {
63
  return $this->htmlEscape($this->getMethod()->getInfoInstance()->getData($field));
64
  }
65
 
66
  /**
67
  * @return string
68
  */
69
+ public function getPaymentMethod()
70
+ {
71
  return $this->htmlEscape($this->getMethod()->getConfigData('title'));
72
  }
73
 
76
  *
77
  * @return array
78
  */
79
+ public function getAdditionalData($key)
80
+ {
81
  return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
82
  }
83
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Safetypay.php DELETED
@@ -1,64 +0,0 @@
1
- <?php
2
-
3
- /**
4
- * Magento
5
- *
6
- * NOTICE OF LICENSE
7
- *
8
- * This source file is subject to the Open Software License (OSL 3.0)
9
- * that is bundled with this package in the file LICENSE.txt.
10
- * It is also available through the world-wide-web at this URL:
11
- * http://opensource.org/licenses/osl-3.0.php
12
- * If you did not receive a copy of the license and are unable to
13
- * obtain it through the world-wide-web, please send an email
14
- * to license@magentocommerce.com so we can send you a copy immediately.
15
- *
16
- * Part of the Paymentmodule of Novalnet AG
17
- * https://www.novalnet.de
18
- * If you have found this script usefull a small
19
- * recommendation as well as a comment on merchant form
20
- * would be greatly appreciated.
21
- *
22
- * @category Novalnet
23
- * @package Novalnet_Payment
24
- * @copyright Novalnet AG
25
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
- */
27
- class Novalnet_Payment_Block_Payment_Method_Info_Safetypay extends Mage_Payment_Block_Info {
28
-
29
- /**
30
- * Init default template for block
31
- */
32
- protected function _construct() {
33
- parent::_construct();
34
- $this->setTemplate('novalnet/payment/method/info/Safetypay.phtml');
35
- }
36
-
37
- /**
38
- * Retrieve payment method model
39
- *
40
- * @return Mage_Payment_Model_Method_Abstract
41
- */
42
- public function getMethod() {
43
- return $this->getInfo()->getMethodInstance();
44
- }
45
-
46
- /**
47
- * Render as PDF
48
- * @return string
49
- */
50
- public function toPdf() {
51
- $this->setTemplate('novalnet/payment/method/pdf/Safetypay.phtml');
52
- return $this->toHtml();
53
- }
54
-
55
- /**
56
- * Get some specific information
57
- *
58
- * @return array
59
- */
60
- public function getAdditionalData($key) {
61
- return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
62
- }
63
-
64
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Sepa.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_Info_Sepa extends Mage_Payment_Block_Info {
 
28
 
29
  /**
30
  * Init default template for block
31
  */
32
- protected function _construct() {
 
33
  parent::_construct();
34
  $this->setTemplate('novalnet/payment/method/info/Sepa.phtml');
35
  }
@@ -38,7 +39,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Sepa extends Mage_Payment_Block
38
  * Render as PDF
39
  * @return string
40
  */
41
- public function toPdf() {
 
42
  $this->setTemplate('novalnet/payment/method/pdf/Sepa.phtml');
43
  return $this->toHtml();
44
  }
@@ -48,7 +50,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Sepa extends Mage_Payment_Block
48
  *
49
  * @return array
50
  */
51
- public function getAdditionalData($key) {
 
52
  return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
53
  }
54
 
@@ -57,14 +60,16 @@ class Novalnet_Payment_Block_Payment_Method_Info_Sepa extends Mage_Payment_Block
57
  *
58
  * @return Mage_Payment_Model_Method_Abstract
59
  */
60
- public function getMethod() {
 
61
  return $this->getInfo()->getMethodInstance();
62
  }
63
 
64
  /**
65
  * @return string
66
  */
67
- public function getPaymentMethod() {
 
68
  return $this->getMethod()->getConfigData('title');
69
  }
70
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_Info_Sepa extends Mage_Payment_Block_Info
27
+ {
28
 
29
  /**
30
  * Init default template for block
31
  */
32
+ protected function _construct()
33
+ {
34
  parent::_construct();
35
  $this->setTemplate('novalnet/payment/method/info/Sepa.phtml');
36
  }
39
  * Render as PDF
40
  * @return string
41
  */
42
+ public function toPdf()
43
+ {
44
  $this->setTemplate('novalnet/payment/method/pdf/Sepa.phtml');
45
  return $this->toHtml();
46
  }
50
  *
51
  * @return array
52
  */
53
+ public function getAdditionalData($key)
54
+ {
55
  return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
56
  }
57
 
60
  *
61
  * @return Mage_Payment_Model_Method_Abstract
62
  */
63
+ public function getMethod()
64
+ {
65
  return $this->getInfo()->getMethodInstance();
66
  }
67
 
68
  /**
69
  * @return string
70
  */
71
+ public function getPaymentMethod()
72
+ {
73
  return $this->getMethod()->getConfigData('title');
74
  }
75
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Sofortueberweisung.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_Info_Sofortueberweisung extends Mage_Payment_Block_Info {
 
28
 
29
  /**
30
  * Init default template for block
31
  */
32
- protected function _construct() {
 
33
  parent::_construct();
34
  $this->setTemplate('novalnet/payment/method/info/Sofortueberweisung.phtml');
35
  }
@@ -39,7 +40,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Sofortueberweisung extends Mage
39
  *
40
  * @return Mage_Payment_Model_Method_Abstract
41
  */
42
- public function getMethod() {
 
43
  return $this->getInfo()->getMethodInstance();
44
  }
45
 
@@ -47,7 +49,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Sofortueberweisung extends Mage
47
  * Render as PDF
48
  * @return string
49
  */
50
- public function toPdf() {
 
51
  $this->setTemplate('novalnet/payment/method/pdf/Sofortueberweisung.phtml');
52
  return $this->toHtml();
53
  }
@@ -57,7 +60,8 @@ class Novalnet_Payment_Block_Payment_Method_Info_Sofortueberweisung extends Mage
57
  *
58
  * @return array
59
  */
60
- public function getAdditionalData($key) {
 
61
  return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
62
  }
63
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_Info_Sofortueberweisung extends Mage_Payment_Block_Info
27
+ {
28
 
29
  /**
30
  * Init default template for block
31
  */
32
+ protected function _construct()
33
+ {
34
  parent::_construct();
35
  $this->setTemplate('novalnet/payment/method/info/Sofortueberweisung.phtml');
36
  }
40
  *
41
  * @return Mage_Payment_Model_Method_Abstract
42
  */
43
+ public function getMethod()
44
+ {
45
  return $this->getInfo()->getMethodInstance();
46
  }
47
 
49
  * Render as PDF
50
  * @return string
51
  */
52
+ public function toPdf()
53
+ {
54
  $this->setTemplate('novalnet/payment/method/pdf/Sofortueberweisung.phtml');
55
  return $this->toHtml();
56
  }
60
  *
61
  * @return array
62
  */
63
+ public function getAdditionalData($key)
64
+ {
65
  return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
66
  }
67
 
app/code/community/Novalnet/Payment/Block/Payment/Method/NovalnetRedirect.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,46 +23,53 @@
24
  * @copyright Copyright (c) Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Block_Payment_Method_NovalnetRedirect extends Mage_Core_Block_Abstract {
 
28
 
29
- protected function _toHtml() {
30
- $payment = $this->getOrder()->getPayment()->getMethodInstance();
 
 
31
  $helper = Mage::helper('novalnet_payment');
32
- $paymentCode = $payment->getCode();
 
 
33
 
34
- if ($payment->_getConfigData('password', true)
35
- || $paymentCode == Novalnet_Payment_Model_Config::NN_CC3D) {
36
  $form = new Varien_Data_Form();
37
- $form->setAction($payment->getConfigData('url'))
38
  ->setId($paymentCode)
39
  ->setName($paymentCode)
40
  ->setMethod(Novalnet_Payment_Model_Config::NOVALNET_RETURN_METHOD)
41
  ->setUseContainer(true);
42
 
43
- $getFormData = $payment->buildRequest()->getData();
44
- $replacedFormData = Mage::helper('novalnet_payment/AssignData')->replaceParamsBasedOnPayment($getFormData, $paymentCode);
45
- foreach ($replacedFormData as $field => $value) {
46
  $form->addField($field, 'hidden', array('name' => $field, 'value' => $value));
47
  }
48
 
49
- $logFormData = Mage::helper('novalnet_payment/AssignData')->doRemoveSensitiveData($replacedFormData, $paymentCode);
50
- $authorizeKey = $payment->_getConfigData('password', true);
51
- $authCode = $paymentCode == Novalnet_Payment_Model_Config::NN_CC3D ? $logFormData['auth_code'] : $helper->getDecodedParam($logFormData['auth_code'] ,$authorizeKey);
52
- $productId = $paymentCode == Novalnet_Payment_Model_Config::NN_CC3D ? $logFormData['product'] : $helper->getDecodedParam($logFormData['product'] ,$authorizeKey);
53
- $tariffId = $paymentCode == Novalnet_Payment_Model_Config::NN_CC3D ? $logFormData['tariff'] : $helper->getDecodedParam($logFormData['tariff'] ,$authorizeKey);
54
- $data = array('vendor' => $logFormData['vendor'],
55
- 'auth_code' => $authCode,
56
- 'product' => $productId,
57
- 'tariff' => $tariffId,
58
- 'key' => $logFormData['key']
59
- );
60
- $payment = $this->getOrder()->getPayment();
61
- $payment->setAdditionalData(serialize($data))
62
- ->save();
 
 
 
 
63
 
64
  //Save Transaction request data
65
- $modNovalTransactionOverview = $helper->getModelTransactionOverview();
66
- $modNovalTransactionOverview->setOrderId($replacedFormData['order_no'])
67
  ->setRequestData(serialize($logFormData))
68
  ->setCreatedDate($helper->getCurrentDateTime())
69
  ->save();
@@ -71,7 +77,7 @@ class Novalnet_Payment_Block_Payment_Method_NovalnetRedirect extends Mage_Core_B
71
  // IE & Firefox will not submit form if the form is full of hidden fileds.
72
  $form->addField('continue', 'submit', array('name' => 'Continue', 'value' => $this->__('Continue')));
73
  $html = '<html><body>';
74
- $html.= $this->__('You will be redirected to Novalnet AG website when you place an order.');
75
  $html.= $form->toHtml();
76
  $html.= '<script type="text/javascript">document.getElementById("' . $paymentCode . '").submit();</script>';
77
  $html.= '</body></html>';
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Copyright (c) Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Block_Payment_Method_NovalnetRedirect extends Mage_Core_Block_Abstract
27
+ {
28
 
29
+ protected function _toHtml()
30
+ {
31
+ $payment = $this->getOrder()->getPayment();
32
+ $paymentObj = $payment->getMethodInstance();
33
  $helper = Mage::helper('novalnet_payment');
34
+ $paymentCode = $payment->getMethodInstance()->getCode();
35
+ $actionUrl = $helper->getPayportUrl('redirect', $paymentCode);
36
+ $authorizeKey = $paymentObj->_getConfigData('password', true);
37
 
38
+ if ($authorizeKey) {
 
39
  $form = new Varien_Data_Form();
40
+ $form->setAction($actionUrl)
41
  ->setId($paymentCode)
42
  ->setName($paymentCode)
43
  ->setMethod(Novalnet_Payment_Model_Config::NOVALNET_RETURN_METHOD)
44
  ->setUseContainer(true);
45
 
46
+ $getFormData = $paymentObj->buildRequest()->getData();
47
+ foreach ($getFormData as $field => $value) {
 
48
  $form->addField($field, 'hidden', array('name' => $field, 'value' => $value));
49
  }
50
 
51
+ $logFormData = Mage::helper('novalnet_payment/AssignData')->doRemoveSensitiveData($getFormData, $paymentCode);
52
+ $authCode = $paymentCode == Novalnet_Payment_Model_Config::NN_CC ? $logFormData['auth_code']
53
+ : $helper->getDecodedParam($logFormData['auth_code'], $authorizeKey);
54
+ $productId = $paymentCode == Novalnet_Payment_Model_Config::NN_CC ? $logFormData['product']
55
+ : $helper->getDecodedParam($logFormData['product'], $authorizeKey);
56
+ $tariffId = $paymentCode == Novalnet_Payment_Model_Config::NN_CC ? $logFormData['tariff']
57
+ : $helper->getDecodedParam($logFormData['tariff'], $authorizeKey);
58
+ $data = array('vendor' => $logFormData['vendor'],
59
+ 'auth_code' => $authCode,
60
+ 'product' => $productId,
61
+ 'tariff' => $tariffId,
62
+ 'key' => $logFormData['key']
63
+ );
64
+ if ($paymentCode == Novalnet_Payment_Model_Config::NN_CC && $paymentObj->_getConfigData('active_cc3d')) {
65
+ $data['ActiveCc3d'] = 1;
66
+ }
67
+ $payment->setAdditionalData(serialize($data))
68
+ ->save();
69
 
70
  //Save Transaction request data
71
+ $modNnTransOverview = $helper->getModelTransactionOverview();
72
+ $modNnTransOverview->setOrderId($getFormData['order_no'])
73
  ->setRequestData(serialize($logFormData))
74
  ->setCreatedDate($helper->getCurrentDateTime())
75
  ->save();
77
  // IE & Firefox will not submit form if the form is full of hidden fileds.
78
  $form->addField('continue', 'submit', array('name' => 'Continue', 'value' => $this->__('Continue')));
79
  $html = '<html><body>';
80
+ $html.= $this->__('You will be redirected to Novalnet AG in a few seconds.');
81
  $html.= $form->toHtml();
82
  $html.= '<script type="text/javascript">document.getElementById("' . $paymentCode . '").submit();</script>';
83
  $html.= '</body></html>';
app/code/community/Novalnet/Payment/Helper/AssignData.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,104 +23,108 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
28
 
29
  /**
30
  * Assign Form Data in quote instance based on payment method
31
  *
32
  * @return Mage_Payment_Model_Abstract Object
33
  */
34
- public function assignNovalnetData($paymentCode, $data, $infoInstance) {
 
35
  if ($paymentCode) {
36
  if (!($data instanceof Varien_Object)) {
37
  $data = new Varien_Object($data);
38
  }
 
 
39
  switch ($paymentCode) {
40
- case Novalnet_Payment_Model_Config::NN_ELVDE:
41
- $infoInstance->setNnAccountHolder(trim($data->getAccountHolder()))
42
- ->setNnAccountNumber(trim($data->getAccountNumber()))
43
- ->setNnBankSortingCode(trim($data->getBankSortingCode()))
44
- ->setNnAcdc($data->getAcdc())
45
- ->setNnElvCountry($data->getElvCountry())
46
- ->setNnCallbackTelNovalnetElvgerman($data->getCallbackTel())
47
- ->setNnCallbackPinNovalnetElvgerman(trim($data->getCallbackPin()))
48
- ->setNnNewCallbackPinNovalnetElvgerman($data->getNewCallbackPin())
49
- ->setNnCallbackEmailNovalnetElvgerman($data->getCallbackEmail());
50
- if ($this->getModel($paymentCode)->_getConfigData('acdc_check')) {
51
- $infoInstance->setAcdcValidationFlag(true);
52
- }
53
- if ($this->getModel($paymentCode)->_getConfigData('callback') != 3) {
54
- $infoInstance->setCallbackPinValidationFlag(true);
55
- }
56
- $this->_getCheckout()->setElvDeAccountHolder($infoInstance->getNnAccountHolder())
57
- ->setElvDeAccountNumber($infoInstance->getNnAccountNumber())
58
- ->setElvDeBankSortingCode($infoInstance->getNnBankSortingCode())
59
- ->setNnCallbackTelNovalnetElvgerman($data->getCallbackTel())
60
- ->setNnCallbackEmailNovalnetElvgerman($data->getCallbackEmail())
61
- ->setNnPaymentCode($paymentCode);
62
- break;
63
- case Novalnet_Payment_Model_Config::NN_ELVAT:
64
- $infoInstance->setNnAccountHolder(trim($data->getAccountHolderAt()))
65
- ->setNnAccountNumber(trim($data->getAccountNumberAt()))
66
- ->setNnBankSortingCode(trim($data->getBankSortingCodeAt()))
67
- ->setNnCallbackTelNovalnetElvaustria($data->getCallbackTel())
68
- ->setNnCallbackPinNovalnetElvaustria(trim($data->getCallbackPin()))
69
- ->setNnNewCallbackPinNovalnetElvaustria($data->getNewCallbackPin())
70
- ->setNnCallbackEmailNovalnetElvaustria($data->getCallbackEmail());
71
- if ($this->getModel($paymentCode)->_getConfigData('callback') != 3) {
72
- $infoInstance->setCallbackPinValidationFlag(true);
73
- }
74
- $this->_getCheckout()->setElvAtAccountHolder($infoInstance->getNnAccountHolder())
75
- ->setElvAtAccountNumber($infoInstance->getNnAccountNumber())
76
- ->setElvAtBankSortingCode($infoInstance->getNnBankSortingCode())
77
- ->setNnCallbackTelNovalnetElvaustria($data->getCallbackTel())
78
- ->setNnCallbackEmailNovalnetElvaustria($data->getCallbackEmail())
79
- ->setNnPaymentCode($paymentCode);
80
- break;
81
  case Novalnet_Payment_Model_Config::NN_CC:
82
- $infoInstance->setPanHash($this->novalnetCardDetails('novalnet_cc_pan_hash'))
83
- ->setUniqueId($this->novalnetCardDetails('novalnet_cc_unique_id'))
84
- ->setNnCallbackTelNovalnetCc($data->getCallbackTel())
85
- ->setNnCallbackPinNovalnetCc(trim($data->getCallbackPin()))
86
- ->setNnNewCallbackPinNovalnetCc($data->getNewCallbackPin())
87
- ->setNnCallbackEmailNovalnetCc($data->getCallbackEmail());
88
- if ($this->getModel($paymentCode)->_getConfigData('callback') != 3) {
 
 
 
 
 
 
 
 
 
 
89
  $infoInstance->setCallbackPinValidationFlag(true);
90
  }
91
- $this->_getCheckout()->setCcPanHash($infoInstance->getPanHash())
92
- ->setCcFieldValidator($this->novalnetCardDetails('novalnet_cc_field_validator'))
93
- ->setNnCallbackTelNovalnetCc($data->getCallbackTel())
94
- ->setNnCallbackEmailNovalnetCc($data->getCallbackEmail())
95
- ->setNnPaymentCode($paymentCode);
96
  break;
97
  case Novalnet_Payment_Model_Config::NN_SEPA:
98
- $infoInstance->setSepaPanHash($this->novalnetCardDetails('novalnet_sepa_pan_hash'))
99
- ->setSepaUniqueId($this->novalnetCardDetails('novalnet_sepa_unique_id'))
100
- ->setSepaHolder($this->novalnetCardDetails('novalnet_sepa_owner'))
101
- ->setIbanConfirmed($this->novalnetCardDetails('novalnet_sepa_iban_confirmed'))
102
- ->setSepaType($this->getModel($paymentCode)->_getConfigData('sepatypes'))
103
- ->setSepaDuedate($this->getModel($paymentCode)->_getConfigData('sepa_due_date'));
104
- $this->_getCheckout()->setSepaHash($infoInstance->getSepaPanHash())
105
- ->setSepaFieldValidator($this->novalnetCardDetails('novalnet_sepa_field_validator'))
106
- ->setSepaMandateRef($this->novalnetCardDetails('novalnet_sepa_mandate_ref'))
107
- ->setSepaMandateDate($this->novalnetCardDetails('novalnet_sepa_mandate_date'))
108
- ->setNnPaymentCode($paymentCode);
109
- break;
110
- case Novalnet_Payment_Model_Config::NN_CC3D:
111
- $this->_getCheckoutSession()->setNnCcNumber(Mage::helper('core')->encrypt($data->getNnCcNumber()))
112
- ->setNnCcType(Mage::helper('core')->encrypt($data->getNnCcType()))
113
- ->setNnCcCvc(Mage::helper('core')->encrypt($data->getNnCcCid()))
114
- ->setNnCcOwner(Mage::helper('core')->encrypt($data->getNnCcOwner()))
115
- ->setNnCcExpMonth(Mage::helper('core')->encrypt($data->getNnCcExpMonth()))
116
- ->setNnCcExpYear(Mage::helper('core')->encrypt($data->getNnCcExpYear()))
117
- ->setNnPaymentCode($paymentCode);
118
  break;
119
  case Novalnet_Payment_Model_Config::NN_INVOICE:
120
  $infoInstance->setNnCallbackTelNovalnetInvoice($data->getCallbackTel())
121
  ->setNnCallbackPinNovalnetInvoice(trim($data->getCallbackPin()))
122
  ->setNnNewCallbackPinNovalnetInvoice($data->getNewCallbackPin())
123
- ->setNnCallbackEmailNovalnetInvoice($data->getCallbackEmail());
124
- if ($this->getModel($paymentCode)->_getConfigData('callback') != 3) {
 
125
  $infoInstance->setCallbackPinValidationFlag(true);
126
  }
127
  break;
@@ -134,77 +137,65 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data {
134
  *
135
  * throw Mage Exception
136
  */
137
- public function validateNovalnetData($paymentCode, $infoInstance) {
 
138
  switch ($paymentCode) {
139
- case Novalnet_Payment_Model_Config::NN_ELVDE:
140
- case Novalnet_Payment_Model_Config::NN_ELVAT:
141
- $nnAccountHolder = $infoInstance->getNnAccountHolder();
142
- $nnAccountNumber = preg_replace('/[\-\s]+/', '', $infoInstance->getNnAccountNumber());
143
- $nnBankSortingCode = preg_replace('/[\-\s]+/', '', $infoInstance->getNnBankSortingCode());
144
-
145
- if (!$this->checkIsValid($nnAccountHolder)
146
- || !$this->checkIsNumeric($nnAccountNumber) || !$this->checkIsNumeric($nnBankSortingCode)) {
147
- Mage::throwException($this->__('Please enter valid account details') . '!');
148
- }
149
-
150
- if ($paymentCode == Novalnet_Payment_Model_Config::NN_ELVDE
151
- && $infoInstance->getAcdcValidationFlag() && !$infoInstance->getNnAcdc()) {
152
- Mage::throwException($this->__('Please enable ACDC Check') . '!');
153
- }
154
- break;
155
  case Novalnet_Payment_Model_Config::NN_CC:
156
- $ccType = $this->novalnetCardDetails('novalnet_cc_type');
157
- $ccOwner = $this->novalnetCardDetails('novalnet_cc_owner');
158
- $expYear = $this->novalnetCardDetails('novalnet_cc_exp_year');
159
- $expMonth = $this->novalnetCardDetails('novalnet_cc_exp_month');
160
- $ccid = $this->novalnetCardDetails('novalnet_cc_cid');
161
- $verifcationRegEx = $this->_getVerificationRegExp();
162
- $regExp = isset($verifcationRegEx[$ccType]) ? $verifcationRegEx[$ccType] : '';
163
- if (!$infoInstance->getPanHash() || !$infoInstance->getUniqueId()) {
164
- Mage::throwException($this->__('Authentication Failed'));
165
- } elseif (!$this->checkIsValid($ccOwner) || !$this->_validateExpDate($expYear, $expMonth)
166
- || !$this->checkIsNumeric($ccid)) {
167
  Mage::throwException($this->__('Please enter valid credit card details') . '!');
168
- } elseif($this->checkCallbackAmount($paymentCode) && $this->getModel($paymentCode)->_getConfigData('callback') == '1' && !$infoInstance->getNnCallbackTelNovalnetCc() && !$this->checkIsAdmin()){
169
- Mage::throwException($this->__('Please enter the Telephone / Mobilenumber') . '!');
170
- } elseif($this->checkCallbackAmount($paymentCode) && $this->getModel($paymentCode)->_getConfigData('callback') == '3' && !$this->validateEmail($infoInstance->getNnCallbackEmailNovalnetCc()) && !$this->checkIsAdmin()){
171
- Mage::throwException($this->__('Please enter the E-Mail Address') . '!');
172
- } elseif (!$ccid || !$regExp || !preg_match($regExp ,$ccid)){
173
- Mage::throwException($this->__('Please enter valid credit card details') . '!');
174
- }
 
 
 
175
  break;
176
  case Novalnet_Payment_Model_Config::NN_SEPA:
177
- $sepaDueDate = $infoInstance->getSepaDuedate();
178
- $sepaHolder = $infoInstance->getSepaHolder();
179
- if (!$infoInstance->getIbanConfirmed()) {
180
- Mage::throwException($this->__('Please confirm IBAN & BIC'));
181
- } elseif (!$infoInstance->getSepaPanHash() || !$infoInstance->getSepaUniqueId()) {
182
- Mage::throwException($this->__('Please enter valid account details'));
183
- } elseif (!$sepaHolder || preg_match('/[#%\^<>@$=*!]/', $sepaHolder)) {
184
- Mage::throwException($this->__('Please enter valid account details').'!');
185
- } elseif ($infoInstance->getSepaType() == 'DD_SEPA' && $sepaDueDate && ($sepaDueDate < 7 || !is_numeric($sepaDueDate))) {
186
- Mage::throwException($this->__('Due date is not valid').'!');
187
- }
188
- break;
189
- case Novalnet_Payment_Model_Config::NN_CC3D:
190
- $ccOwner = Mage::helper('core')->decrypt($this->_getCheckoutSession()->getNnCcOwner());
191
- $expYear = Mage::helper('core')->decrypt($this->_getCheckoutSession()->getNnCcExpYear());
192
- $expMonth = Mage::helper('core')->decrypt($this->_getCheckoutSession()->getNnCcExpMonth());
193
 
194
- if (!$this->checkIsValid($ccOwner) || !$this->_validateExpDate($expYear, $expMonth)) {
195
- Mage::throwException($this->__('Please enter valid credit card details') . '!');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
196
  }
197
  break;
198
  case Novalnet_Payment_Model_Config::NN_IDEAL:
199
  case Novalnet_Payment_Model_Config::NN_PAYPAL:
200
  case Novalnet_Payment_Model_Config::NN_SOFORT:
201
- case Novalnet_Payment_Model_Config::NN_SAFETYPAY:
202
  if (!$this->getModel($paymentCode)->_getConfigData('password', true)) {
203
  Mage::throwException($this->__('Basic parameter not valid') . '!');
204
  }
205
 
206
- if ($paymentCode == Novalnet_Payment_Model_Config::NN_PAYPAL &&
207
- (!$this->getModel($paymentCode)->_getConfigData('api_sign', true)
208
  || !$this->getModel($paymentCode)->_getConfigData('api_user', true)
209
  || !$this->getModel($paymentCode)->_getConfigData('api_password', true))) {
210
  Mage::throwException($this->__('Basic parameter not valid') . '!');
@@ -219,18 +210,13 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data {
219
  *
220
  * @return Mage_Payment_Model_Abstract Object
221
  */
222
- public function assignNovalnetReturnData(Varien_Object $request, $paymentCode) {
223
- $redirectPayment = array(
224
- Novalnet_Payment_Model_Config::NN_SOFORT,
225
- Novalnet_Payment_Model_Config::NN_PAYPAL,
226
- Novalnet_Payment_Model_Config::NN_IDEAL,
227
- Novalnet_Payment_Model_Config::NN_CC3D,
228
- Novalnet_Payment_Model_Config::NN_SAFETYPAY
229
- );
230
  $request->setUserVariable_0(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB))
231
  ->setReturnMethod(Novalnet_Payment_Model_Config::NOVALNET_RETURN_METHOD)
232
  ->setErrorReturnMethod(Novalnet_Payment_Model_Config::NOVALNET_RETURN_METHOD);
233
- if (in_array($paymentCode, $redirectPayment)) {
234
  $request->setReturnUrl($this->getUrl(Novalnet_Payment_Model_Config::GATEWAY_RETURN_URL))
235
  ->setErrorReturnUrl($this->getUrl(Novalnet_Payment_Model_Config::GATEWAY_ERROR_RETURN_URL));
236
  }
@@ -243,7 +229,8 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data {
243
  * @param String $key
244
  * @return String
245
  */
246
- public function importNovalnetEncodeData(Varien_Object $dataObj, $key) {
 
247
  $encoding = $this->getPciEncodedParam($dataObj, $key);
248
  if ($encoding != true) {
249
  Mage::getSingleton('core/session')->addError('Die Methoden f&uuml;r die Verarbeitung von Zeichens&auml;tzen sind nicht verf&uuml;gbar!');
@@ -263,7 +250,8 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data {
263
  * @param String $key
264
  * @return String
265
  */
266
- public function importNovalnetHashData(Varien_Object $dataObj, $key) {
 
267
  $hash = $this->generateHash($dataObj, $key);
268
  if ($hash == false) {
269
  Mage::getSingleton('core/session')->addError('Die Hashfunktionen sind nicht verf&uuml;gbar!');
@@ -276,33 +264,14 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data {
276
  return $dataObj;
277
  }
278
 
279
- /**
280
- * Do XML call request to server
281
- *
282
- * @param Varien_Object $request_data
283
- * @param String $request_url
284
- * @return Mage_Payment_Model_Abstract Object
285
- */
286
- public function setRawCallRequest($request_data, $request_url) {
287
- $httpClientConfig = array('maxredirects' => 0);
288
- $client = new Varien_Http_Client($request_url, $httpClientConfig);
289
- $client->setRawData($request_data)->setMethod(Varien_Http_Client::POST);
290
- $response = $client->request();
291
- if (!$response->isSuccessful()) {
292
- Mage::throwException($this->_getHelper()->__('Gateway request error: %s', $response->getMessage()));
293
- }
294
- $result = new Varien_Object();
295
- $result->addData($this->deformatNvp('&', $response->getBody()));
296
- return $result;
297
- }
298
-
299
  /**
300
  * Retrieve Credit Card Details
301
  *
302
  * @param string $param
303
  * @return string
304
  */
305
- public function novalnetCardDetails($param) {
 
306
  return Mage::app()->getRequest()->getPost($param);
307
  }
308
 
@@ -313,32 +282,29 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data {
313
  * @param integer $paymentCode
314
  * @return Mage_Payment_Model_Abstract Object
315
  */
316
- public function doRemoveSensitiveData($request, $paymentCode) {
 
317
  if ($paymentCode) {
318
  switch ($paymentCode) {
319
- case Novalnet_Payment_Model_Config::NN_ELVDE:
320
- case Novalnet_Payment_Model_Config::NN_ELVAT:
321
- $request->unsBankAccountHolder()
322
- ->unsBankAccount()
323
- ->unsBankCode();
324
- break;
325
- case Novalnet_Payment_Model_Config::NN_CC3D:
326
- unset($request['cc_holder'], $request['cc_no'], $request['cc_exp_month'], $request['cc_exp_year'], $request['cc_cvc2']);
327
- break;
328
  case Novalnet_Payment_Model_Config::NN_CC:
329
- $request->unsCcHolder()
330
- ->unsCcNo()
331
- ->unsCcExpMonth()
332
- ->unsCcExpYear()
333
- ->unsCcCvc2()
334
- ->unsCcType();
 
 
 
 
 
335
  break;
336
- case Novalnet_Payment_Model_Config::NN_SEPA:
337
  $request->unsBankAccountHolder()
338
- ->unsBankAccount()
339
- ->unsBankCode()
340
- ->unsBic()
341
- ->unsIban();
342
  break;
343
  }
344
  }
@@ -352,50 +318,33 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data {
352
  * @param integer $expMonth
353
  * @return bool
354
  */
355
- protected function _validateExpDate($expYear, $expMonth) {
 
356
  $date = Mage::app()->getLocale()->date();
357
- if (!$expYear || !$expMonth || ($date->compareYear($expYear) == 1)
358
- || ($date->compareYear($expYear) == 0 && ($date->compareMonth($expMonth) == 1))
359
  ) {
360
  return false;
361
  }
362
  return true;
363
  }
364
 
365
- /**
366
- * Get credit card type regular expression
367
- *
368
- * @return array
369
- */
370
- protected function _getVerificationRegExp(){
371
- $verificationExpList = array(
372
- 'VI' => '/^[0-9]{3}$/', // Visa
373
- 'MC' => '/^[0-9]{3}$/', // Master Card
374
- 'AE' => '/^[0-9]{4}$/', // American Express
375
- 'DI' => '/^[0-9]{3}$/', // Discovery
376
- 'SS' => '/^[0-9]{3,4}$/',
377
- 'SM' => '/^[0-9]{3,4}$/', // Switch or Maestro
378
- 'SO' => '/^[0-9]{3,4}$/', // Solo
379
- 'OT' => '/^[0-9]{3,4}$/',
380
- 'JCB' => '/^[0-9]{3,4}$/' //JCB
381
- );
382
- return $verificationExpList;
383
- }
384
-
385
  /**
386
  * Get Novalnet Bank Account Details
387
  *
388
  * @param array $result
389
  * @return mixed
390
  */
391
- public function getNote($result, $paymentDuration) {
392
- $dueDate = $this->setDueDate($paymentDuration);
 
393
  $note = NULL;
394
  $note .= "<br /><b>" . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . "</b><br />";
395
- $note .= ($dueDate) ? ($this->__('Due Date') . ' : <b>' . Mage::helper('core')->formatDate($dueDate) . "</b><br />") : NULL;
396
- $note .= $this->__('Account Holder2') . " : <b>NOVALNET AG</b><br />";
397
- $note .= $this->__('NnAccount number') . " : <b>" . $result->getInvoiceAccount() . "</b><br />";
398
- $note .= $this->__('Bank Sorting Code') . " : <b>" . $result->getInvoiceBankcode() . "</b><br />";
 
399
  $note .= $this->__('NN_Bank') . " : <b>" . $result->getInvoiceBankname() . " " . trim($result->getInvoiceBankplace()) . "</b><br />";
400
  return $note;
401
  }
@@ -406,7 +355,8 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data {
406
  * @param float $amount
407
  * @return string
408
  */
409
- public function getBankDetailsAmount($amount) {
 
410
  return $this->__('NN_Amount') . " : <b>" . Mage::helper('core')->currency($amount, true, false) . "</b><br />";
411
  }
412
 
@@ -416,62 +366,22 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data {
416
  * @param integer $tid
417
  * @return string
418
  */
419
- public function getBankDetailsTID($tid) {
420
- return $this->__('NN_Reference') . " : <b>TID " . $tid . "</b><br /><br />";
 
421
  }
422
 
423
  /**
424
- * Return foreign transfer details
425
- *
426
- * @param object $result
427
- * @return string
428
- */
429
- public function getBankDetailsTransfer($result) {
430
- $note = NULL;
431
- $note .= "<b>" . $this->__('Only for foreign transfers') . ":</b><br />";
432
- $note .= "IBAN : <b> " . $result->getInvoiceIban() . " </b><br />";
433
- $note .= "SWIFT/BIC : <b>" . $result->getInvoiceBic() . " </b><br />";
434
- return $note;
435
- }
436
-
437
- public function replaceParamsBasedOnPayment($requestData, $paymentCode, $mode='request') {
438
- if($paymentCode == Novalnet_Payment_Model_Config::NN_SAFETYPAY) {
439
-
440
- $replacewithParams = array('vendor'=>'vendor_id', 'auth_code'=>'vendor_authcode', 'product'=>'product_id', 'tariff'=>'tariff_id');
441
- $replacewithParams = ($mode == 'response') ? array_flip($replacewithParams) : $replacewithParams;
442
- foreach($replacewithParams as $key => $val) {
443
- $requestData[$val] = $requestData[$key];
444
- unset($requestData[$key]);
445
- }
446
- $requestData['implementation'] = 'PHP_PCI';
447
-
448
- }
449
- return $requestData;
450
- }
451
-
452
- /**
453
  * Check whether callback option is enabled
454
  *
455
  */
456
- public function checkCallbackAmount($paymentCode) {
457
- $grandTotal = $this->_getCheckoutSession()->getQuote()->getBaseGrandTotal();
458
- $grandTotal = $this->getFormatedAmount($grandTotal);
459
- $callBackMinimum = (int)$this->getModel($paymentCode)->_getConfigData('callback_minimum_amount');
 
460
 
461
  return ($callBackMinimum ? $grandTotal >= $callBackMinimum : true);
462
  }
463
 
464
- /**
465
- * Get checkout session
466
- *
467
- * @return Mage_Sales_Model_Order
468
- */
469
- public function _getCheckout() {
470
- if (Mage::app()->getStore()->isAdmin()) {
471
- return $this->_getAdminCheckoutSession();
472
- } else {
473
- return $this->_getCheckoutSession();
474
- }
475
- }
476
-
477
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
27
+ {
28
+
29
+ /**
30
+ * Name library directory.
31
+ */
32
+ const NAME_DIR_JS = 'novalnet/';
33
+
34
+ /**
35
+ * List files for include.
36
+ *
37
+ * @var array
38
+ */
39
+ protected $_files = array(
40
+ 'novalnetcc.js',
41
+ 'novalnetsepa.js',
42
+ );
43
+
44
+ /**
45
+ * Return path file.
46
+ *
47
+ * @param $file
48
+ *
49
+ * @return string
50
+ */
51
+ public function getJQueryPath($file)
52
+ {
53
+ return self::NAME_DIR_JS . $file;
54
+ }
55
+
56
+ /**
57
+ * Return list files.
58
+ *
59
+ * @return array
60
+ */
61
+ public function getFiles()
62
+ {
63
+ return $this->_files;
64
+ }
65
 
66
  /**
67
  * Assign Form Data in quote instance based on payment method
68
  *
69
  * @return Mage_Payment_Model_Abstract Object
70
  */
71
+ public function assignNovalnetData($paymentCode, $data, $infoInstance)
72
+ {
73
  if ($paymentCode) {
74
  if (!($data instanceof Varien_Object)) {
75
  $data = new Varien_Object($data);
76
  }
77
+ $methodSession = $this->_getCheckout()->getData($paymentCode);
78
+
79
  switch ($paymentCode) {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
80
  case Novalnet_Payment_Model_Config::NN_CC:
81
+ $methodSession->setCcFieldValidator($this->novalnetCardDetails('novalnet_cc_field_validator'))
82
+ ->setCcPanHash($this->novalnetCardDetails('novalnet_cc_pan_hash'))
83
+ ->setCcUniqueId($this->novalnetCardDetails('novalnet_cc_unique_id'))
84
+ ->setNnCcType($this->novalnetCardDetails('novalnet_cc_type'))
85
+ ->setNnCcExpMonth($this->novalnetCardDetails('novalnet_cc_exp_month'))
86
+ ->setNnCcExpYear($this->novalnetCardDetails('novalnet_cc_exp_year'))
87
+ ->setNnCcCvc($this->novalnetCardDetails('novalnet_cc_cid'))
88
+ ->setNnCcOwner($this->novalnetCardDetails('novalnet_cc_owner'))
89
+ ->setNnCallbackTelNovalnetCc($data->getCallbackTel())
90
+ ->setNnCallbackEmailNovalnetCc($data->getCallbackEmail());
91
+ $this->_getCheckout()->setNnPaymentCode($paymentCode);
92
+ $infoInstance->setNnCallbackTelNovalnetCc($data->getCallbackTel())
93
+ ->setNnCallbackPinNovalnetCc(trim($data->getCallbackPin()))
94
+ ->setNnNewCallbackPinNovalnetCc($data->getNewCallbackPin())
95
+ ->setNnCallbackEmailNovalnetCc($data->getCallbackEmail());
96
+ if ($this->getModel($paymentCode)->_getConfigData('callback')
97
+ != 3) {
98
  $infoInstance->setCallbackPinValidationFlag(true);
99
  }
 
 
 
 
 
100
  break;
101
  case Novalnet_Payment_Model_Config::NN_SEPA:
102
+
103
+ $methodSession->setSepaHash($this->novalnetCardDetails('novalnet_sepa_pan_hash'))
104
+ ->setSepaUniqueId($this->novalnetCardDetails('novalnet_sepa_unique_id'))
105
+ ->setSepaHolder($this->novalnetCardDetails('novalnet_sepa_owner'))
106
+ ->setIbanConfirmed($this->novalnetCardDetails('novalnet_sepa_iban_confirmed'))
107
+ ->setSepaDuedate($this->getModel($paymentCode)->_getConfigData('sepa_due_date'))
108
+ ->setSepaFieldValidator($this->novalnetCardDetails('novalnet_sepa_field_validator'))
109
+ ->setNnCallbackTelNovalnetSepa($data->getCallbackTel())
110
+ ->setNnCallbackEmailNovalnetSepa($data->getCallbackEmail());
111
+ $this->_getCheckout()->setNnPaymentCode($paymentCode);
112
+ $infoInstance->setNnCallbackTelNovalnetSepa($data->getCallbackTel())
113
+ ->setNnCallbackPinNovalnetSepa(trim($data->getCallbackPin()))
114
+ ->setNnNewCallbackPinNovalnetSepa($data->getNewCallbackPin())
115
+ ->setNnCallbackEmailNovalnetSepa($data->getCallbackEmail());
116
+ if ($this->getModel($paymentCode)->_getConfigData('callback')
117
+ != 3) {
118
+ $infoInstance->setCallbackPinValidationFlag(true);
119
+ }
 
 
120
  break;
121
  case Novalnet_Payment_Model_Config::NN_INVOICE:
122
  $infoInstance->setNnCallbackTelNovalnetInvoice($data->getCallbackTel())
123
  ->setNnCallbackPinNovalnetInvoice(trim($data->getCallbackPin()))
124
  ->setNnNewCallbackPinNovalnetInvoice($data->getNewCallbackPin())
125
+ ->setNnCallbackEmailNovalnetInvoice($data->getCallbackEmail());
126
+ if ($this->getModel($paymentCode)->_getConfigData('callback')
127
+ != 3) {
128
  $infoInstance->setCallbackPinValidationFlag(true);
129
  }
130
  break;
137
  *
138
  * throw Mage Exception
139
  */
140
+ public function validateNovalnetData($paymentCode, $infoInstance)
141
+ {
142
  switch ($paymentCode) {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
143
  case Novalnet_Payment_Model_Config::NN_CC:
144
+ $getCardValues = $this->_getCheckout()->getData($paymentCode);
145
+ $creditCardSecure = $this->getModel($paymentCode)->_getConfigData('active_cc3d');
146
+
147
+ if ($creditCardSecure && !$this->getModel($paymentCode)->_getConfigData('password', true)) {
148
+ Mage::throwException($this->__('Basic parameter not valid') . '!');
149
+ } elseif (!$getCardValues->getCcPanHash() || !$getCardValues->getCcUniqueId()) {
150
+ Mage::throwException($this->__('Please enter valid credit card details') . '!');
151
+ } elseif (!$this->checkIsValid($getCardValues->getNnCcOwner()) || !$this->_validateExpDate($getCardValues->getNnCcExpYear(), $getCardValues->getNnCcExpMonth())
152
+ || !$this->checkIsNumeric($getCardValues->getNnCcCvc())) {
 
 
153
  Mage::throwException($this->__('Please enter valid credit card details') . '!');
154
+ } elseif (!$creditCardSecure && $this->checkCallbackAmount($paymentCode)
155
+ && $this->getModel($paymentCode)->_getConfigData('callback')
156
+ == '1' && !$infoInstance->getNnCallbackTelNovalnetCc() && !$this->checkIsAdmin()) {
157
+ Mage::throwException($this->__('Please enter the Telephone / Mobilenumber') . '!');
158
+ } elseif (!$creditCardSecure && $this->checkCallbackAmount($paymentCode)
159
+ && $this->getModel($paymentCode)->_getConfigData('callback')
160
+ == '3' && !$this->validateEmail($infoInstance->getNnCallbackEmailNovalnetCc())
161
+ && !$this->checkIsAdmin()) {
162
+ Mage::throwException($this->__('Please enter the E-Mail Address') . '!');
163
+ }
164
  break;
165
  case Novalnet_Payment_Model_Config::NN_SEPA:
166
+ $methodSession = $this->_getCheckout()->getData($paymentCode);
167
+ $sepaDueDate = $methodSession->getSepaDuedate();
168
+ $sepaHolder = trim($methodSession->getSepaHolder());
 
 
 
 
 
 
 
 
 
 
 
 
 
169
 
170
+ if (strlen($sepaDueDate) > 0
171
+ && ($sepaDueDate < 7 || !$this->checkIsNumeric($sepaDueDate))) {
172
+ Mage::throwException($this->__('SEPA Due date is not valid') . '!');
173
+ } elseif (!$methodSession->getIbanConfirmed()) {
174
+ Mage::throwException($this->__('Please confirm IBAN & BIC'));
175
+ } elseif (!$methodSession->getSepaHash() || !$methodSession->getSepaUniqueId()) {
176
+ Mage::throwException($this->__('Please enter valid account details'));
177
+ } elseif (!$sepaHolder || preg_match('/[#%\^<>@$=*!]/', $sepaHolder)) {
178
+ Mage::throwException($this->__('Please enter valid account details') . '!');
179
+ } elseif ($this->checkCallbackAmount($paymentCode)
180
+ && $this->getModel($paymentCode)->_getConfigData('callback')
181
+ == '1' && !$infoInstance->getNnCallbackTelNovalnetSepa() && !$this->checkIsAdmin()) {
182
+ Mage::throwException($this->__('Please enter the Telephone / Mobilenumber') . '!');
183
+ } elseif ($this->checkCallbackAmount($paymentCode)
184
+ && $this->getModel($paymentCode)->_getConfigData('callback')
185
+ == '3' && !$this->validateEmail($infoInstance->getNnCallbackEmailNovalnetSepa())
186
+ && !$this->checkIsAdmin()) {
187
+ Mage::throwException($this->__('Please enter the E-Mail Address') . '!');
188
  }
189
  break;
190
  case Novalnet_Payment_Model_Config::NN_IDEAL:
191
  case Novalnet_Payment_Model_Config::NN_PAYPAL:
192
  case Novalnet_Payment_Model_Config::NN_SOFORT:
 
193
  if (!$this->getModel($paymentCode)->_getConfigData('password', true)) {
194
  Mage::throwException($this->__('Basic parameter not valid') . '!');
195
  }
196
 
197
+ if ($paymentCode == Novalnet_Payment_Model_Config::NN_PAYPAL
198
+ && (!$this->getModel($paymentCode)->_getConfigData('api_sign', true)
199
  || !$this->getModel($paymentCode)->_getConfigData('api_user', true)
200
  || !$this->getModel($paymentCode)->_getConfigData('api_password', true))) {
201
  Mage::throwException($this->__('Basic parameter not valid') . '!');
210
  *
211
  * @return Mage_Payment_Model_Abstract Object
212
  */
213
+ public function assignNovalnetReturnData(Varien_Object $request, $paymentCode)
214
+ {
215
+ $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
 
 
 
 
 
216
  $request->setUserVariable_0(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB))
217
  ->setReturnMethod(Novalnet_Payment_Model_Config::NOVALNET_RETURN_METHOD)
218
  ->setErrorReturnMethod(Novalnet_Payment_Model_Config::NOVALNET_RETURN_METHOD);
219
+ if (in_array($paymentCode, $redirectPayment) || $paymentCode == Novalnet_Payment_Model_Config::NN_CC) {
220
  $request->setReturnUrl($this->getUrl(Novalnet_Payment_Model_Config::GATEWAY_RETURN_URL))
221
  ->setErrorReturnUrl($this->getUrl(Novalnet_Payment_Model_Config::GATEWAY_ERROR_RETURN_URL));
222
  }
229
  * @param String $key
230
  * @return String
231
  */
232
+ public function importNovalnetEncodeData(Varien_Object $dataObj, $key)
233
+ {
234
  $encoding = $this->getPciEncodedParam($dataObj, $key);
235
  if ($encoding != true) {
236
  Mage::getSingleton('core/session')->addError('Die Methoden f&uuml;r die Verarbeitung von Zeichens&auml;tzen sind nicht verf&uuml;gbar!');
250
  * @param String $key
251
  * @return String
252
  */
253
+ public function importNovalnetHashData(Varien_Object $dataObj, $key)
254
+ {
255
  $hash = $this->generateHash($dataObj, $key);
256
  if ($hash == false) {
257
  Mage::getSingleton('core/session')->addError('Die Hashfunktionen sind nicht verf&uuml;gbar!');
264
  return $dataObj;
265
  }
266
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
267
  /**
268
  * Retrieve Credit Card Details
269
  *
270
  * @param string $param
271
  * @return string
272
  */
273
+ public function novalnetCardDetails($param)
274
+ {
275
  return Mage::app()->getRequest()->getPost($param);
276
  }
277
 
282
  * @param integer $paymentCode
283
  * @return Mage_Payment_Model_Abstract Object
284
  */
285
+ public function doRemoveSensitiveData($request, $paymentCode)
286
+ {
287
  if ($paymentCode) {
288
  switch ($paymentCode) {
 
 
 
 
 
 
 
 
 
289
  case Novalnet_Payment_Model_Config::NN_CC:
290
+ if ($this->getModel($paymentCode)->_getConfigData('active_cc3d')
291
+ == 1) {
292
+ unset($request['cc_holder'], $request['cc_exp_month'], $request['cc_exp_year'], $request['cc_cvc2'], $request['cc_type'], $request['cc_no']);
293
+ } else {
294
+ $request->unsCcHolder()
295
+ ->unsCcNo()
296
+ ->unsCcExpMonth()
297
+ ->unsCcExpYear()
298
+ ->unsCcCvc2()
299
+ ->unsCcType();
300
+ }
301
  break;
302
+ case Novalnet_Payment_Model_Config::NN_SEPA:
303
  $request->unsBankAccountHolder()
304
+ ->unsBankAccount()
305
+ ->unsBankCode()
306
+ ->unsBic()
307
+ ->unsIban();
308
  break;
309
  }
310
  }
318
  * @param integer $expMonth
319
  * @return bool
320
  */
321
+ protected function _validateExpDate($expYear, $expMonth)
322
+ {
323
  $date = Mage::app()->getLocale()->date();
324
+ if (!$expYear || !$expMonth || ($date->compareYear($expYear) == 1) || ($date->compareYear($expYear)
325
+ == 0 && ($date->compareMonth($expMonth) == 1))
326
  ) {
327
  return false;
328
  }
329
  return true;
330
  }
331
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
332
  /**
333
  * Get Novalnet Bank Account Details
334
  *
335
  * @param array $result
336
  * @return mixed
337
  */
338
+ public function getNote($result)
339
+ {
340
+ $dueDate = $result->getDueDate();
341
  $note = NULL;
342
  $note .= "<br /><b>" . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . "</b><br />";
343
+ $note .= ($dueDate) ? ($this->__('Due Date') . ' : <b>' . Mage::helper('core')->formatDate($dueDate) . "</b><br />")
344
+ : NULL;
345
+ $note .= $this->__('NN Account Holder') . " : <b>NOVALNET AG</b><br />";
346
+ $note .= "IBAN : <b> " . $result->getInvoiceIban() . " </b><br />";
347
+ $note .= "BIC : <b>" . $result->getInvoiceBic() . " </b><br />";
348
  $note .= $this->__('NN_Bank') . " : <b>" . $result->getInvoiceBankname() . " " . trim($result->getInvoiceBankplace()) . "</b><br />";
349
  return $note;
350
  }
355
  * @param float $amount
356
  * @return string
357
  */
358
+ public function getBankDetailsAmount($amount)
359
+ {
360
  return $this->__('NN_Amount') . " : <b>" . Mage::helper('core')->currency($amount, true, false) . "</b><br />";
361
  }
362
 
366
  * @param integer $tid
367
  * @return string
368
  */
369
+ public function getBankDetailsTID($tid)
370
+ {
371
+ return $this->__('NN_Reference') . " : <b>TID " . $tid . "</b><br />";
372
  }
373
 
374
  /**
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
375
  * Check whether callback option is enabled
376
  *
377
  */
378
+ public function checkCallbackAmount($paymentCode)
379
+ {
380
+ $grandTotal = $this->_getCheckoutSession()->getQuote()->getBaseGrandTotal();
381
+ $grandTotal = $this->getFormatedAmount($grandTotal);
382
+ $callBackMinimum = (int) $this->getModel($paymentCode)->_getConfigData('callback_minimum_amount');
383
 
384
  return ($callBackMinimum ? $grandTotal >= $callBackMinimum : true);
385
  }
386
 
 
 
 
 
 
 
 
 
 
 
 
 
 
387
  }
app/code/community/Novalnet/Payment/Helper/Data.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,13 +23,13 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
 
28
 
29
- /**
30
  * Array values to configure global configuration
31
  */
32
-
33
- protected $config = array(
34
  'index' => array(
35
  'header_text' => 'Novalnet Global Configuration',
36
  'previous_page' => '',
@@ -41,8 +40,7 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
41
  'header_text' => 'Novalnet Global Configuration',
42
  'codes' => array(
43
  'page' => 'generalGlobal',
44
- //'section' => 'payment_config',
45
- 'section' => 'novalnet_global',
46
  ),
47
  'previous_page' => 'index',
48
  )
@@ -55,8 +53,9 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
55
  * @param $request
56
  * @return Varien_Object
57
  */
58
- public function initConfig($actionName, $request) {
59
- $config = new Varien_Object($this->config);
 
60
  $this->registerConfig($config);
61
 
62
  $configPages = $this->initConfigPage($actionName);
@@ -78,7 +77,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
78
  *
79
  * @return Varien_Object
80
  */
81
- public function getConfig() {
 
82
  return Mage::registry('novalnet_wizard_config');
83
  }
84
 
@@ -87,7 +87,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
87
  *
88
  * @param Varien_Object $config
89
  */
90
- public function registerConfig(Varien_Object $config) {
 
91
  Mage::register('novalnet_wizard_config', $config);
92
  }
93
 
@@ -96,7 +97,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
96
  *
97
  * @return Varien_Object
98
  */
99
- public function getConfigPage() {
 
100
  /** @var $config Varien_Object */
101
  return Mage::registry('novalnet_wizard_config_page');
102
  }
@@ -106,7 +108,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
106
  *
107
  * @param Varien_Object $config
108
  */
109
- public function registerConfigPage(Varien_Object $config) {
 
110
  Mage::register('novalnet_wizard_config_page', $config);
111
  }
112
 
@@ -116,18 +119,12 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
116
  * @param $page
117
  * @return array|null
118
  */
119
- public function initConfigPage($page) {
120
- if (!array_key_exists($page, $this->config)) {
 
121
  return null;
122
  }
123
- return $this->config[$page];
124
- }
125
-
126
- /**
127
- * @return array
128
- */
129
- public function initConfigArray() {
130
- return $this->config;
131
  }
132
 
133
  /**
@@ -135,7 +132,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
135
  *
136
  * @return string
137
  */
138
- public function getNextPageUrlAsString() {
 
139
  $pageName = $this->getConfigPage()->getData('next_page');
140
  $url = $this->getPageUrlAsString($pageName);
141
  return $url;
@@ -146,7 +144,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
146
  *
147
  * @return string
148
  */
149
- public function getPreviousPageUrlAsString() {
 
150
  $pageName = $this->getConfigPage()->getData('previous_page');
151
  $url = $this->getPageUrlAsString($pageName);
152
  return $url;
@@ -157,7 +156,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
157
  *
158
  * @return string
159
  */
160
- public function getPageUrlAsString($nextPageName) {
 
161
  $config = $this->getConfig();
162
  $nextPage = $config->getData($nextPageName);
163
  if ($nextPage && array_key_exists('url', $nextPage)) {
@@ -169,28 +169,36 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
169
  }
170
 
171
  /**
172
- * Get configuration wizard page code
173
  *
174
  * @return string
175
  */
176
- public function getNextPageCode($pageCode) {
177
- $pages = $this->initConfigPage($pageCode);
178
- if ($pages === null) {
179
- return 'index';
180
- }
181
- if (!array_key_exists('next_page', $pages)) {
182
- return 'index';
 
 
 
 
 
 
 
 
183
  }
184
- $nextPageKey = $pages['next_page'];
185
- return $nextPageKey;
186
  }
187
 
188
  /**
189
  * Check whether logged in as admin
190
  *
191
- * @return bool
192
  */
193
- public function checkIsAdmin() {
 
194
  return (Mage::app()->getStore()->isAdmin()) ? true : false;
195
  }
196
 
@@ -199,7 +207,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
199
  *
200
  * @return mixed
201
  */
202
- public function getMagentoVersion() {
 
203
  return Mage::getVersion();
204
  }
205
 
@@ -208,7 +217,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
208
  *
209
  * @return int
210
  */
211
- public function getMagentoStoreId() {
 
212
  $storeId = Mage::getModel('sales/quote')->getStoreId();
213
  if ($this->checkIsAdmin()) {
214
  $storeId = $this->_getAdminCheckoutSession()->getStoreId();
@@ -221,7 +231,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
221
  *
222
  * @return Mage_Core_Model_Store
223
  */
224
- public function getMagentoStore() {
 
225
  return Mage::app()->getStore();
226
  }
227
 
@@ -230,9 +241,10 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
230
  *
231
  * @return string
232
  */
233
- public function getNovalnetVersion() {
 
234
  $versionInfo = (string) Mage::getConfig()->getNode('modules/Novalnet_Payment/version');
235
- return "Novalnet CE (v{$versionInfo})";
236
  }
237
 
238
  /**
@@ -240,12 +252,27 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
240
  *
241
  * @return string
242
  */
243
- public function getRealIpAddr() {
244
- $ipAddr = Mage::helper('core/http')->getRemoteAddr();
245
- if($ipAddr == '::1') {//IPv6 Issue
246
- return '127.0.0.1';
247
- }
248
- return $ipAddr;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
249
  }
250
 
251
  /**
@@ -253,7 +280,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
253
  *
254
  * @return string
255
  */
256
- public function getNovalnetUrl() {
 
257
  if (strtoupper($this->getDefaultLanguage()) == 'DE') {
258
  $siteUrl = 'https://www.novalnet.de';
259
  } else {
@@ -267,9 +295,10 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
267
  *
268
  * @return string
269
  */
270
- public function getNovalnetPaymentFormLogoUrl() {
 
271
  $baseUrl = Mage::getBaseUrl('skin');
272
- $imageUrl = $baseUrl . "frontend/default/default/images/novalnet/" . strtoupper($this->getDefaultLanguage()) . "/";
273
  return $imageUrl;
274
  }
275
 
@@ -278,7 +307,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
278
  *
279
  * @return Mage_Checkout_Model_Session
280
  */
281
- public function _getCheckoutSession() {
 
282
  return Mage::getSingleton('checkout/session');
283
  }
284
 
@@ -287,16 +317,32 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
287
  *
288
  * @return Mage_adminhtml_Model_Session_quote
289
  */
290
- public function _getAdminCheckoutSession() {
 
291
  return Mage::getSingleton('adminhtml/session_quote');
292
  }
293
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
294
  /**
295
  * Get shop's date and time
296
  *
297
  * @return date/time
298
  */
299
- public function getCurrentDateTime() {
 
300
  return Mage::getModel('core/date')->date('Y-m-d H:i:s');
301
  }
302
 
@@ -305,33 +351,44 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
305
  *
306
  * @return Mage_customer_Model_Session
307
  */
308
- public function getCustomerSession() {
 
309
  return Mage::getSingleton('customer/session');
310
  }
311
 
312
  /**
313
- * Check customer_no for Logged in user
 
 
 
 
 
 
 
 
314
  *
315
  * @return bool
316
  */
317
- public function customerNumberValidation() {
 
318
  $getCoreData = $this->getCurrentDateTime();
319
  try {
320
  $getCustomerSession = $this->getCustomerSession();
321
- $order_details = Mage::getModel('checkout/cart')->getQuote()->getData();
322
 
323
  //Checking custommer loggin status
324
- $login_check = $getCustomerSession->isLoggedIn();
325
- if ($login_check) {
326
- $customer_no = $getCustomerSession->getCustomer()->getId();
327
- if (empty($customer_no)) {
328
- $customer_no = $_SESSION['core']['visitor_data']['customer_id']; // Used Only customer id is not assigned in mage session
 
329
  }
330
  //Log customer Order details
331
- if ($customer_no == "") {
332
  Mage::log($getCustomerSession->getCustomer(), NULL, "Customerid_Missing_" . $getCoreData . ".log");
333
  Mage::log("Below are Order Details : ", NULL, "Customerid_Missing_" . $getCoreData . ".log");
334
- Mage::log($order_details, NULL, "Customerid_Missing_" . $getCoreData . ".log");
335
  Mage::throwException($this->__('Basic Parameter Missing. Please contact Shop Admin') . '!');
336
  }
337
  }
@@ -345,7 +402,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
345
  * for Zero subtotal Checkout
346
  * @return bool
347
  */
348
- public function isModuleActive($grandTotal = NULL) {
 
349
  if (!$grandTotal || $grandTotal == 0) {
350
  return false;
351
  }
@@ -357,29 +415,20 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
357
  *
358
  * @return bool
359
  */
360
- public function isCallbackTypeAllowed($countryCode) {
361
- $allowedCountryCode = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('callbackAllowedCountry');
362
- if (in_array($countryCode, $allowedCountryCode)
363
- && !(Mage::app()->getStore()->isAdmin())) {
364
  return true;
365
  }
366
  return false;
367
  }
368
 
369
- /**
370
- * Encode special characters
371
- * @param String $input
372
- *
373
- * @return String
374
- */
375
- public function nn_utf8_encode($input) {
376
- return (mb_detect_encoding($input, 'UTF-8', true) == 'UTF-8') ? utf8_decode($input) : $input;
377
- }
378
-
379
  /**
380
  * @return string
381
  */
382
- public function getDefaultLanguage() {
 
383
  $locale = explode('_', Mage::app()->getLocale()->getLocaleCode());
384
  if (is_array($locale) && !empty($locale)) {
385
  $locale = $locale[0];
@@ -394,11 +443,12 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
394
  *
395
  * @return int|null
396
  */
397
- public function getCustomerId() {
 
398
  $customerNo = '';
399
  if ($this->checkIsAdmin()) {
400
- $adminuser = Mage::getSingleton('admin/session');
401
- $customerNo = $adminuser->getUser()->getUserId();
402
  } else {
403
  $loginCheck = $this->getCustomerSession()->isLoggedIn();
404
  if ($loginCheck) {
@@ -417,7 +467,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
417
  * @param array $params
418
  * @return string
419
  */
420
- public function getUrl($route, $params = array()) {
 
421
  $params['_type'] = Mage_Core_Model_Store::URL_TYPE_LINK;
422
  if (isset($params['is_secure'])) {
423
  $params['_secure'] = (bool) $params['is_secure'];
@@ -434,7 +485,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
434
  * @param string $key
435
  * @return array
436
  */
437
- public function getAdditionalData($info, $key = null) {
 
438
  $data = array();
439
  if ($info->getAdditionalData()) {
440
  $data = unserialize($info->getAdditionalData());
@@ -451,7 +503,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
451
  *
452
  * @return bool
453
  */
454
- public function checkCustomerAccess($userGroupId = NULL) {
 
455
  $exludedGroupes = trim($userGroupId);
456
  if (strlen($exludedGroupes)) {
457
  $exludedGroupes = explode(',', $exludedGroupes);
@@ -465,7 +518,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
465
  * Do encode for novalnet params
466
  *
467
  */
468
- public function setNovalnetEncodedParam(Varien_Object $request, $key) {
 
469
  $request->setAuthCode($this->getEncodedParam($request->getAuthCode(), $key))
470
  ->setProduct($this->getEncodedParam($request->getProduct(), $key))
471
  ->setTariff($this->getEncodedParam($request->getTariff(), $key))
@@ -481,11 +535,13 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
481
  * @param string $key
482
  * @return string
483
  */
484
- public function getEncodedParam($data, $key) {
 
485
  $data = trim($data);
486
- if ($data == '')
487
  return'Error: no data';
488
- if (!function_exists('base64_decode') or !function_exists('pack') or !function_exists('crc32')) {
 
489
  return'Error: func n/a';
490
  }
491
  try {
@@ -494,7 +550,7 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
494
  $data = bin2hex($data . $key);
495
  $data = strrev(base64_encode($data));
496
  } catch (Exception $e) {
497
- echo('Error: ' . $e);
498
  }
499
  return $data;
500
  }
@@ -503,11 +559,12 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
503
  * Function to Encode Novalnet PCI data
504
  *
505
  * @param string $data
506
-
507
  * @param string $key
508
  * @return string
509
  */
510
- public function getPciEncodedParam(&$fields, $key) {
 
511
  if (!function_exists('base64_encode') || !function_exists('pack') || !function_exists('crc32')) {
512
  return false;
513
  }
@@ -537,7 +594,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
537
  * @param string $key
538
  * @return string
539
  */
540
- public function getDecodedParam($data, $key) {
 
541
  $data = trim($data);
542
  if ($data == '') {
543
  return'Error: no data';
@@ -560,7 +618,7 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
560
  }
561
  return $value;
562
  } catch (Exception $e) {
563
- echo('Error: ' . $e);
564
  }
565
  }
566
 
@@ -570,7 +628,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
570
  * @param string $str
571
  * @return bool
572
  */
573
- public function isEmptyString($str) {
 
574
  $str = trim($str);
575
  return !isset($str[0]);
576
  }
@@ -582,7 +641,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
582
  * @param string $key
583
  * @return string
584
  */
585
- public function generateHash($data, $key) {
 
586
  if (!function_exists('md5') || $this->isEmptyString($key)) {
587
  return false;
588
  }
@@ -604,7 +664,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
604
  * @param string $key
605
  * @return string
606
  */
607
- public function generateHashReturn($data, $key) {
 
608
  if (!function_exists('md5') || $this->isEmptyString($key)) {
609
  return false;
610
  }
@@ -626,7 +687,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
626
  * @param string $key
627
  * @return string
628
  */
629
- public function getHash($h, $key) {
 
630
  if (empty($h)) {
631
  return'Error: no data';
632
  }
@@ -643,29 +705,17 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
643
  * @param string $key
644
  * @return bool
645
  */
646
- public function checkHash($request, $key) {
647
- if (!$request)
 
648
  return false;
 
649
  if ($request['hash2'] != $this->getHash($request, $key)) {
650
  return false;
651
  }
652
  return true;
653
  }
654
 
655
- /**
656
- * Check PCI hash value
657
- *
658
- * @param array $response
659
- * @param string $key
660
- * @return bool
661
- */
662
- public function checkPciHash($response, $key) {
663
- return isset($response['hash2'])
664
- && !$this->isEmptyString($response['hash2'])
665
- && (($tmp = $this->generateHashReturn($response, $key)) !== false)
666
- && ($response['hash2'] == $tmp);
667
- }
668
-
669
  /**
670
  * Check Novalnet response params
671
  *
@@ -673,7 +723,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
673
  * @param string $password
674
  * @return int
675
  */
676
- public function checkParams($response, $password) {
 
677
  $status = $response['status'];
678
  if (!$response['hash2']) {
679
  $status = '94';
@@ -696,42 +747,22 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
696
  *
697
  * @return int
698
  */
699
- public function getPaymentId($code) {
700
- if($code == 'novalnetSepa' && $this->getModel($code)->_getConfigData('sepatypes') == 'DD_SEPA_SIGNED') {
701
- $code = $code.'Signed';
702
- }
703
  $arrPaymentId = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('novalnetPaymentKey');
704
  return $arrPaymentId[$code];
705
  }
706
 
707
- public function checkOrdersCount($minOrderCount) {
708
- $customerId = $this->getCustomerId();
 
709
  // Load orders and check
710
- $orders = Mage::getModel('sales/order')->getCollection()->addFieldToFilter('customer_id',$customerId);
711
- $OrdersCount = $orders->count();
712
- if (trim($OrdersCount) < $minOrderCount) {
713
  return true;
714
  }
715
  return false;
716
-
717
- }
718
-
719
- /**
720
- * Parse an NVP response string into an associative array
721
- *
722
- * @param string $nvpstr
723
- * @return array
724
- */
725
- public function deformatNvp($delim_char, $query) {
726
- $deformated = array();
727
- if (strlen($query)) {
728
- $tmp = explode($delim_char, $query);
729
- foreach ($tmp as $k) {
730
- $k = explode('=', $k);
731
- $deformated[urldecode($k[0])] = isset($k[1]) ? urldecode($k[1]) : NULL;
732
- }
733
- }
734
- return $deformated;
735
  }
736
 
737
  /**
@@ -739,7 +770,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
739
  *
740
  * @return bool
741
  */
742
- public function setDueDate($paymentDuration) {
 
743
  $dueDate = '';
744
  if ($paymentDuration && $this->checkIsNumeric($paymentDuration)) {
745
  $dueDate = date('Y-m-d', strtotime('+' . (int) $paymentDuration . ' days'));
@@ -754,7 +786,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
754
  *
755
  * @return Novalnet_Payment_Model_Payment_Method_Abstract
756
  */
757
- public function getModel($modelclass) {
 
758
  return Mage::getModel('novalnet_payment/payment_method_' . $modelclass);
759
  }
760
 
@@ -763,16 +796,28 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
763
  *
764
  * @return Novalnet_Payment_Model_Transactionstatus_Collection
765
  */
766
- public function getModelTransactionStatus() {
 
767
  return Mage::getModel('novalnet_payment/transactionstatus');
768
  }
769
 
 
 
 
 
 
 
 
 
 
 
770
  /**
771
  * Get novalnet transaction overview model
772
  *
773
  * @return Novalnet_Payment_Model_Transactionoverview_Collection
774
  */
775
- public function getModelTransactionOverview() {
 
776
  return Mage::getModel('novalnet_payment/transactionoverview');
777
  }
778
 
@@ -782,7 +827,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
782
  * @param mixed $value
783
  * @return bool
784
  */
785
- public function checkIsNumeric($value) {
 
786
  return preg_match('/^\d+$/', $value) ? true : false;
787
  }
788
 
@@ -792,7 +838,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
792
  * @param mixed $value
793
  * @return bool
794
  */
795
- public function checkIsValid($value) {
 
796
  return (!$value || preg_match('/[#%\^<>@$=*!]/', $value)) ? false : true;
797
  }
798
 
@@ -802,16 +849,20 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
802
  * @param mixed $value
803
  * @return bool
804
  */
805
- public function validateEmail($emailId) {
806
- return preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $emailId) ? true : false;
 
 
807
  }
 
808
  /**
809
  * Replace strings from the value passed
810
  *
811
  * @param mixed $value
812
  * @return integer
813
  */
814
- public function makeValidNumber($value) {
 
815
  return preg_replace('/[^0-9]+/', '', $value);
816
  }
817
 
@@ -822,7 +873,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
822
  * @param string $type
823
  * @return mixed
824
  */
825
- public function getFormatedAmount($amount, $type = 'CENT') {
 
826
  return ($type == 'RAW') ? $amount / 100 : round($amount, 2) * 100;
827
  }
828
 
@@ -832,18 +884,20 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
832
  * @param integer $txnId
833
  * @return object Novalnet_Payment_Model_Transactionstatus
834
  */
835
- public function loadTransactionStatus($txnId) {
 
836
  return $this->getModelTransactionStatus()->loadByAttribute('transaction_no', $txnId);
837
  }
838
 
839
  /**
840
- * Mask payment data
841
  *
842
- * @param integer $txnId
843
- * @return varchar
844
  */
845
- public function doMaskPaymentData($data) {
846
- return substr($data, 0, -4) . '****';
 
847
  }
848
 
849
  /**
@@ -851,7 +905,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
851
  *
852
  * @return string
853
  */
854
- public function getNovalnetGlobalPath() {
 
855
  return 'novalnet_global/novalnet/';
856
  }
857
 
@@ -860,8 +915,58 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract {
860
  *
861
  * @return string
862
  */
863
-
864
- public function getCurrentSiteUrl() {
865
  return Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB);
866
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
867
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
27
+ {
28
 
29
+ /**
30
  * Array values to configure global configuration
31
  */
32
+ protected $_config = array(
 
33
  'index' => array(
34
  'header_text' => 'Novalnet Global Configuration',
35
  'previous_page' => '',
40
  'header_text' => 'Novalnet Global Configuration',
41
  'codes' => array(
42
  'page' => 'generalGlobal',
43
+ 'section' => 'novalnet_global',
 
44
  ),
45
  'previous_page' => 'index',
46
  )
53
  * @param $request
54
  * @return Varien_Object
55
  */
56
+ public function initConfig($actionName, $request)
57
+ {
58
+ $config = new Varien_Object($this->_config);
59
  $this->registerConfig($config);
60
 
61
  $configPages = $this->initConfigPage($actionName);
77
  *
78
  * @return Varien_Object
79
  */
80
+ public function getConfig()
81
+ {
82
  return Mage::registry('novalnet_wizard_config');
83
  }
84
 
87
  *
88
  * @param Varien_Object $config
89
  */
90
+ public function registerConfig(Varien_Object $config)
91
+ {
92
  Mage::register('novalnet_wizard_config', $config);
93
  }
94
 
97
  *
98
  * @return Varien_Object
99
  */
100
+ public function getConfigPage()
101
+ {
102
  /** @var $config Varien_Object */
103
  return Mage::registry('novalnet_wizard_config_page');
104
  }
108
  *
109
  * @param Varien_Object $config
110
  */
111
+ public function registerConfigPage(Varien_Object $config)
112
+ {
113
  Mage::register('novalnet_wizard_config_page', $config);
114
  }
115
 
119
  * @param $page
120
  * @return array|null
121
  */
122
+ public function initConfigPage($page)
123
+ {
124
+ if (!array_key_exists($page, $this->_config)) {
125
  return null;
126
  }
127
+ return $this->_config[$page];
 
 
 
 
 
 
 
128
  }
129
 
130
  /**
132
  *
133
  * @return string
134
  */
135
+ public function getNextPageUrlAsString()
136
+ {
137
  $pageName = $this->getConfigPage()->getData('next_page');
138
  $url = $this->getPageUrlAsString($pageName);
139
  return $url;
144
  *
145
  * @return string
146
  */
147
+ public function getPreviousPageUrlAsString()
148
+ {
149
  $pageName = $this->getConfigPage()->getData('previous_page');
150
  $url = $this->getPageUrlAsString($pageName);
151
  return $url;
156
  *
157
  * @return string
158
  */
159
+ public function getPageUrlAsString($nextPageName)
160
+ {
161
  $config = $this->getConfig();
162
  $nextPage = $config->getData($nextPageName);
163
  if ($nextPage && array_key_exists('url', $nextPage)) {
169
  }
170
 
171
  /**
172
+ * Get the respective payport url
173
  *
174
  * @return string
175
  */
176
+ public function getPayportUrl($reqType, $paymentCode = NULL)
177
+ {
178
+ $protocol = Mage::app()->getStore()->isCurrentlySecure() ? 'https' : 'http';
179
+
180
+ if ($paymentCode && $reqType == 'redirect') {
181
+ $redirectUrl = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayportUrl');
182
+ $payportUrl = $redirectUrl[$paymentCode];
183
+ } else {
184
+ $urlType = array(
185
+ 'paygate' => Novalnet_Payment_Model_Config::PAYPORT_URL,
186
+ 'infoport' => Novalnet_Payment_Model_Config::INFO_REQUEST_URL,
187
+ 'cc' => Novalnet_Payment_Model_Config::CC_URL,
188
+ 'sepa' => Novalnet_Payment_Model_Config::SEPA_URL
189
+ );
190
+ $payportUrl = $urlType[$reqType];
191
  }
192
+ return $protocol . $payportUrl;
 
193
  }
194
 
195
  /**
196
  * Check whether logged in as admin
197
  *
198
+ * @return bool
199
  */
200
+ public function checkIsAdmin()
201
+ {
202
  return (Mage::app()->getStore()->isAdmin()) ? true : false;
203
  }
204
 
207
  *
208
  * @return mixed
209
  */
210
+ public function getMagentoVersion()
211
+ {
212
  return Mage::getVersion();
213
  }
214
 
217
  *
218
  * @return int
219
  */
220
+ public function getMagentoStoreId()
221
+ {
222
  $storeId = Mage::getModel('sales/quote')->getStoreId();
223
  if ($this->checkIsAdmin()) {
224
  $storeId = $this->_getAdminCheckoutSession()->getStoreId();
231
  *
232
  * @return Mage_Core_Model_Store
233
  */
234
+ public function getMagentoStore()
235
+ {
236
  return Mage::app()->getStore();
237
  }
238
 
241
  *
242
  * @return string
243
  */
244
+ public function getNovalnetVersion()
245
+ {
246
  $versionInfo = (string) Mage::getConfig()->getNode('modules/Novalnet_Payment/version');
247
+ return "NN_$versionInfo";
248
  }
249
 
250
  /**
252
  *
253
  * @return string
254
  */
255
+ public function getRealIpAddr()
256
+ {
257
+ $ipAddr = Mage::helper('core/http')->getRemoteAddr();
258
+ if ($ipAddr == '::1') {//IPv6 Issue
259
+ return '127.0.0.1';
260
+ }
261
+ return $ipAddr;
262
+ }
263
+
264
+ /**
265
+ * Get Server Ip address
266
+ *
267
+ * @return string
268
+ */
269
+ public function getServerAddr()
270
+ {
271
+ $serverAddr = Mage::helper('core/http')->getServerAddr();
272
+ if ($serverAddr == '::1') {//IPv6 Issue
273
+ return '127.0.0.1';
274
+ }
275
+ return $serverAddr;
276
  }
277
 
278
  /**
280
  *
281
  * @return string
282
  */
283
+ public function getNovalnetUrl()
284
+ {
285
  if (strtoupper($this->getDefaultLanguage()) == 'DE') {
286
  $siteUrl = 'https://www.novalnet.de';
287
  } else {
295
  *
296
  * @return string
297
  */
298
+ public function getNovalnetPaymentFormLogoUrl()
299
+ {
300
  $baseUrl = Mage::getBaseUrl('skin');
301
+ $imageUrl = $baseUrl . "frontend/base/default/images/novalnet/";
302
  return $imageUrl;
303
  }
304
 
307
  *
308
  * @return Mage_Checkout_Model_Session
309
  */
310
+ public function _getCheckoutSession()
311
+ {
312
  return Mage::getSingleton('checkout/session');
313
  }
314
 
317
  *
318
  * @return Mage_adminhtml_Model_Session_quote
319
  */
320
+ public function _getAdminCheckoutSession()
321
+ {
322
  return Mage::getSingleton('adminhtml/session_quote');
323
  }
324
 
325
+ /**
326
+ * Get checkout session
327
+ *
328
+ * @return Mage_Sales_Model_Order
329
+ */
330
+ public function _getCheckout()
331
+ {
332
+ if ($this->checkIsAdmin()) {
333
+ return $this->_getAdminCheckoutSession();
334
+ } else {
335
+ return $this->_getCheckoutSession();
336
+ }
337
+ }
338
+
339
  /**
340
  * Get shop's date and time
341
  *
342
  * @return date/time
343
  */
344
+ public function getCurrentDateTime()
345
+ {
346
  return Mage::getModel('core/date')->date('Y-m-d H:i:s');
347
  }
348
 
351
  *
352
  * @return Mage_customer_Model_Session
353
  */
354
+ public function getCustomerSession()
355
+ {
356
  return Mage::getSingleton('customer/session');
357
  }
358
 
359
  /**
360
+ * Get the core session
361
+ */
362
+ public function getCoresession()
363
+ {
364
+ return Mage::getSingleton('core/session');
365
+ }
366
+
367
+ /**
368
+ * Check customerNo for Logged in user
369
  *
370
  * @return bool
371
  */
372
+ public function customerNumberValidation()
373
+ {
374
  $getCoreData = $this->getCurrentDateTime();
375
  try {
376
  $getCustomerSession = $this->getCustomerSession();
377
+ $orderDetails = Mage::getModel('checkout/cart')->getQuote()->getData();
378
 
379
  //Checking custommer loggin status
380
+ $loginCheck = $getCustomerSession->isLoggedIn();
381
+ if ($loginCheck) {
382
+ $customerNo = $getCustomerSession->getCustomer()->getId();
383
+ if (empty($customerNo)) {
384
+ $coreSession = $this->getCoresession()->getvisitorData();
385
+ $customerNo = $coreSession['customer_id']; // Used Only customer id is not assigned in mage session
386
  }
387
  //Log customer Order details
388
+ if ($customerNo == "") {
389
  Mage::log($getCustomerSession->getCustomer(), NULL, "Customerid_Missing_" . $getCoreData . ".log");
390
  Mage::log("Below are Order Details : ", NULL, "Customerid_Missing_" . $getCoreData . ".log");
391
+ Mage::log($orderDetails, NULL, "Customerid_Missing_" . $getCoreData . ".log");
392
  Mage::throwException($this->__('Basic Parameter Missing. Please contact Shop Admin') . '!');
393
  }
394
  }
402
  * for Zero subtotal Checkout
403
  * @return bool
404
  */
405
+ public function isModuleActive($grandTotal = NULL)
406
+ {
407
  if (!$grandTotal || $grandTotal == 0) {
408
  return false;
409
  }
415
  *
416
  * @return bool
417
  */
418
+ public function isCallbackTypeAllowed($countryCode)
419
+ {
420
+ $allowedCountryCode = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('callbackAllowed');
421
+ if (in_array($countryCode, $allowedCountryCode) && !(Mage::app()->getStore()->isAdmin())) {
422
  return true;
423
  }
424
  return false;
425
  }
426
 
 
 
 
 
 
 
 
 
 
 
427
  /**
428
  * @return string
429
  */
430
+ public function getDefaultLanguage()
431
+ {
432
  $locale = explode('_', Mage::app()->getLocale()->getLocaleCode());
433
  if (is_array($locale) && !empty($locale)) {
434
  $locale = $locale[0];
443
  *
444
  * @return int|null
445
  */
446
+ public function getCustomerId()
447
+ {
448
  $customerNo = '';
449
  if ($this->checkIsAdmin()) {
450
+ $quoteCustomerNo = $this->_getAdminCheckoutSession()->getQuote()->getCustomerId();
451
+ $customerNo = $quoteCustomerNo ? $quoteCustomerNo : 'guest';
452
  } else {
453
  $loginCheck = $this->getCustomerSession()->isLoggedIn();
454
  if ($loginCheck) {
467
  * @param array $params
468
  * @return string
469
  */
470
+ public function getUrl($route, $params = array())
471
+ {
472
  $params['_type'] = Mage_Core_Model_Store::URL_TYPE_LINK;
473
  if (isset($params['is_secure'])) {
474
  $params['_secure'] = (bool) $params['is_secure'];
485
  * @param string $key
486
  * @return array
487
  */
488
+ public function getAdditionalData($info, $key = null)
489
+ {
490
  $data = array();
491
  if ($info->getAdditionalData()) {
492
  $data = unserialize($info->getAdditionalData());
503
  *
504
  * @return bool
505
  */
506
+ public function checkCustomerAccess($userGroupId = NULL)
507
+ {
508
  $exludedGroupes = trim($userGroupId);
509
  if (strlen($exludedGroupes)) {
510
  $exludedGroupes = explode(',', $exludedGroupes);
518
  * Do encode for novalnet params
519
  *
520
  */
521
+ public function setNovalnetEncodedParam(Varien_Object $request, $key)
522
+ {
523
  $request->setAuthCode($this->getEncodedParam($request->getAuthCode(), $key))
524
  ->setProduct($this->getEncodedParam($request->getProduct(), $key))
525
  ->setTariff($this->getEncodedParam($request->getTariff(), $key))
535
  * @param string $key
536
  * @return string
537
  */
538
+ public function getEncodedParam($data, $key)
539
+ {
540
  $data = trim($data);
541
+ if ($data == '') {
542
  return'Error: no data';
543
+ }
544
+ if (!function_exists('base64_decode') or ! function_exists('pack') or ! function_exists('crc32')) {
545
  return'Error: func n/a';
546
  }
547
  try {
550
  $data = bin2hex($data . $key);
551
  $data = strrev(base64_encode($data));
552
  } catch (Exception $e) {
553
+ return false;
554
  }
555
  return $data;
556
  }
559
  * Function to Encode Novalnet PCI data
560
  *
561
  * @param string $data
562
+ *
563
  * @param string $key
564
  * @return string
565
  */
566
+ public function getPciEncodedParam(&$fields, $key)
567
+ {
568
  if (!function_exists('base64_encode') || !function_exists('pack') || !function_exists('crc32')) {
569
  return false;
570
  }
594
  * @param string $key
595
  * @return string
596
  */
597
+ public function getDecodedParam($data, $key)
598
+ {
599
  $data = trim($data);
600
  if ($data == '') {
601
  return'Error: no data';
618
  }
619
  return $value;
620
  } catch (Exception $e) {
621
+ return false;
622
  }
623
  }
624
 
628
  * @param string $str
629
  * @return bool
630
  */
631
+ public function isEmptyString($str)
632
+ {
633
  $str = trim($str);
634
  return !isset($str[0]);
635
  }
641
  * @param string $key
642
  * @return string
643
  */
644
+ public function generateHash($data, $key)
645
+ {
646
  if (!function_exists('md5') || $this->isEmptyString($key)) {
647
  return false;
648
  }
664
  * @param string $key
665
  * @return string
666
  */
667
+ public function generateHashReturn($data, $key)
668
+ {
669
  if (!function_exists('md5') || $this->isEmptyString($key)) {
670
  return false;
671
  }
687
  * @param string $key
688
  * @return string
689
  */
690
+ public function getHash($h, $key)
691
+ {
692
  if (empty($h)) {
693
  return'Error: no data';
694
  }
705
  * @param string $key
706
  * @return bool
707
  */
708
+ public function checkHash($request, $key)
709
+ {
710
+ if (!$request) {
711
  return false;
712
+ }
713
  if ($request['hash2'] != $this->getHash($request, $key)) {
714
  return false;
715
  }
716
  return true;
717
  }
718
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
719
  /**
720
  * Check Novalnet response params
721
  *
723
  * @param string $password
724
  * @return int
725
  */
726
+ public function checkParams($response, $password)
727
+ {
728
  $status = $response['status'];
729
  if (!$response['hash2']) {
730
  $status = '94';
747
  *
748
  * @return int
749
  */
750
+ public function getPaymentId($code)
751
+ {
 
 
752
  $arrPaymentId = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('novalnetPaymentKey');
753
  return $arrPaymentId[$code];
754
  }
755
 
756
+ public function checkOrdersCount($minOrderCount)
757
+ {
758
+ $customerId = $this->getCustomerId();
759
  // Load orders and check
760
+ $orders = Mage::getModel('sales/order')->getCollection()->addFieldToFilter('customer_id', $customerId);
761
+ $ordersCount = $orders->count();
762
+ if (trim($ordersCount) < $minOrderCount) {
763
  return true;
764
  }
765
  return false;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
766
  }
767
 
768
  /**
770
  *
771
  * @return bool
772
  */
773
+ public function setDueDate($paymentDuration)
774
+ {
775
  $dueDate = '';
776
  if ($paymentDuration && $this->checkIsNumeric($paymentDuration)) {
777
  $dueDate = date('Y-m-d', strtotime('+' . (int) $paymentDuration . ' days'));
786
  *
787
  * @return Novalnet_Payment_Model_Payment_Method_Abstract
788
  */
789
+ public function getModel($modelclass)
790
+ {
791
  return Mage::getModel('novalnet_payment/payment_method_' . $modelclass);
792
  }
793
 
796
  *
797
  * @return Novalnet_Payment_Model_Transactionstatus_Collection
798
  */
799
+ public function getModelTransactionStatus()
800
+ {
801
  return Mage::getModel('novalnet_payment/transactionstatus');
802
  }
803
 
804
+ /**
805
+ * Get novalnet callback model
806
+ *
807
+ * @return Novalnet_Payment_Model_Callback_Collection
808
+ */
809
+ public function getModelCallback()
810
+ {
811
+ return Mage::getModel('novalnet_payment/callback');
812
+ }
813
+
814
  /**
815
  * Get novalnet transaction overview model
816
  *
817
  * @return Novalnet_Payment_Model_Transactionoverview_Collection
818
  */
819
+ public function getModelTransactionOverview()
820
+ {
821
  return Mage::getModel('novalnet_payment/transactionoverview');
822
  }
823
 
827
  * @param mixed $value
828
  * @return bool
829
  */
830
+ public function checkIsNumeric($value)
831
+ {
832
  return preg_match('/^\d+$/', $value) ? true : false;
833
  }
834
 
838
  * @param mixed $value
839
  * @return bool
840
  */
841
+ public function checkIsValid($value)
842
+ {
843
  return (!$value || preg_match('/[#%\^<>@$=*!]/', $value)) ? false : true;
844
  }
845
 
849
  * @param mixed $value
850
  * @return bool
851
  */
852
+ public function validateEmail($emailId)
853
+ {
854
+ return preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $emailId)
855
+ ? true : false;
856
  }
857
+
858
  /**
859
  * Replace strings from the value passed
860
  *
861
  * @param mixed $value
862
  * @return integer
863
  */
864
+ public function makeValidNumber($value)
865
+ {
866
  return preg_replace('/[^0-9]+/', '', $value);
867
  }
868
 
873
  * @param string $type
874
  * @return mixed
875
  */
876
+ public function getFormatedAmount($amount, $type = 'CENT')
877
+ {
878
  return ($type == 'RAW') ? $amount / 100 : round($amount, 2) * 100;
879
  }
880
 
884
  * @param integer $txnId
885
  * @return object Novalnet_Payment_Model_Transactionstatus
886
  */
887
+ public function loadTransactionStatus($txnId)
888
+ {
889
  return $this->getModelTransactionStatus()->loadByAttribute('transaction_no', $txnId);
890
  }
891
 
892
  /**
893
+ * Load novalnet callback value based on order-id
894
  *
895
+ * @param integer $orderId
896
+ * @return object Novalnet_Payment_Model_Callback
897
  */
898
+ public function loadCallbackValue($orderId)
899
+ {
900
+ return $this->getModelCallback()->loadByAttribute('order_id', $orderId);
901
  }
902
 
903
  /**
905
  *
906
  * @return string
907
  */
908
+ public function getNovalnetGlobalPath()
909
+ {
910
  return 'novalnet_global/novalnet/';
911
  }
912
 
915
  *
916
  * @return string
917
  */
918
+ public function getCurrentSiteUrl()
919
+ {
920
  return Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB);
921
  }
922
+
923
+ /**
924
+ * Log novalnet transaction status data
925
+ *
926
+ */
927
+ public function doTransactionStatusSave($response, $transactionStatus, $payment,
928
+ $amount = NULL, $customerNo = NULL
929
+ ) {
930
+ $paymentObj = $payment->getMethodInstance();
931
+ $storeId = $payment->getOrder()->getStoreId();
932
+ $ncNo = ($response->getNcNo()) ? $response->getNcNo() : NULL;
933
+ $amount = ($response->getAmount() && is_numeric($response->getAmount())) ? $response->getAmount() : $amount;
934
+ $customerId = $response->getCustomerNo() ? $response->getCustomerNo() : $customerNo;
935
+ $orderId = ($response->getOrderNo()) ? $response->getOrderNo() : $payment->getOrder()->getIncrementId();
936
+ $modNnTransStatus = Mage::getModel('novalnet_payment/transactionstatus');
937
+ $modNnTransStatus->setTransactionNo($response->getTid())
938
+ ->setOrderId($orderId)
939
+ ->setTransactionStatus($transactionStatus->getStatus()) //Novalnet Admin transaction status
940
+ ->setNcNo($ncNo)
941
+ ->setCustomerId($customerId)
942
+ ->setPaymentName($paymentObj->getCode())
943
+ ->setAmount($amount)
944
+ ->setRemoteIp($this->getRealIpAddr())
945
+ ->setStoreId($storeId)
946
+ ->setShopUrl($this->getCurrentSiteUrl())
947
+ ->setCreatedDate($this->getCurrentDateTime())
948
+ ->save();
949
+ }
950
+
951
+ /**
952
+ * Log novalnet payment response data
953
+ *
954
+ */
955
+ public function doTransactionOrderLog($response, $orderId, $storeId = NULL, $customerId = NULL)
956
+ {
957
+ $customerId = ($customerId != NULL) ? $customerId : $this->getCustomerId();
958
+ $storeId = ($storeId != NULL) ? $storeId : $this->getMagentoStoreId();
959
+ $modNnTransOverview = $this->getModelTransactionOverview()->loadByAttribute('order_id', $orderId);
960
+ $response = ($modNnTransOverview->getResponseData())
961
+ ? new Varien_Object(array_merge(unserialize($modNnTransOverview->getResponseData()), $response->getData()))
962
+ : $response;
963
+ $modNnTransOverview->setTransactionId($response->gettid())
964
+ ->setResponseData(serialize($response->getData()))
965
+ ->setCustomerId($customerId)
966
+ ->setStatus($response->getstatus()) //transaction status code
967
+ ->setStoreId($storeId)
968
+ ->setShopUrl($this->getCurrentSiteUrl())
969
+ ->save();
970
+ }
971
+
972
  }
app/code/community/Novalnet/Payment/Model/Adminhtml/Sales/Order/Create.php ADDED
@@ -0,0 +1,101 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ class Novalnet_Payment_Model_Adminhtml_Sales_Order_Create extends Mage_Adminhtml_Model_Sales_Order_Create
27
+ {
28
+
29
+ /**
30
+ * Create new order
31
+ *
32
+ * @return Mage_Sales_Model_Order
33
+ */
34
+ public function createOrder()
35
+ {
36
+ $this->_prepareCustomer();
37
+ $this->_validate();
38
+ $quote = $this->getQuote();
39
+ $this->_prepareQuoteItems();
40
+
41
+ $service = Mage::getModel('sales/service_quote', $quote);
42
+
43
+ if ($this->getSession()->getOrder()->getId()) {
44
+ $oldOrder = $this->getSession()->getOrder();
45
+ $originalId = $oldOrder->getOriginalIncrementId();
46
+ if (!$originalId) {
47
+ $originalId = $oldOrder->getIncrementId();
48
+ }
49
+ $orderData = array(
50
+ 'original_increment_id' => $originalId,
51
+ 'relation_parent_id' => $oldOrder->getId(),
52
+ 'relation_parent_real_id' => $oldOrder->getIncrementId(),
53
+ 'edit_increment' => $oldOrder->getEditIncrement() + 1,
54
+ 'increment_id' => $originalId . '-' . ($oldOrder->getEditIncrement()
55
+ + 1)
56
+ );
57
+ $quote->setReservedOrderId($orderData['increment_id']);
58
+ $service->setOrderData($orderData);
59
+ }
60
+
61
+ $order = $service->submit();
62
+ $paymentCode = $order->getPayment()->getMethodInstance()->getCode();
63
+
64
+ if (preg_match("/novalnet/i", $paymentCode)) {
65
+ $payment = $order->getPayment();
66
+ $paymentObj = $payment->getMethodInstance();
67
+ $request = $this->getSession()->getData($paymentCode)->getPaymentReqData();
68
+ $response = $paymentObj->postRequest($request);
69
+ $paymentObj->validateNovalnetResponse($payment, $response);
70
+ $paymentObj->unsetMethodSession($paymentCode);
71
+ }
72
+
73
+ if ((!$quote->getCustomer()->getId() || !$quote->getCustomer()->isInStore($this->getSession()->getStore()))
74
+ && !$quote->getCustomerIsGuest()
75
+ ) {
76
+ $quote->getCustomer()->setCreatedAt($order->getCreatedAt());
77
+ $quote->getCustomer()
78
+ ->save()
79
+ ->sendNewAccountEmail('registered', '', $quote->getStoreId());
80
+ ;
81
+ }
82
+ if ($this->getSession()->getOrder()->getId()) {
83
+ $oldOrder = $this->getSession()->getOrder();
84
+
85
+ $this->getSession()->getOrder()->setRelationChildId($order->getId());
86
+ $this->getSession()->getOrder()->setRelationChildRealId($order->getIncrementId());
87
+ $this->getSession()->getOrder()->cancel()
88
+ ->save();
89
+ $order->save();
90
+ }
91
+ if ($this->getSendConfirmation()) {
92
+ $order->sendNewOrderEmail();
93
+ }
94
+
95
+ Mage::dispatchEvent('checkout_submit_all_after', array('order' => $order,
96
+ 'quote' => $quote));
97
+
98
+ return $order;
99
+ }
100
+
101
+ }
app/code/community/Novalnet/Payment/Model/Callback.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,17 +23,33 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Callback extends Mage_Core_Model_Abstract {
 
28
 
29
  /**
30
  *
31
  */
32
- public function _construct() {
 
33
  parent::_construct();
34
  $this->_init('novalnet_payment/callback');
35
  }
36
 
37
- public function loadLogByOrderId($orderId) {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
38
  $this->load($orderId, 'order_id');
39
  return $this;
40
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Callback extends Mage_Core_Model_Abstract
27
+ {
28
 
29
  /**
30
  *
31
  */
32
+ public function _construct()
33
+ {
34
  parent::_construct();
35
  $this->_init('novalnet_payment/callback');
36
  }
37
 
38
+ /**
39
+ * Load order transaction status by custom attribute value. Attribute value should be unique
40
+ *
41
+ * @param string $attribute
42
+ * @param string $value
43
+ * @return Novalnet_Payment_Model_Source_Callback
44
+ */
45
+ public function loadByAttribute($attribute, $value)
46
+ {
47
+ $this->load($value, $attribute);
48
+ return $this;
49
+ }
50
+
51
+ public function loadLogByOrderId($orderId)
52
+ {
53
  $this->load($orderId, 'order_id');
54
  return $this;
55
  }
app/code/community/Novalnet/Payment/Model/Callbackscript.php ADDED
@@ -0,0 +1,877 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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 Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ class Novalnet_Payment_Model_Callbackscript
27
+ {
28
+
29
+ var $debug = false; //false|true; adapt: set to false for go-live
30
+ var $test = false; //false|true; adapt: set to false for go-live
31
+ var $log = false; //false|true; adapt
32
+ var $createInvoice = true; //false|true; adapt for your need
33
+ var $useZendEmail = true; //false|true; adapt for your need
34
+ var $addSubsequentTidToDb = true; //whether to add the new tid to db; adapt if necessary
35
+ //Security Setting; only this IP is allowed for call back script
36
+ var $ipAllowed = '195.143.189.210'; //Novalnet IP, is a fixed value, DO NOT CHANGE!!!!!
37
+
38
+ public function Callback()
39
+ {
40
+ $this->allowedPayment = array(
41
+ 'novalnetcc' => array('CREDITCARD', 'CREDITCARD_BOOKBACK', 'CREDITCARD_CHARGEBACK',
42
+ 'CREDIT_ENTRY_CREDITCARD', 'SUBSCRIPTION_STOP', 'DEBT_COLLECTION_CREDITCARD'),
43
+ 'novalnetinvoice' => array('INVOICE_START', 'INVOICE_CREDIT', 'SUBSCRIPTION_STOP'),
44
+ 'novalnetprepayment' => array('INVOICE_START', 'INVOICE_CREDIT', 'SUBSCRIPTION_STOP'),
45
+ 'novalnetideal' => array('IDEAL'),
46
+ 'novalnetpaypal' => array('PAYPAL'),
47
+ 'novalneteps' => array('EPS'),
48
+ 'novalnetsofortueberweisung' => array('ONLINE_TRANSFER', 'REFUND_BY_BANK_TRANSFER_EU'),
49
+ 'novalnetsepa' => array('DIRECT_DEBIT_SEPA', 'RETURN_DEBIT_SEPA', 'SUBSCRIPTION_STOP',
50
+ 'DEBT_COLLECTION_SEPA', 'CREDIT_ENTRY_SEPA'),
51
+ 'novalnetphonepayment' => array('NOVALTEL_DE', 'NOVALTEL_DE_CHARGEBACK',
52
+ 'NOVALTEL_DE_CB_REVERSAL', 'NOVALTEL_DE_COLLECTION', ''));
53
+ $this->invoiceAllowed = array('INVOICE_CREDIT', 'INVOICE_START');
54
+
55
+ /** @Array Type of payment available - Level : 0 */
56
+ $this->paymentTypes = array('INVOICE_START', 'PAYPAL', 'ONLINE_TRANSFER',
57
+ 'CREDITCARD', 'IDEAL', 'DIRECT_DEBIT_SEPA', 'PAYSAFECARD', 'EPS', 'GUARANTEED_INVOICE_START',
58
+ 'NOVALTEL_DE');
59
+ /** @Array Type of Chargebacks available - Level : 1 */
60
+ $this->chargeBackPayments = array('CREDITCARD_CHARGEBACK', 'RETURN_DEBIT_SEPA',
61
+ 'CREDITCARD_BOOKBACK', 'REFUND_BY_BANK_TRANSFER_EU', 'NOVALTEL_DE_CHARGEBACK');
62
+ /** @Array Type of CreditEntry payment and Collections available - Level : 2 */
63
+ $this->aryCollection = array('INVOICE_CREDIT', 'GUARANTEED_INVOICE_CREDIT',
64
+ 'CREDIT_ENTRY_CREDITCARD', 'CREDIT_ENTRY_SEPA', 'DEBT_COLLECTION_SEPA',
65
+ 'DEBT_COLLECTION_CREDITCARD', 'NOVALTEL_DE_COLLECTION', 'NOVALTEL_DE_CB_REVERSAL');
66
+ $this->arySubscription = array('SUBSCRIPTION_STOP');
67
+
68
+ $this->request = $this->getParams();
69
+ $this->helper = Mage::helper('novalnet_payment');
70
+ $httpHost = Mage::helper('core/http')->getHttpHost();
71
+ $this->lineBreak = empty($httpHost) ? PHP_EOL : '<br />';
72
+
73
+ //Reporting Email Addresses Settings
74
+ $this->shopInfo = 'Magento ' . $this->lineBreak; //mandatory;adapt for your need
75
+ $this->mailHost = Mage::getStoreConfig('system/smtp/host'); //adapt or Mage::getStoreConfig('system/smtp/host')
76
+ $this->mailPort = Mage::getStoreConfig('system/smtp/port'); //adapt or Mage::getStoreConfig('system/smtp/port')
77
+ $this->emailFromAddr = ''; //sender email address., mandatory, adapt it
78
+ $this->emailToAddr = ''; //recipient email address., mandatory, adapt it
79
+ $this->emailSubject = 'Novalnet Callback Script Access Report'; //adapt if necessary;
80
+ $this->emailBody = ""; //Email text's 1. line, can be let blank, adapt for your need
81
+ $this->emailFromName = ""; // Sender name, adapt
82
+ $this->emailToName = ""; // Recipient name, adapt
83
+ $this->callBackExecuted = false;
84
+
85
+ if (isset($this->request['debug_mode']) && $this->request['debug_mode'] == 1) {
86
+ $this->debug = true;
87
+ $this->test = true;
88
+ $this->emailFromAddr = 'testadmin@novalnet.de';
89
+ $this->emailFromName = 'Novalnet';
90
+ $this->emailToAddr = 'sathishk_v@novalnetsolutions.com';
91
+ $this->emailToName = 'Novalnet';
92
+ }
93
+ //Parameters Settings
94
+ $this->hParamsRequired = array(
95
+ 'vendor_id' => '',
96
+ 'tid' => '',
97
+ 'payment_type' => '',
98
+ 'status' => '',
99
+ 'amount' => '',
100
+ 'tid_payment' => '',
101
+ 'tid' => '');
102
+
103
+ if (!in_array($this->request['payment_type'], array_merge($this->invoiceAllowed, $this->chargeBackPayments))) {
104
+ unset($this->hParamsRequired['tid_payment']);
105
+ }
106
+
107
+ ksort($this->hParamsRequired);
108
+
109
+ try {
110
+
111
+ //Check Params
112
+ if ($this->checkIP()) {
113
+ $request = $this->request;
114
+ $this->orderNo = isset($request['order_no']) && $request['order_no'] ? $request['order_no']
115
+ : '';
116
+ if ($this->orderNo == '') {
117
+ unset($this->hParamsRequired['order_no']);
118
+ $this->orderNo = $this->getOrderIdByTransId();
119
+ }
120
+
121
+ if (empty($request['payment_type'])) {
122
+ echo "Required param (payment_type) missing!";
123
+ } elseif (empty($this->orderNo)) {
124
+ echo "Order no is missing !" . $this->lineBreak;
125
+ } elseif (!empty($request['payment_type']) && in_array(strtoupper($request['payment_type']), array_merge($this->paymentTypes, $this->chargeBackPayments, $this->aryCollection, $this->arySubscription))) {
126
+ //Complete the order in-case response failure from novalnet server
127
+ $order = $this->getOrderByIncrementId($this->orderNo);
128
+
129
+ if ($order->getIncrementId()) {
130
+ $payment = $order->getPayment();
131
+ $paymentObj = $payment->getMethodInstance();
132
+ $this->storeId = $order->getStoreId();
133
+ $this->redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
134
+ $paymentTid = (in_array($request['payment_type'], $this->invoiceAllowed))
135
+ || (in_array($request['payment_type'], $this->chargeBackPayments))
136
+ ? $request['tid_payment'] : $request['tid'];
137
+ // Get Admin Transaction status via API
138
+ $this->getAdminTransaction = $paymentObj->doNovalnetStatusCall($paymentTid, $payment);
139
+ // Validate the payment type for the particular order
140
+ $this->paymentTypeValidation($order);
141
+ $checkTidExist = $payment->getLastTransId();
142
+
143
+ if (!empty($this->orderNo) && $order->getIncrementId() == $this->orderNo
144
+ && empty($checkTidExist)) {
145
+
146
+ //Unhold an order:-
147
+ if ($order->canUnhold()) {
148
+ $order->unhold()->save();
149
+ }
150
+
151
+ // save the payment additional information
152
+ $serverResMode = $request['test_mode'];
153
+ $shopMode = $paymentObj->_getConfigData('live_mode', '', $this->storeId);
154
+ $this->testMode = (((isset($serverResMode) && $serverResMode
155
+ == 1) || (isset($shopMode) && $shopMode == 0))
156
+ ? 1 : 0 );
157
+ $data = array('NnTestOrder' => $this->testMode);
158
+ $additionalData = unserialize($payment->getAdditionalData());
159
+
160
+ $data = $additionalData ? array_merge($additionalData, $data)
161
+ : $data;
162
+ $payment->setStatus(Novalnet_Payment_Model_Payment_Method_Abstract::STATUS_SUCCESS)
163
+ ->setStatusDescription($this->helper->__('Payment was successful.'))
164
+ ->setAdditionalData(serialize($data))
165
+ ->save();
166
+
167
+ // save the order transaction information
168
+ $dataObj = new Varien_Object($request);
169
+ if (in_array($paymentObj->getCode(), $this->redirectPayment)) {
170
+ $authorizeKey = $paymentObj->_getConfigData('password', true);
171
+ $responseAmount = is_numeric($request['amount'])
172
+ ? $request['amount'] : $this->helper->getDecodedParam($request['amount'], $authorizeKey);
173
+ $amount = $this->helper->getFormatedAmount($responseAmount, 'RAW');
174
+ } else {
175
+ $amount = $this->helper->getFormatedAmount($request['amount'], 'RAW');
176
+ }
177
+
178
+ $this->helper->doTransactionStatusSave($dataObj, $this->getAdminTransaction, $payment, $amount);
179
+
180
+ // Payment process based on response status
181
+ if ($payment->getAdditionalInformation($paymentObj->getCode() . '_successAction')
182
+ != 1) {
183
+ $payment->setAdditionalInformation($paymentObj->getCode() . '_successAction', 1);
184
+ if ($order->canInvoice() && $this->getAdminTransaction->getStatus()
185
+ == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
186
+ $payment->setTransactionId($paymentTid) // Add capture text to make the new transaction
187
+ ->setParentTransactionId(null)
188
+ ->setIsTransactionClosed(true)
189
+ ->setLastTransId($paymentTid)
190
+ ->capture(null)
191
+ ->save();
192
+ } else {
193
+ $payment->setTransactionId($paymentTid)
194
+ ->setLastTransId($paymentTid)
195
+ ->setParentTransactionId(null)
196
+ ->save();
197
+ }
198
+
199
+ $onHoldStatus = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('paymentOnholdStaus');
200
+ array_push($onHoldStatus, '100', '90');
201
+
202
+ if (in_array($this->getAdminTransaction->getStatus(), $onHoldStatus)) {
203
+ $orderStatus = $this->getOrderStatus($order, $this->getAdminTransaction);
204
+ $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $orderStatus, $this->helper->__('Customer successfully returned from Novalnet'), true
205
+ )->save();
206
+ } else {
207
+ $paymentObj->saveCancelledOrder($dataObj, $payment);
208
+ }
209
+ }
210
+ $this->callBackExecuted = true;
211
+ $customerId = $order->getCustomerId();
212
+ // save the server response details
213
+ $this->helper->doTransactionOrderLog($dataObj, $this->orderNo, $this->storeId, $customerId);
214
+
215
+ //sendNewOrderEmail
216
+ if (!$order->getEmailSent() && $order->getId() && in_array($this->getAdminTransaction->getStatus(), $onHoldStatus)) {
217
+ try {
218
+ $order->sendNewOrderEmail()
219
+ ->setEmailSent(true)
220
+ ->save();
221
+ } catch (Exception $e) {
222
+ Mage::throwException($this->helper->__('Cannot send new order email.'));
223
+ }
224
+ }
225
+ $order->save();
226
+ }
227
+ if ($this->checkParams()) {
228
+ //Get Order ID and Set New Order Status
229
+ $ordercheckstatus = $this->BasicValidation($this->orderNo, $order);
230
+ if ($ordercheckstatus) {
231
+ if ($this->getAdminTransaction->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
232
+ $this->setOrderStatus($this->orderNo, $order);
233
+ } else {
234
+ echo isset($this->getAdminTransaction['transaction_status']['status_message'])
235
+ ? ($this->getAdminTransaction['transaction_status']['status_message'])
236
+ : 'Error in processing the transactions status';
237
+ exit;
238
+ }
239
+ }
240
+ }
241
+ if ($this->log) {
242
+ $logFile = 'novalnet_callback_script_' . date('Y-m-d') . '.log';
243
+ Mage::log('Ein Haendlerskript-Aufruf fand statt mit StoreId ' . $this->storeId . " und Parametern:$this->lineBreak" . print_r($request, true), null, $logFile);
244
+ }
245
+ } else {
246
+ echo "Order no [" . $this->orderNo . "] is not valid! $this->lineBreak";
247
+ }
248
+ } else {
249
+ echo "Payment type [" . $request['payment_type'] . "] is mismatched! $this->lineBreak";
250
+ }
251
+ }
252
+ } catch (Exception $e) {
253
+ $this->emailBody .= "Exception catched: $this->lineBreak\$e:" . $e->getMessage() . $this->lineBreak;
254
+ }
255
+
256
+ if ($this->emailBody && $this->emailFromAddr && ($this->emailToAddr && $this->validateEmail())) {
257
+ if (!$this->sendMail()) {
258
+ if ($this->debug) {
259
+ echo "Mailing failed!" . $this->lineBreak;
260
+ echo "This mail text should be sent: " . $this->lineBreak;
261
+ }
262
+ }
263
+ }
264
+
265
+ if ($this->debug) {
266
+ echo $this->emailBody;
267
+ }
268
+ }
269
+
270
+ // ############## Sub Routines #####################
271
+ /**
272
+ * Send callback notification E-mail
273
+ *
274
+ */
275
+ private function sendMail()
276
+ {
277
+
278
+ if ($this->useZendEmail) {
279
+ if (!$this->sendEmailZend()) {
280
+ return false;
281
+ }
282
+ } else {
283
+ if (!$this->sendEmailMagento()) {
284
+ return false;
285
+ }
286
+ }
287
+
288
+ return true;
289
+ }
290
+
291
+ /**
292
+ * Send callback notification E-mail via Magento
293
+ *
294
+ */
295
+ private function sendEmailMagento()
296
+ {
297
+ /*
298
+ * Loads the html file named 'novalnet_callback_email.html' from
299
+ * E.G: app/locale/en_US/template/email/novalnet/novalnet_callback_email.html
300
+ * OR: app/locale/YourLanguage/template/email/novalnet/novalnet_callback_email.html
301
+ * Adapt the corresponding template if necessary
302
+ */
303
+ $emailTemplate = Mage::getModel('core/email_template')
304
+ ->loadDefault('novalnet_callback_email_template');
305
+
306
+ //Define some variables to assign to template
307
+ $emailTemplVariables = array();
308
+ $emailTemplVariables['fromName'] = $this->emailFromName;
309
+ $emailTemplVariables['fromEmail'] = $this->emailFromAddr;
310
+ $emailTemplVariables['toName'] = $this->emailToName;
311
+ $emailTemplVariables['toEmail'] = $this->emailToAddr;
312
+ $emailTemplVariables['subject'] = $this->emailSubject;
313
+ $emailTemplVariables['body'] = $this->emailBody;
314
+ $processedTemplate = $emailTemplate->getProcessedTemplate($emailTemplVariables);
315
+
316
+ //Send Email
317
+ if ($this->mailHost && $this->mailPort) {
318
+ ini_set('SMTP', $this->mailHost);
319
+ ini_set('smtp_port', $this->mailPort);
320
+ }
321
+
322
+ $mail = new Zend_Mail();
323
+ $mail->setBodyHtml($processedTemplate);
324
+ $mail->setFrom($this->emailFromAddr, $this->emailFromName);
325
+ $mail->addTo($this->emailToAddr, $this->emailToName);
326
+ $mail->setSubject($this->emailSubject);
327
+
328
+ try {
329
+ //Confirmation E-Mail Send
330
+ $mail->send();
331
+ if ($this->debug) {
332
+ echo __FUNCTION__ . ': Sending Email succeeded!' . $this->lineBreak;
333
+ }
334
+ } catch (Exception $e) {
335
+ Mage::getSingleton('core/session')
336
+ ->addError($this->helper->__('Unable to send email'));
337
+ if ($this->debug) {
338
+ echo 'Email sending failed: ' . $e->getMessage();
339
+ }
340
+ return false;
341
+ }
342
+ return true;
343
+ }
344
+
345
+ /**
346
+ * Send callback notification E-mail via zend
347
+ *
348
+ */
349
+ private function sendEmailZend()
350
+ {
351
+
352
+ if ($this->mailHost && $this->mailPort) {
353
+ ini_set('SMTP', $this->mailHost);
354
+ ini_set('smtp_port', $this->mailPort);
355
+ }
356
+
357
+ $mail = new Zend_Mail();
358
+ $mail->setBodyHtml($this->emailBody);
359
+ $mail->setFrom($this->emailFromAddr, $this->emailFromName);
360
+ $mail->addTo($this->emailToAddr, $this->emailToName);
361
+ $mail->setSubject($this->emailSubject);
362
+
363
+ try {
364
+ $mail->send();
365
+ if ($this->debug) {
366
+ echo __FUNCTION__ . ': Sending Email succeeded!' . $this->lineBreak;
367
+ }
368
+ } catch (Exception $e) {
369
+ if ($this->debug) {
370
+ echo 'Email sending failed: ' . $e->getMessage();
371
+ }
372
+ return false;
373
+ }
374
+ return true;
375
+ }
376
+
377
+ /**
378
+ * validate the payment type.
379
+ *
380
+ */
381
+ private function paymentTypeValidation($order)
382
+ {
383
+ $request = $this->request;
384
+ $orderPaymentName = strtolower($this->getPaymentMethod($order));
385
+ $paymentType = $this->allowedPayment[$orderPaymentName];
386
+
387
+ if (!in_array($request['payment_type'], $paymentType)) {
388
+ echo "Novalnet callback received. Payment type (" . $request['payment_type'] . ") is not matched with $orderPaymentName!$this->lineBreak$this->lineBreak";
389
+ exit;
390
+ }
391
+
392
+ return true;
393
+ }
394
+
395
+ /**
396
+ * Check the email id is valid
397
+ *
398
+ * @param $emailId
399
+ * @return bool
400
+ */
401
+ private function validateEmail()
402
+ {
403
+ $validatorEmail = new Zend_Validate_EmailAddress();
404
+ if (!$validatorEmail->isValid(trim($this->emailToAddr))) {
405
+ return false;
406
+ }
407
+ return true;
408
+ }
409
+
410
+ /**
411
+ * Check the callback mandatory parameters.
412
+ *
413
+ */
414
+ private function checkParams()
415
+ {
416
+ $error = false;
417
+ $request = $this->request;
418
+ if (!$request) {
419
+ echo 'Novalnet callback received. No params passed over!' . $this->lineBreak;
420
+ exit;
421
+ }
422
+
423
+ if ($this->hParamsRequired) {
424
+ foreach ($this->hParamsRequired as $k => $v) {
425
+ if (!isset($request[$k]) || empty($request[$k])) {
426
+ $error = true;
427
+ echo 'Required param (' . $k . ') missing!' . $this->lineBreak;
428
+ }
429
+ }
430
+ if ($error) {
431
+ exit;
432
+ }
433
+ }
434
+
435
+ if ((in_array($request['payment_type'], $this->invoiceAllowed)) || (in_array($request['payment_type'], $this->chargeBackPayments))) {
436
+ if (strlen($request['tid_payment']) != 17) {
437
+ echo 'Novalnet callback received. Invalid TID [' . $request['tid_payment'] . '] for Order:' . $this->orderNo . ' ' . "$this->lineBreak$this->lineBreak" . $this->lineBreak;
438
+ exit;
439
+ }
440
+ }
441
+
442
+ if (strlen($request['tid']) != 17) {
443
+ if ((in_array($request['payment_type'], $this->invoiceAllowed)) || (in_array($request['payment_type'], $this->chargeBackPayments))) {
444
+ echo 'Novalnet callback received. New TID is not valid.' . "$this->lineBreak$this->lineBreak" . $this->lineBreak;
445
+ } else {
446
+ echo 'Novalnet callback received. Invalid TID [' . $request['tid'] . '] for Order:' . $this->orderNo . ' ' . "$this->lineBreak$this->lineBreak" . $this->lineBreak;
447
+ }
448
+ exit;
449
+ }
450
+
451
+ if (!empty($request['status']) && 100 != $request['status']) {
452
+ echo "Novalnet callback received. Callback Script executed already. Refer Order :" . $this->orderNo . $this->lineBreak;
453
+ exit;
454
+ }
455
+ return true;
456
+ }
457
+
458
+ /**
459
+ * validate the callback parameters.
460
+ *
461
+ */
462
+ private function BasicValidation($orderNo, $order)
463
+ {
464
+
465
+ if ($order->getIncrementId() == $orderNo && !empty($orderNo)) {
466
+ $request = $this->request;
467
+ //check amount
468
+ $amount = $request['amount'];
469
+ if (!$amount || intval($amount) < 0) {
470
+ echo "Novalnet callback received. The requested amount ($amount) must be greater than zero.$this->lineBreak$this->lineBreak";
471
+ exit;
472
+ }
473
+
474
+ if ((in_array($request['payment_type'], $this->invoiceAllowed)) || (in_array($request['payment_type'], $this->chargeBackPayments))) {
475
+ $orgTid = $request['tid_payment'];
476
+ } else {
477
+ $orgTid = $request['tid'];
478
+ }
479
+
480
+ $payment = $order->getPayment();
481
+ $additionalData = unserialize($payment->getAdditionalData());
482
+ $orderTid = ((in_array($request['payment_type'], $this->chargeBackPayments)) && $additionalData['NnTid'])
483
+ ? $additionalData['NnTid'] : $order->getPayment()->getLastTransId();
484
+ if (!preg_match('/^' . $orgTid . '/i', $orderTid)) {
485
+ echo 'Novalnet callback received. Order no is not valid' . "$this->lineBreak$this->lineBreak" . $this->lineBreak;
486
+ exit;
487
+ }
488
+
489
+ return true;
490
+ } else {
491
+ echo 'Transaction mapping failed. no order data found' . $this->lineBreak;
492
+ exit;
493
+ }
494
+ }
495
+
496
+ /**
497
+ * Set the status and state to an order payment
498
+ *
499
+ */
500
+ private function setOrderStatus($incrementId, $order)
501
+ {
502
+
503
+ if ($order) {
504
+ $request = $this->request;
505
+ $order->getPayment()->getMethodInstance()->setCanCapture(true);
506
+ $orderStatus = $this->getOrderStatus($order);
507
+ $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'
508
+
509
+ // add some feature regarding subscription and collection; adapt for your need.
510
+ $this->subsCollectionInfo();
511
+
512
+ if (in_array($request['payment_type'], $this->chargeBackPayments)) {
513
+ $payment = $order->getPayment();
514
+ $data = unserialize($payment->getAdditionalData());
515
+ $currency = $this->getAdminTransaction->getCurrency();
516
+ $script = 'Novalnet Callback received. Charge back was executed sucessfully for the TID ' . $request['tid_payment'] . ' amount ' . ($request['amount'])
517
+ / 100 . ' ' . $currency . " on " . date('Y-m-d H:i:s');
518
+ $this->emailBody = $script;
519
+
520
+ $data['NnComments'] = empty($data['NnComments']) ? '<br>' . $script
521
+ : $data['NnComments'] . '<br>' . $script;
522
+ $this->saveAdditionalInfo($payment, $data);
523
+ return true;
524
+ }
525
+
526
+ if ($this->createInvoice) {
527
+ $saveinvoice = $this->saveInvoice($order);
528
+ }
529
+
530
+ if ($order->getInvoiceCollection()->getFirstItem()) {
531
+ if ($saveinvoice) {
532
+ $order->setState($orderState, true, 'Novalnet callback set state ' . $orderState . ' for Order-ID = ' . $incrementId);
533
+ $order->addStatusToHistory($orderStatus, 'Novalnet callback added order status ' . $orderStatus); // this line must be located after $order->setState()
534
+ $this->emailBody .= 'Novalnet callback set state to ' . $orderState . $this->lineBreak;
535
+ $this->emailBody .= 'Novalnet callback set status to ' . $orderStatus . ' ... ' . $this->lineBreak;
536
+ $order->save();
537
+
538
+ //Add subsequent TID to DB column last_trans_id
539
+ if ($this->addSubsequentTidToDb) {
540
+ $payment = $order->getPayment();
541
+ $data = unserialize($payment->getAdditionalData());
542
+ $magentoVersion = $this->helper->getMagentoVersion();
543
+ $transMode = (version_compare($magentoVersion, '1.6', '<'))
544
+ ? false : true;
545
+ $amount = $this->helper->getFormatedAmount($request['amount'], 'RAW');
546
+ $currency = $this->getAdminTransaction->getCurrency();
547
+ if (in_array($request['payment_type'], $this->invoiceAllowed)) {
548
+ $payment->setTransactionId($request['tid'])
549
+ ->setIsTransactionClosed($transMode);
550
+ $transaction = $payment->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE, null, false);
551
+ $transaction->setParentTxnId(null)
552
+ ->save();
553
+ $script = "Novalnet Callback Script executed successfully for the TID: " . $request['tid_payment'] . " with amount " . $amount . $currency . " on " . date('Y-m-d H:i:s') . ". Please refer PAID transaction in our Novalnet Merchant Administration with the TID: " . $request['tid'] . ". ";
554
+ } else {
555
+ if ($request['payment_type'] == 'PAYPAL') {
556
+ $loadTransaction = $this->helper->loadTransactionStatus(trim($request['tid']));
557
+ $loadTransaction->setTransactionStatus($this->getAdminTransaction->getStatus())
558
+ ->save();
559
+ }
560
+ $script = "Novalnet Callback Script executed successfully for the TID: " . $request['tid'] . " with amount " . $amount . $currency . " on " . date('d-m-Y H:i:s');
561
+ }
562
+
563
+ $data['NnComments'] = empty($data['NnComments']) ? '<br>' . $script
564
+ : $data['NnComments'] . '<br>' . $script;
565
+ $this->saveAdditionalInfo($payment, $data);
566
+ }
567
+ }
568
+ } else {
569
+ echo "Novalnet Callback: No invoice for order (" . $order->getId() . ") found";
570
+ exit;
571
+ }
572
+ } else {
573
+ echo "Novalnet Callback: No order for Increment-ID $incrementId found.";
574
+ exit;
575
+ }
576
+ return true;
577
+ }
578
+
579
+ /**
580
+ * Create invoice to order payment
581
+ *
582
+ */
583
+ private function saveInvoice($order)
584
+ {
585
+
586
+ if (!$this->callBackExecuted) {
587
+ $request = $this->request;
588
+ $payment = $order->getPayment();
589
+ $paymentObj = $payment->getMethodInstance();
590
+ $data = unserialize($payment->getAdditionalData());
591
+ $modNovalCallback = Mage::getModel('novalnet_payment/callback')->loadLogByOrderId($this->orderNo);
592
+ $amount = $this->helper->getFormatedAmount($request['amount'], 'RAW');
593
+ $sum = sprintf( ($request['amount'] + $modNovalCallback->getCallbackAmount()) , 0.2);
594
+ $grandTotal = sprintf( ($order->getGrandTotal() * 100) , 0.2);
595
+
596
+ if (in_array($request['payment_type'], $this->invoiceAllowed) && $sum
597
+ < $grandTotal) {
598
+
599
+ $this->doNovalnetCallbackLog($modNovalCallback, $sum);
600
+
601
+ $this->emailBody = "Novalnet Callback Script executed successfully for the TID: " . $request['tid_payment'] . " with amount " . $amount . $this->getAdminTransaction->getCurrency() . " on " . date('Y-m-d H:i:s') . ". Please refer PAID transaction in our Novalnet Merchant Administration with the TID: " . $request['tid'] . "$this->lineBreak$this->lineBreak";
602
+
603
+ $callbackComments = "Novalnet Callback Script executed successfully. Payment for order id :" . $this->orderNo . '. New TID: ' . $request['tid'] . ' on ' . date('Y-m-d H:i:s') . ' for the amount : ' . $amount . ' ' . $this->getAdminTransaction->getCurrency() . $this->lineBreak;
604
+ $data['NnComments'] = empty($data['NnComments']) ? '<br>' . $callbackComments
605
+ : $data['NnComments'] . '<br>' . $callbackComments;
606
+ $this->saveAdditionalInfo($payment, $data);
607
+ return false;
608
+ } else {
609
+
610
+ $this->doNovalnetCallbackLog($modNovalCallback, $sum);
611
+
612
+ if ($order->canInvoice()) {
613
+ $tid = in_array($request['payment_type'], $this->invoiceAllowed)
614
+ ? $request['tid_payment'] : $request['tid'];
615
+ $invoice = $order->prepareInvoice();
616
+ $invoice->setTransactionId($tid);
617
+ $invoice->setRequestedCaptureCase(Mage_Sales_Model_Order_Invoice::CAPTURE_ONLINE)
618
+ ->setState(Mage_Sales_Model_Order_Invoice::STATE_PAID)
619
+ ->register();
620
+ Mage::getModel('core/resource_transaction')
621
+ ->addObject($invoice)
622
+ ->addObject($invoice->getOrder())
623
+ ->save();
624
+
625
+ if (in_array($request['payment_type'], $this->invoiceAllowed)) {
626
+ $emailText = "Novalnet Callback Script executed successfully for the TID: " . $request['tid_payment'] . " with amount " . $amount . $this->getAdminTransaction->getCurrency() . " on " . date('Y-m-d H:i:s') . ". Please refer PAID transaction in our Novalnet Merchant Administration with the TID: " . $request['tid'] . ". ";
627
+ $this->emailBody = ($sum > $grandTotal) ? $emailText . "Customer paid amount is greater than the order total amount. $this->lineBreak$this->lineBreak"
628
+ : $emailText . "$this->lineBreak$this->lineBreak";
629
+ } else {
630
+ $this->emailBody = "Novalnet Callback Script executed successfully for the TID: " . $request['tid'] . " with amount " . $amount . $this->getAdminTransaction->getCurrency() . " on " . date('d-m-Y H:i:s') . ". $this->lineBreak$this->lineBreak";
631
+ }
632
+ } else {
633
+ if ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_INVOICE) {
634
+ $currency = $this->getAdminTransaction->getCurrency();
635
+ $script = "Novalnet Callback Script executed successfully for the TID: " . $request['tid_payment'] . " with amount " . $amount . $currency . " on " . date('Y-m-d H:i:s') . ". Please refer PAID transaction in our Novalnet Merchant Administration with the TID: " . $request['tid'] . ". ";
636
+ $data['NnComments'] = empty($data['NnComments']) ? '<br>' . $script
637
+ : $data['NnComments'] . '<br>' . $script;
638
+ $this->saveAdditionalInfo($payment, $data);
639
+ $this->saveOrderStatus($order);
640
+ }
641
+
642
+ $invoicePayments = array(Novalnet_Payment_Model_Config::NN_PREPAYMENT, Novalnet_Payment_Model_Config::NN_INVOICE);
643
+ if (in_array($paymentObj->getCode(), $invoicePayments)) {
644
+ echo "Novalnet callback received. Callback Script executed already. Refer Order :" . $this->orderNo . $this->lineBreak;
645
+ } else {
646
+ echo "Novalnet Callbackscript received. Payment type ( " . $request['payment_type'] . " ) is not applicable for this process!" . $this->lineBreak;
647
+ }
648
+ exit;
649
+ }
650
+ }
651
+ }
652
+ return true;
653
+ }
654
+
655
+ /**
656
+ * save the order status for invoice payment method
657
+ *
658
+ */
659
+ function saveOrderStatus($order)
660
+ {
661
+ $request = $this->request;
662
+ $payment = $order->getPayment();
663
+ $originalTid = trim($payment->getLastTransId());
664
+ // save paid transaction id
665
+ $transaction = Mage::getModel('sales/order_payment')->getCollection()
666
+ ->addFieldToFilter('last_trans_id', $originalTid)
667
+ ->addFieldToSelect('entity_id');
668
+ foreach ($transaction as $transactionId) {
669
+ $entitiyId = $transactionId->getEntityId();
670
+ }
671
+ Mage::getModel('sales/order_payment')->load($entitiyId)
672
+ ->setLastTransId(trim($request['tid']))
673
+ ->save();
674
+ // change the order status
675
+ $orderStatus = $this->getOrderStatus($order);
676
+ $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'
677
+ $order->setState($orderState, true, 'Novalnet callback set state ' . $orderState . ' for Order-ID = ' . $this->orderNo);
678
+ $order->addStatusToHistory($orderStatus, 'Novalnet callback added order status ' . $orderStatus); // this line must be located after $order->setState()
679
+ $order->save();
680
+ // change invoice status to paid
681
+ $invoice = $order->getInvoiceCollection()->getFirstItem();
682
+ $invoice->setState(Mage_Sales_Model_Order_Invoice::STATE_PAID);
683
+ $invoice->save();
684
+ }
685
+
686
+ /**
687
+ * save the payment additional data for the order
688
+ *
689
+ */
690
+ private function saveAdditionalInfo($payment, $data)
691
+ {
692
+ if ($payment && $data) {
693
+ $order = $payment->getOrder();
694
+ $payment->setAdditionalData(serialize($data));
695
+ $order->setPayment($payment)
696
+ ->save();
697
+ }
698
+ }
699
+
700
+ /**
701
+ * Get the order payment status
702
+ *
703
+ * @return Order_status
704
+ */
705
+ private function getOrderStatus($order)
706
+ {
707
+ $payment = $order->getPayment();
708
+ $paymentObj = $payment->getMethodInstance();
709
+ $getresponseData = unserialize($payment->getAdditionalData());
710
+ array_push($this->redirectPayment, Novalnet_Payment_Model_Config::NN_PREPAYMENT, Novalnet_Payment_Model_Config::NN_INVOICE);
711
+
712
+ $status = $paymentObj->_getConfigData('order_status', '', $this->storeId);
713
+
714
+ if (($paymentObj->getCode() && (in_array($paymentObj->getCode(), $this->redirectPayment)))
715
+ || ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_CC
716
+ && $getresponseData['ActiveCc3d'])) {
717
+ $status = $paymentObj->_getConfigData('order_status_after_payment', '', $this->storeId);
718
+ }
719
+ if ($paymentObj->getCode() && $paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_PAYPAL
720
+ && ($this->getAdminTransaction->getStatus() == Novalnet_Payment_Model_Config::PAYPAL_PENDING_CODE)) {
721
+ $status = $paymentObj->_getConfigData('order_status', '', $this->storeId)
722
+ ? $paymentObj->_getConfigData('order_status', '', $this->storeId)
723
+ : Mage_Sales_Model_Order::STATE_PENDING_PAYMENT;
724
+ }
725
+ if (!$status) {
726
+ $status = Mage_Sales_Model_Order::STATE_PROCESSING;
727
+ }
728
+ return $status;
729
+ }
730
+
731
+ /**
732
+ * Log partial callback data
733
+ *
734
+ */
735
+ private function doNovalnetCallbackLog($modNovalCallback, $sum)
736
+ {
737
+ $request = $this->request;
738
+ $orgTid = $request['payment_type'] == 'INVOICE_CREDIT' ? trim($request['tid_payment'])
739
+ : trim($request['tid']);
740
+ $requestUri = Mage::helper('core/http')->getRequestUri();
741
+ $modNovalCallback->setOrderId($this->orderNo)
742
+ ->setCallbackAmount($sum)
743
+ ->setReferenceTid($orgTid)
744
+ ->setCallbackDatetime(date('Y-m-d H:i:s'))
745
+ ->setCallbackLog($requestUri)
746
+ ->save();
747
+ }
748
+
749
+ /**
750
+ * Get order object for specific order id
751
+ *
752
+ * @return payment object
753
+ */
754
+ private function getOrderByIncrementId($incrementId)
755
+ {
756
+ $order = Mage::getModel('sales/order')->loadByIncrementId($incrementId);
757
+ return $order;
758
+ }
759
+
760
+ /**
761
+ * Get the payment method code from order
762
+ *
763
+ * @return string
764
+ */
765
+ private function getPaymentMethod($order)
766
+ {
767
+ return $order->getPayment()->getData('method');
768
+ }
769
+
770
+ /**
771
+ * Get parameters GET/POST
772
+ *
773
+ */
774
+ private function getParams()
775
+ {
776
+ if (Mage::app()->getRequest()->getParams()) {
777
+ $data = Mage::app()->getRequest()->getParams();
778
+ } else {
779
+ $data = Mage::app()->getRequest()->getQuery();
780
+ }
781
+ return $data;
782
+ }
783
+
784
+ /**
785
+ * Check whether the ip address is authorised
786
+ *
787
+ */
788
+ private function checkIP()
789
+ {
790
+ $callerIp = $this->helper->getRealIpAddr();
791
+
792
+ if ($this->test) {
793
+ $this->ipAllowed = '127.0.0.1';
794
+ if ($callerIp == '::1') {//IPv6 Issue
795
+ $callerIp = '127.0.0.1';
796
+ }
797
+ }
798
+
799
+ if ($this->ipAllowed != $callerIp && !$this->test) {
800
+ echo 'Unauthorised access from the IP [' . $callerIp . ']' . $this->lineBreak . $this->lineBreak;
801
+ exit;
802
+ }
803
+ return true;
804
+ }
805
+
806
+ /**
807
+ * add some feature regarding subscription and collection; adapt for your need.
808
+ *
809
+ */
810
+ private function subsCollectionInfo()
811
+ {
812
+ $request = $this->request;
813
+
814
+ if (in_array($request['payment_type'], $this->paymentTypes)) { ### Incoming of a payment
815
+ if (isset($request['subs_billing']) && $request['subs_billing'] == 1) { ##IF PAYMENT MADE ON SUBSCRIPTION RENEWAL
816
+ #### Step1: THE SUBSCRIPTION IS RENEWED, PAYMENT IS MADE, SO JUST CREATE A NEW ORDER HERE WITHOUT A PAYMENT PROCESS AND SET THE ORDER STATUS AS PAID ####
817
+ #### Step2: THIS IS OPTIONAL: UPDATE THE BOOKING REFERENCE AT NOVALNET WITH YOUR ORDER_NO BY CALLING NOVALNET GATEWAY, IF U WANT THE USER TO USE ORDER_NO AS PAYMENT REFERENCE ###
818
+ #### Step3: ADJUST THE NEW ORDER CONFIRMATION EMAIL TO INFORM THE USER THAT THIS ORDER IS MADE ON SUBSCRIPTION RENEWAL ###
819
+ }
820
+ if ($request['payment_type'] == 'INVOICE_START') { ##INVOICE START
821
+ if (isset($request['subs_billing']) && $request['subs_billing'] == 1) {
822
+ #### Step4: ENTER THE NECESSARY REFERENCE & BANK ACCOUNT DETAILS IN THE NEW ORDER CONFIRMATION EMAIL ####
823
+ }
824
+ }
825
+ ### DO THE STEPS TO UPDATE THE STATUS OF THE PAYMENT ###
826
+ } elseif (in_array($request['payment_type'], $this->aryCollection)) { ### Incoming of collection of a payment OR Bank transfer OR invoice OR Advance payment through Customer
827
+ ### DO THE STEPS TO UPDATE THE STATUS OF THE ORDER OR THE USER ###
828
+ if ($request['payment_type'] == 'INVOICE_CREDIT') { #if settlement of Advance payment through Customer
829
+ #### UPDATE THE STATUS OF THE USER ORDER HERE AND NOTE THAT THE ORDER HAS BEEN PAID ####
830
+ }
831
+ } elseif ($request['payment_type'] == 'SUBSCRIPTION_STOP') { ### Cancellation of a Subscription
832
+ ### UPDATE THE STATUS OF THE USER SUBSCRIPTION ###
833
+ }
834
+ }
835
+
836
+ /**
837
+ * get order id based on last transaction id.
838
+ *
839
+ */
840
+ private function getOrderIdByTransId()
841
+ {
842
+ $request = $this->request;
843
+
844
+ if ((in_array($request['payment_type'], $this->invoiceAllowed)) || (in_array($request['payment_type'], $this->chargeBackPayments))) {
845
+ $orgTid = $request['tid_payment'];
846
+ } else {
847
+ $orgTid = $request['tid'];
848
+ }
849
+
850
+ $tablePrefix = Mage::getConfig()->getTablePrefix();
851
+ if (in_array($request['payment_type'], $this->chargeBackPayments)) {
852
+ $orderPayment = $tablePrefix.'sales_payment_transaction';
853
+ $onCondition = "main_table.entity_id = $orderPayment.order_id";
854
+ $orderCollection = Mage::getModel('sales/order')->getCollection()
855
+ ->addFieldToFilter('txn_id', array('like' => "%$orgTid%"))
856
+ ->addFieldToSelect('increment_id');
857
+ } else {
858
+ $orderPayment = $tablePrefix.'sales_flat_order_payment';
859
+ $onCondition = "main_table.entity_id = $orderPayment.parent_id";
860
+ $orderCollection = Mage::getModel('sales/order')->getCollection()
861
+ ->addFieldToFilter('last_trans_id', array('like' => "%$orgTid%"))
862
+ ->addFieldToSelect('increment_id');
863
+ }
864
+
865
+ $orderCollection->getSelect()->join($orderPayment,$onCondition);
866
+ $count = $orderCollection->count();
867
+ if ($count > 0) {
868
+ foreach ($orderCollection as $order) {
869
+ $orderid = $order->getIncrementId();
870
+ }
871
+ }
872
+ $orderId = (isset($orderid) && $orderid != NULL) ? $orderid : '';
873
+
874
+ return $orderId;
875
+ }
876
+
877
+ }
app/code/community/Novalnet/Payment/Model/Config.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,10 +23,11 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Config {
 
28
 
29
- /** ******************************************* */
30
- /* NOVALNET GLOBAL PARAMS STARTS */
31
  /* * ******************************************* */
32
 
33
  const CALLBACK_PIN_LENGTH = 4; //PIN Length
@@ -39,12 +39,13 @@ class Novalnet_Payment_Model_Config {
39
  const NOVALNET_RETURN_METHOD = 'POST';
40
  const NOVALNET_REDIRECT_BLOCK = 'novalnet_payment/payment_method_novalnetRedirect';
41
  const GATEWAY_REDIRECT_URL = 'novalnet_payment/gateway/redirect';
 
42
  const GATEWAY_RETURN_URL = 'novalnet_payment/gateway/return';
43
  const GATEWAY_ERROR_RETURN_URL = 'novalnet_payment/gateway/error';
44
- const PAYPORT_URL = 'https://payport.novalnet.de/paygate.jsp';
45
- const INFO_REQUEST_URL = 'https://payport.novalnet.de/nn_infoport.xml';
46
- const CC_URL = 'https://payport.novalnet.de/direct_form.jsp';
47
- const SEPA_URL = 'https://payport.novalnet.de/direct_form_sepa.jsp';
48
  const INVOICE_PAYMENT_METHOD = 'Invoice';
49
  const PREPAYMENT_PAYMENT_METHOD = 'Prepayment';
50
  const TELEPHONE_PAYMENT_METHOD = 'Telephone';
@@ -52,22 +53,34 @@ class Novalnet_Payment_Model_Config {
52
  const TRANS_STATUS = 'TRANSACTION_STATUS';
53
  const TRANSMIT_PIN_AGAIN = 'TRANSMIT_PIN_AGAIN';
54
  const REPLY_EMAIL_STATUS = 'REPLY_EMAIL_STATUS';
55
- const SEPA_MANDATE_CONFIRMATION = 'MANDATE_CONFIRMATION';
56
  const PIN_STATUS = 'PIN_STATUS';
57
  const METHOD_DISABLE_CODE = '0529006';
58
  const PAYPAL_PENDING_CODE = 90;
59
- const POST_NORMAL = 'normal';
60
  const POST_CALLBACK = 'callback';
61
 
62
- static protected $instance;
63
- protected $_novalnetPaymentKey = array('novalnetCc' => 6, 'novalnetSecure' => 6, 'novalnetElvgerman' => 2, 'novalnetElvaustria' => 8, 'novalnetInvoice' => 27, 'novalnetPrepayment' => 27, 'novalnetPhonepayment' => 18, 'novalnetPaypal' => 34, 'novalnetSofortueberweisung' => 33, 'novalnetIdeal' => 49, 'novalnetSafetypay' => 54 , 'novalnetSepa' => 37 ,'novalnetSepaSigned' => 55);
64
- protected $_callbackAllowedCountry = array('AT', 'DE', 'CH');
65
- protected $_novalnetEncodeParams = array('auth_code', 'product', 'tariff', 'test_mode', 'uniqid', 'amount');
66
- protected $_novalnetHashParams = array('auth_code', 'product', 'tariff', 'amount', 'test_mode', 'uniqid');
67
- protected $_fraudCheckPayment = array('novalnetElvaustria', 'novalnetElvgerman', 'novalnetInvoice', 'novalnetCc');
68
-
69
- /* * ******************************************* */
70
- /* NOVALNET CC PARAMS */
 
 
 
 
 
 
 
 
 
 
 
 
 
71
  /* * ******************************************* */
72
 
73
  const NN_CC = 'novalnetCc';
@@ -78,9 +91,8 @@ class Novalnet_Payment_Model_Config {
78
  const NN_CC_INFO_BLOCK = 'novalnet_payment/payment_method_info_Cc';
79
 
80
  /* * ******************************************* */
81
- /* NOVALNET SEPA PARAMS */
82
  /* * ******************************************* */
83
-
84
  const NN_SEPA = 'novalnetSepa';
85
  const NN_SEPA_CAN_CAPTURE = true;
86
  const NN_SEPA_CAN_USE_INTERNAL = true;
@@ -89,36 +101,7 @@ class Novalnet_Payment_Model_Config {
89
  const NN_SEPA_INFO_BLOCK = 'novalnet_payment/payment_method_info_Sepa';
90
 
91
  /* * ******************************************* */
92
- /* NOVALNET CC3D PARAMS */
93
- /* * ******************************************* */
94
- const NN_CC3D = 'novalnetSecure';
95
- const NN_CC3D_CAN_AUTHORIZE = false;
96
- const NN_CC3D_CAN_CAPTURE = true;
97
- const NN_CC3D_CAN_USE_INTERNAL = false;
98
- const NN_CC3D_CAN_USE_MULTISHIPPING = false;
99
- const NN_CC3D_FORM_BLOCK = 'novalnet_payment/payment_method_form_Ccsecure';
100
- const NN_CC3D_INFO_BLOCK = 'novalnet_payment/payment_method_info_Ccsecure';
101
-
102
- /* * ******************************************* */
103
- /* NOVALNET ELVAUSTRIA PARAMS */
104
- /* * ******************************************* */
105
- const NN_ELVAT = 'novalnetElvaustria';
106
- const NN_ELVAT_CAN_CAPTURE = true;
107
- const NN_ELVAT_CAN_USE_MULTISHIPPING = true;
108
- const NN_ELVAT_FORM_BLOCK = 'novalnet_payment/payment_method_form_Elvaustria';
109
- const NN_ELVAT_INFO_BLOCK = 'novalnet_payment/payment_method_info_Elvaustria';
110
-
111
- /* * ******************************************* */
112
- /* NOVALNET ELVGERMAN PARAMS */
113
- /* * ******************************************* */
114
- const NN_ELVDE = 'novalnetElvgerman';
115
- const NN_ELVDE_CAN_CAPTURE = true;
116
- const NN_ELVDE_CAN_USE_MULTISHIPPING = true;
117
- const NN_ELVDE_FORM_BLOCK = 'novalnet_payment/payment_method_form_Elvgerman';
118
- const NN_ELVDE_INFO_BLOCK = 'novalnet_payment/payment_method_info_Elvgerman';
119
-
120
- /* * ******************************************* */
121
- /* NOVALNET INVOICE PARAMS */
122
  /* * ******************************************* */
123
  const NN_INVOICE = 'novalnetInvoice';
124
  const NN_INVOICE_CAN_CAPTURE = true;
@@ -127,7 +110,7 @@ class Novalnet_Payment_Model_Config {
127
  const NN_INVOICE_INFO_BLOCK = 'novalnet_payment/payment_method_info_Invoice';
128
 
129
  /* * ******************************************* */
130
- /* NOVALNET PREPAYMENT PARAMS */
131
  /* * ******************************************* */
132
  const NN_PREPAYMENT = 'novalnetPrepayment';
133
  const NN_PREPAYMENT_CAN_CAPTURE = true;
@@ -136,7 +119,7 @@ class Novalnet_Payment_Model_Config {
136
  const NN_PREPAYMENT_INFO_BLOCK = 'novalnet_payment/payment_method_info_Prepayment';
137
 
138
  /* * ******************************************* */
139
- /* NOVALNET IDEAL PARAMS */
140
  /* * ******************************************* */
141
  const NN_IDEAL = 'novalnetIdeal';
142
  const NN_IDEAL_CAN_CAPTURE = true;
@@ -147,7 +130,7 @@ class Novalnet_Payment_Model_Config {
147
  const NN_IDEAL_INFO_BLOCK = 'novalnet_payment/payment_method_info_Ideal';
148
 
149
  /* * ******************************************* */
150
- /* NOVALNET PAYPAL PARAMS */
151
  /* * ******************************************* */
152
  const NN_PAYPAL = 'novalnetPaypal';
153
  const NN_PAYPAL_CAN_CAPTURE = true;
@@ -158,7 +141,7 @@ class Novalnet_Payment_Model_Config {
158
  const NN_PAYPAL_INFO_BLOCK = 'novalnet_payment/payment_method_info_Paypal';
159
 
160
  /* * ****************************************** */
161
- /* NOVALNET SOFORT PARAMS */
162
  /* * ****************************************** */
163
  const NN_SOFORT = 'novalnetSofortueberweisung';
164
  const NN_SOFORT_CAN_CAPTURE = true;
@@ -169,7 +152,7 @@ class Novalnet_Payment_Model_Config {
169
  const NN_SOFORT_INFO_BLOCK = 'novalnet_payment/payment_method_info_Sofortueberweisung';
170
 
171
  /* * ****************************************** */
172
- /* NOVALNET TELEPHONE PARAMS */
173
  /* * ****************************************** */
174
  const NN_TELEPHONE = 'novalnetPhonepayment';
175
  const NN_TELEPHONE_CAN_CAPTURE = true;
@@ -180,29 +163,20 @@ class Novalnet_Payment_Model_Config {
180
  const NN_TELEPHONE_INFO_BLOCK = 'novalnet_payment/payment_method_info_Phonepayment';
181
 
182
  /* * ****************************************** */
183
- /* NOVALNET SAFETYPAY PARAMS */
184
- /* * ****************************************** */
185
- const NN_SAFETYPAY = 'novalnetSafetypay';
186
- const NN_SAFETYPAY_CAN_CAPTURE = true;
187
- const NN_SAFETYPAY_CAN_USE_INTERNAL = false;
188
- const NN_SAFETYPAY_CAN_REFUND = false;
189
- const NN_SAFETYPAY_CAN_USE_MULTISHIPPING = false;
190
- const NN_SAFETYPAY_FORM_BLOCK = 'novalnet_payment/payment_method_form_Safetypay';
191
- const NN_SAFETYPAY_INFO_BLOCK = 'novalnet_payment/payment_method_info_Safetypay';
192
-
193
- /* * ****************************************** */
194
- /* NOVALNET ABSTARCT FUNCTIONS */
195
  /* * ****************************************** */
196
 
197
- static public function getInstance() {
198
- if (!isset(self::$instance)) {
199
- self::$instance = new self;
 
200
  }
201
- return self::$instance;
202
  }
203
 
204
- public function getNovalnetVariable($key) {
205
- return $this->{'_'.$key};
 
206
  }
207
 
208
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Config
27
+ {
28
 
29
+ /** * ****************************************** */
30
+ /* NOVALNET GLOBAL PARAMS STARTS */
31
  /* * ******************************************* */
32
 
33
  const CALLBACK_PIN_LENGTH = 4; //PIN Length
39
  const NOVALNET_RETURN_METHOD = 'POST';
40
  const NOVALNET_REDIRECT_BLOCK = 'novalnet_payment/payment_method_novalnetRedirect';
41
  const GATEWAY_REDIRECT_URL = 'novalnet_payment/gateway/redirect';
42
+ const GATEWAY_DIRECT_URL = 'novalnet_payment/gateway/payment';
43
  const GATEWAY_RETURN_URL = 'novalnet_payment/gateway/return';
44
  const GATEWAY_ERROR_RETURN_URL = 'novalnet_payment/gateway/error';
45
+ const PAYPORT_URL = '://payport.novalnet.de/paygate.jsp';
46
+ const INFO_REQUEST_URL = '://payport.novalnet.de/nn_infoport.xml';
47
+ const CC_URL = '://payport.novalnet.de/direct_form.jsp';
48
+ const SEPA_URL = '://payport.novalnet.de/direct_form_sepa.jsp';
49
  const INVOICE_PAYMENT_METHOD = 'Invoice';
50
  const PREPAYMENT_PAYMENT_METHOD = 'Prepayment';
51
  const TELEPHONE_PAYMENT_METHOD = 'Telephone';
53
  const TRANS_STATUS = 'TRANSACTION_STATUS';
54
  const TRANSMIT_PIN_AGAIN = 'TRANSMIT_PIN_AGAIN';
55
  const REPLY_EMAIL_STATUS = 'REPLY_EMAIL_STATUS';
 
56
  const PIN_STATUS = 'PIN_STATUS';
57
  const METHOD_DISABLE_CODE = '0529006';
58
  const PAYPAL_PENDING_CODE = 90;
59
+ const POST_NORMAL = 'normal';
60
  const POST_CALLBACK = 'callback';
61
 
62
+ static protected $_instance;
63
+ protected $_novalnetPaymentKey = array('novalnetCc' => 6, 'novalnetInvoice' => 27,
64
+ 'novalnetPrepayment' => 27, 'novalnetPhonepayment' => 18, 'novalnetPaypal' => 34,
65
+ 'novalnetSofortueberweisung' => 33, 'novalnetIdeal' => 49, 'novalnetSepa' => 37);
66
+ protected $_redirectPayportUrl = array('novalnetPaypal' => '://payport.novalnet.de/paypal_payport',
67
+ 'novalnetSofortueberweisung' => '://payport.novalnet.de/online_transfer_payport',
68
+ 'novalnetIdeal' => '://payport.novalnet.de/online_transfer_payport',
69
+ 'novalnetCc' => '://payport.novalnet.de/global_pci_payport');
70
+ protected $_novalnetPaymentMethods = array('novalnetCc' => 'Novalnet Credit Card', 'novalnetInvoice' => 'Novalnet Invoice',
71
+ 'novalnetPrepayment' => 'Novalnet Prepayment', 'novalnetPhonepayment' => 'Novalnet Telephone Payment', 'novalnetPaypal' => 'Novalnet PayPal', 'novalnetSofortueberweisung' => 'Novalnet Instant Bank Transfer', 'novalnetIdeal' => 'Novalnet iDEAL', 'novalnetSepa' => 'Novalnet Direct Debit SEPA');
72
+ protected $_callbackAllowed = array('AT', 'DE', 'CH');
73
+ protected $_paymentOnholdStaus = array('91', '98', '99');
74
+ protected $_redirectPayments = array('novalnetPaypal', 'novalnetSofortueberweisung',
75
+ 'novalnetIdeal');
76
+ protected $_novalnetEncodeParams = array('auth_code', 'product', 'tariff', 'test_mode',
77
+ 'uniqid', 'amount');
78
+ protected $_novalnetHashParams = array('auth_code', 'product', 'tariff', 'amount',
79
+ 'test_mode', 'uniqid');
80
+ protected $_fraudCheckPayment = array('novalnetInvoice', 'novalnetSepa');
81
+
82
+ /* * ******************************************* */
83
+ /* NOVALNET CC PARAMS */
84
  /* * ******************************************* */
85
 
86
  const NN_CC = 'novalnetCc';
91
  const NN_CC_INFO_BLOCK = 'novalnet_payment/payment_method_info_Cc';
92
 
93
  /* * ******************************************* */
94
+ /* NOVALNET SEPA PARAMS */
95
  /* * ******************************************* */
 
96
  const NN_SEPA = 'novalnetSepa';
97
  const NN_SEPA_CAN_CAPTURE = true;
98
  const NN_SEPA_CAN_USE_INTERNAL = true;
101
  const NN_SEPA_INFO_BLOCK = 'novalnet_payment/payment_method_info_Sepa';
102
 
103
  /* * ******************************************* */
104
+ /* NOVALNET INVOICE PARAMS */
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
105
  /* * ******************************************* */
106
  const NN_INVOICE = 'novalnetInvoice';
107
  const NN_INVOICE_CAN_CAPTURE = true;
110
  const NN_INVOICE_INFO_BLOCK = 'novalnet_payment/payment_method_info_Invoice';
111
 
112
  /* * ******************************************* */
113
+ /* NOVALNET PREPAYMENT PARAMS */
114
  /* * ******************************************* */
115
  const NN_PREPAYMENT = 'novalnetPrepayment';
116
  const NN_PREPAYMENT_CAN_CAPTURE = true;
119
  const NN_PREPAYMENT_INFO_BLOCK = 'novalnet_payment/payment_method_info_Prepayment';
120
 
121
  /* * ******************************************* */
122
+ /* NOVALNET IDEAL PARAMS */
123
  /* * ******************************************* */
124
  const NN_IDEAL = 'novalnetIdeal';
125
  const NN_IDEAL_CAN_CAPTURE = true;
130
  const NN_IDEAL_INFO_BLOCK = 'novalnet_payment/payment_method_info_Ideal';
131
 
132
  /* * ******************************************* */
133
+ /* NOVALNET PAYPAL PARAMS */
134
  /* * ******************************************* */
135
  const NN_PAYPAL = 'novalnetPaypal';
136
  const NN_PAYPAL_CAN_CAPTURE = true;
141
  const NN_PAYPAL_INFO_BLOCK = 'novalnet_payment/payment_method_info_Paypal';
142
 
143
  /* * ****************************************** */
144
+ /* NOVALNET SOFORT PARAMS */
145
  /* * ****************************************** */
146
  const NN_SOFORT = 'novalnetSofortueberweisung';
147
  const NN_SOFORT_CAN_CAPTURE = true;
152
  const NN_SOFORT_INFO_BLOCK = 'novalnet_payment/payment_method_info_Sofortueberweisung';
153
 
154
  /* * ****************************************** */
155
+ /* NOVALNET TELEPHONE PARAMS */
156
  /* * ****************************************** */
157
  const NN_TELEPHONE = 'novalnetPhonepayment';
158
  const NN_TELEPHONE_CAN_CAPTURE = true;
163
  const NN_TELEPHONE_INFO_BLOCK = 'novalnet_payment/payment_method_info_Phonepayment';
164
 
165
  /* * ****************************************** */
166
+ /* NOVALNET ABSTARCT FUNCTIONS */
 
 
 
 
 
 
 
 
 
 
 
167
  /* * ****************************************** */
168
 
169
+ static public function getInstance()
170
+ {
171
+ if (!isset(self::$_instance)) {
172
+ self::$_instance = new self;
173
  }
174
+ return self::$_instance;
175
  }
176
 
177
+ public function getNovalnetVariable($key)
178
+ {
179
+ return $this->{'_' . $key};
180
  }
181
 
182
  }
app/code/community/Novalnet/Payment/Model/Novalnet/Source/Callbacktypes.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,13 +23,15 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Novalnet_Source_Callbacktypes {
 
28
 
29
- public function toOptionArray() {
30
- return array(0 => Mage::helper('novalnet_payment')->__('Nicht aktiv'),
31
- 1 => Mage::helper('novalnet_payment')->__('Callback (Telefon & Handy)'),
32
- 2 => Mage::helper('novalnet_payment')->__('SMS (nur Handy)'),
33
- 3 => Mage::helper('novalnet_payment')->__('Antwort per Email')
 
34
  );
35
  }
36
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Novalnet_Source_Callbacktypes
27
+ {
28
 
29
+ public function toOptionArray()
30
+ {
31
+ return array(0 => Mage::helper('novalnet_payment')->__('Not active'),
32
+ 1 => Mage::helper('novalnet_payment')->__('Callback (Landline & mobile)'),
33
+ 2 => Mage::helper('novalnet_payment')->__('SMS (Mobile only)'),
34
+ 3 => Mage::helper('novalnet_payment')->__('Email Reply')
35
  );
36
  }
37
 
app/code/community/Novalnet/Payment/Model/Novalnet/Source/Cctype.php DELETED
@@ -1,33 +0,0 @@
1
- <?php
2
-
3
- /**
4
- * Magento
5
- *
6
- * NOTICE OF LICENSE
7
- *
8
- * This source file is subject to the Open Software License (OSL 3.0)
9
- * that is bundled with this package in the file LICENSE.txt.
10
- * It is also available through the world-wide-web at this URL:
11
- * http://opensource.org/licenses/osl-3.0.php
12
- * If you did not receive a copy of the license and are unable to
13
- * obtain it through the world-wide-web, please send an email
14
- * to license@magentocommerce.com so we can send you a copy immediately.
15
- *
16
- * Part of the Paymentmodule of Novalnet AG
17
- * https://www.novalnet.de
18
- * If you have found this script usefull a small
19
- * recommendation as well as a comment on merchant form
20
- * would be greatly appreciated.
21
- *
22
- * @category Novalnet
23
- * @package Novalnet_Payment
24
- * @copyright Novalnet AG
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 extends Mage_Payment_Model_Source_Cctype {
28
-
29
- public function getAllowedTypes() {
30
- return array('VI', 'MC', 'AE');
31
- }
32
-
33
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Model/Novalnet/Source/Sepatype.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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Mage
22
- * @package Mage_Novalnet
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- class Novalnet_Payment_Model_Novalnet_Source_Sepatype
27
- {
28
- /**
29
- * Return DD SEPA types for current method
30
- *
31
- * @return array
32
- */
33
- public function toOptionArray()
34
- {
35
- return array( 'DD_SEPA' => Mage::helper('novalnet_payment')->__('SEPA'),
36
- 'DD_SEPA_SIGNED' => Mage::helper('novalnet_payment')->__('SEPA SIGNED'),
37
- );
38
- }
39
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Model/Observer.php ADDED
@@ -0,0 +1,93 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ class Novalnet_Payment_Model_Observer
27
+ {
28
+ /* @var Magento_Sales_Model_Order_Invoice */
29
+
30
+ public function sendInvoiceEmail($observer)
31
+ {
32
+ try {
33
+ /* @var $order Magento_Sales_Model_Order_Invoice */
34
+ $invoice = $observer->getEvent()->getInvoice();
35
+ $paymentCode = $invoice->getOrder()->getPayment()->getMethodInstance()->getCode();
36
+ $tidPayment = Mage::app()->getRequest()->getParam('tid_payment');
37
+
38
+ if ($paymentCode == Novalnet_Payment_Model_Config::NN_INVOICE && $tidPayment
39
+ == '') {
40
+ $invoice->setState(1);
41
+ $invoice->save();
42
+ $invoice->sendEmail($invoice);
43
+ } else {
44
+ $invoice->save();
45
+ $invoice->sendEmail($invoice);
46
+ }
47
+ } catch (Mage_Core_Exception $e) {
48
+ Mage::logException($e->getMessage());
49
+ }
50
+
51
+ return $this;
52
+ }
53
+
54
+ public function sendCreditmemoEmail($observer)
55
+ {
56
+ try {
57
+ /* @var $order Magento_Sales_Model_Order_Creditmemo */
58
+ $refund = $observer->getEvent()->getCreditmemo();
59
+ $refund->save();
60
+ $refund->sendEmail($refund);
61
+ } catch (Mage_Core_Exception $e) {
62
+ Mage::logException($e->getMessage());
63
+ }
64
+
65
+ return $this;
66
+ }
67
+
68
+ public function prepareLayoutBefore(Varien_Event_Observer $observer)
69
+ {
70
+ /* @var $block Mage_Page_Block_Html_Head */
71
+ if (!Mage::app()->getStore()->isCurrentlySecure()) {
72
+ $baseUrl = Mage::getBaseUrl();
73
+ } else {
74
+ $baseUrl = Mage::getUrl('', array('_secure' => true));
75
+ }
76
+ $currentlUrl = Mage::helper('core/url')->getCurrentUrl();
77
+ $block = $observer->getEvent()->getBlock();
78
+ if ("head" == $block->getNameInLayout() && $currentlUrl != $baseUrl) {
79
+ foreach (Mage::helper('novalnet_payment/AssignData')->getFiles() as $file) {
80
+ $block->addJs(Mage::helper('novalnet_payment/AssignData')->getJQueryPath($file));
81
+ }
82
+ }
83
+
84
+ return $this;
85
+ }
86
+
87
+ public function customerLogin()
88
+ {
89
+ Mage::getSingleton('core/session')->setGuestloginvalue('');
90
+ return;
91
+ }
92
+
93
+ }
app/code/community/Novalnet/Payment/Model/Payment/Method/Abstract.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -13,9 +12,9 @@
13
  * obtain it through the world-wide-web, please send an email
14
  * to license@magentocommerce.com so we can send you a copy immediately.
15
  *
16
- * Part of the Paymentmodule of Novalnet AG
17
  * https://www.novalnet.de
18
- * If you have found this script usefull a small
19
  * recommendation as well as a comment on merchant form
20
  * would be greatly appreciated.
21
  *
@@ -24,10 +23,11 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_Method_Abstract {
 
28
 
29
  protected $_isGateway = false;
30
- protected $_canAuthorize = true;
31
  protected $_canCapture = false;
32
  protected $_canCapturePartial = false;
33
  protected $_canRefund = true;
@@ -41,21 +41,21 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
41
  protected $_mustTransimitInvoicingData = false;
42
  protected $_mustTransimitInvoicingItemTypes = false;
43
  protected $_canCancelInvoice = false;
44
- protected $methodType = '';
45
- protected $redirectUrl = '';
46
-
47
  var $infoInstance;
48
- var $_helper;
49
- var $_dataHelper;
50
 
51
  /**
52
  * Load Basic Params in constructor
53
  *
54
  * @return
55
  */
56
- public function __construct() {
 
57
  //Novalnet Basic parameters
58
- $this->assignUtilities();
59
  $this->_vendorId = $this->_getConfigData('merchant_id', true);
60
  $this->_authcode = $this->_getConfigData('auth_code', true);
61
  $this->_productId = $this->_getConfigData('product_id', true);
@@ -69,35 +69,24 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
69
  * @param Mage_Sales_Model_Quote
70
  * @return bool
71
  */
72
- public function isAvailable($quote = null) {
 
73
  $getNnDisableTime = "getNnDisableTime" . ucfirst($this->_code); //Dynamic Getter based on payment methods
74
  $minOrderCount = $this->_getConfigData('orderscount');
75
  $userGroupId = $this->_getConfigData('user_group_excluded');
76
- if ($this->_helper->checkOrdersCount($minOrderCount)) {
 
77
  return false;
78
- } else if (!$this->_helper->checkCustomerAccess($userGroupId)) {
79
  return false;
80
- } else if (!empty($quote) && !$this->_helper->isModuleActive($quote->getGrandTotal())) {
81
  return false;
82
  } else if (time() < $this->_getMethodSession()->$getNnDisableTime()) {
83
  return false;
84
  }
85
- return parent::isAvailable($quote);
86
- }
87
 
88
- /**
89
- * Assign Form Data in quote instance
90
- *
91
- * @return Mage_Payment_Model_Abstract Object
92
- */
93
- public function assignData($data) {
94
- $infoInstance = $this->_getInfoInstance();
95
- // unset form method session
96
- if ($this->_code != $this->_getCheckout()->getNnPaymentCode()) {
97
- $this->unsetFormMethodSession();
98
- }
99
- $this->_dataHelper->assignNovalnetData($this->_code, $data, $infoInstance);
100
- return $this;
101
  }
102
 
103
  /**
@@ -105,130 +94,152 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
105
  *
106
  * @return Mage_Payment_Model_Abstract
107
  */
108
- public function validate() {
 
109
  parent::validate();
110
  $infoInstance = $this->_getInfoInstance();
111
  if (!$this->_isPlaceOrder()) {
112
 
 
113
  $this->validateNovalnetParams();
114
  //customer_no verification
115
- $this->_helper->customerNumberValidation();
116
- $this->_dataHelper->validateNovalnetData($this->_code, $infoInstance);
 
117
 
118
- //telephone payment data is set
119
  if ($this->_code != Novalnet_Payment_Model_Config::NN_TELEPHONE &&
120
  $this->_getMethodSession(Novalnet_Payment_Model_Config::NN_TELEPHONE)->getNnPhoneTid()) {
121
- $this->_unsetMethodSession(Novalnet_Payment_Model_Config::NN_TELEPHONE);
122
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
123
  }
124
- $this->doNovalnetPhoneFirstCall();
125
- $this->_initiateCallbackProcess($this->_code);
126
  return $this;
127
  }
128
 
129
  /**
130
- * Authorize
131
  *
132
- * @param Varien_Object $orderPayment
133
- * @param float $amount
134
- * @return Mage_Payment_Model_Abstract
135
  */
136
- public function authorize(Varien_Object $payment, $amount) {
137
- $methodSession = $this->_getMethodSession();
138
- $redirectPayment = array(
139
- Novalnet_Payment_Model_Config::NN_IDEAL,
140
- Novalnet_Payment_Model_Config::NN_PAYPAL,
141
- Novalnet_Payment_Model_Config::NN_SOFORT,
142
- Novalnet_Payment_Model_Config::NN_CC3D,
143
- Novalnet_Payment_Model_Config::NN_SAFETYPAY
144
- );
145
- if ($this->canAuthorize() && $this->_code && !in_array($this->_code, $redirectPayment)) {
146
- switch ($this->_code) {
147
- case Novalnet_Payment_Model_Config::NN_TELEPHONE:
148
- $requestData = new Varien_Object();
149
- $option = '<lang>' . strtoupper($this->_helper->getDefaultLanguage()) . '</lang>';
150
- $result = $this->doNovalnetStatusCall($methodSession->getNnPhoneTid(),NULL, Novalnet_Payment_Model_Config::NOVALTEL_STATUS, $option, $requestData);
151
- //$result = $result['result'];
152
- if ($result) {
153
- $result->setTid($this->_getMethodSession()->getNnPhoneTid());
154
- $result->setStatus($result->getNovaltelStatus());
155
- $result->setStatusDesc($result->getNovaltelStatusMessage());
156
-
157
- //For Manual Testing
158
- //$result->setStatus(100);
159
-
160
- $txnId = $methodSession->getNnPhoneTid();
161
- /** @@ Update the transaction status and transaction overview **/
162
- $this->logNovalnetTransactionData($requestData, $result, $txnId);
163
- $this->_validateSecondCallResponse($result, $payment);
164
- }
165
- break;
166
- default:
167
- if($this->isCallbackTypeCall()) {
168
- $result = $methodSession->getNnResponseData();
169
- } else {
170
- $storeId = $this->_helper->getMagentoStoreId();
171
- $request = $this->buildRequest(Novalnet_Payment_Model_Config::POST_NORMAL, $storeId);
172
- $result = $this->_postRequest($request);
173
- }
174
- $this->_validateNovalnetResponse($result, $payment, $request);
175
- break;
176
- }
177
- }
178
  return $this;
179
  }
180
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
181
  /**
182
  * Capture
183
  *
184
- * @param Varien_Object $orderPayment
185
  * @param float $amount
186
  * @return Mage_Payment_Model_Abstract
187
  */
188
- public function capture(Varien_Object $payment, $amount) {
189
- $redirectPayment = array(
190
- Novalnet_Payment_Model_Config::NN_IDEAL,
191
- Novalnet_Payment_Model_Config::NN_PAYPAL,
192
- Novalnet_Payment_Model_Config::NN_SOFORT,
193
- Novalnet_Payment_Model_Config::NN_SAFETYPAY,
194
- Novalnet_Payment_Model_Config::NN_TELEPHONE
195
- );
196
-
197
- $getTid = $payment->getTransactionId();
198
  $responseCodeApproved = Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED;
199
- if ($this->canCapture() && $this->_code && !in_array($this->_code, $redirectPayment) && !is_null($getTid)) {
200
 
201
- $request = new Varien_Object();
202
- $storeId = $payment->getOrder()->getStoreId();
203
- $customerId = $payment->getOrder()->getCustomerId();
204
- $amount = $this->_helper->getFormatedAmount($payment->getOrder()->getBaseGrandTotal());
205
- $lastTranId = $this->_helper->makeValidNumber($payment->getLastTransId());
206
- $this->assignOrderBasicParams($request, $payment, $storeId);
207
- $request->setTid($lastTranId)
208
- ->setStatus($responseCodeApproved)
209
- ->setEditStatus(true);
210
-
211
- $loadTransStatus = $this->_helper->loadTransactionStatus($lastTranId);
212
  $transStatus = $loadTransStatus->getTransactionStatus();
213
- if (!in_array(NULL, $request->toArray()) && !empty($transStatus) && $transStatus != $responseCodeApproved) {
214
 
215
- $buildNovalnetParam = http_build_query($request->getData());
216
- $response = $this->_dataHelper->setRawCallRequest($buildNovalnetParam, Novalnet_Payment_Model_Config::PAYPORT_URL);
 
 
217
  if ($response->getStatus() == $responseCodeApproved) {
218
  $loadTransStatus->setTransactionStatus($responseCodeApproved)
219
- ->save();
220
-
221
- $magentoVersion = $this->_getHelper()->getMagentoVersion();
222
- // make capture transaction open for lower versions to make refund
223
- if (version_compare($magentoVersion, '1.6', '<')) {
224
- $payment->setIsTransactionClosed(false)
225
- ->save();
226
- }
227
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
228
  } else {
229
  $this->showException('Error in you capture request');
230
  }
231
- $this->logNovalnetTransactionData($request, $response, $lastTranId, $customerId, $storeId);
232
  }
233
  }
234
  return $this;
@@ -240,19 +251,21 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
240
  * @param string $type
241
  * @return Mage_Novalnet_Model_Novalnet_Request
242
  */
243
- public function buildRequest($type = Novalnet_Payment_Model_Config::POST_NORMAL, $storeId = NULL) {
 
 
244
  $payCode = ucfirst($this->_code);
245
- $helper = $this->_helper;
246
  $callbackTelNo = "getNnCallbackTel" . $payCode;
247
  $callbackEmail = "getNnCallbackEmail" . $payCode;
248
- $refernce1 = strip_tags($this->_getConfigData('reference_one'));
249
- $refernce2 = strip_tags($this->_getConfigData('reference_two'));
250
 
251
- if ($type == Novalnet_Payment_Model_Config::POST_NORMAL
252
- || $type == Novalnet_Payment_Model_Config::POST_CALLBACK) {
253
  $request = new Varien_Object();
254
  $amount = $helper->getFormatedAmount($this->_getAmount());
255
  $billing = $this->_getInfoObject()->getBillingAddress();
 
256
  $this->assignNnAuthData($request, $storeId);
257
  $request->setTestMode((!$this->_getConfigData('live_mode')) ? 1 : 0)
258
  ->setAmount($amount)
@@ -272,27 +285,31 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
272
  ->setFax($billing->getFax())
273
  ->setRemoteIp($helper->getRealIpAddr())
274
  ->setGender('u')
275
- ->setEmail($this->_getInfoObject()->getCustomerEmail())
276
  ->setOrderNo($this->_getOrderId())
277
  ->setSystemUrl(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB))
278
- ->setSystemIp($_SERVER['SERVER_ADDR'])
279
- ->setSystemName('Magento')
280
- ->setSystemVersion($helper->getMagentoVersion().'-'.$helper->getNovalnetVersion())
281
- ->setInput1('order_id')
282
  ->setInputval1($this->_getOrderId());
283
 
284
- if ($this->_referrerId && $helper->checkIsNumeric($this->_referrerId)) {
285
- $request->setReferrerId($this->_referrerId);
286
- }
287
- if ($refernce1) {
288
- $request->setInput2('reference1')
289
- ->setInputval2($refernce1);
290
- }
291
- if ($refernce2) {
292
- $request->setInput3('reference2')
293
- ->setInputval3($refernce2);
294
- }
295
-
 
 
 
 
296
  $this->_setNovalnetParam($request, $this->_code);
297
  }
298
 
@@ -320,28 +337,53 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
320
  * @param string $type
321
  * @return Varien_Object
322
  */
323
- protected function _postRequest($request) {
 
324
  $result = new Varien_Object();
325
- $helper = $this->_helper;
326
  $paymentKey = $helper->getPaymentId($this->_code);
 
327
  if ($this->_validateBasicParams() && $helper->checkIsNumeric($paymentKey)
328
- && $paymentKey == $request->getKey() && $request->getAmount()
329
- && $helper->checkIsNumeric($request->getAmount())) {
330
- $response = $this->_setNovalnetRequestCall($request->getData(), Novalnet_Payment_Model_Config::PAYPORT_URL);
331
- $result->addData($helper->deformatNvp('&', $response->getBody()));
332
  } else {
333
  $this->showException($helper->__('Required parameter not valid') . '!', false);
334
  }
335
  return $result;
336
  }
337
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
338
  /**
339
  * Assign Novalnet Authentication Data
340
  *
341
  * @param Varien_Object $request
342
- * @param Decimal $amount
343
  */
344
- public function assignNnAuthData(Varien_Object $request, $storeId = NULL) {
 
345
  //Reassign the Basic Params Based on store
346
  $this->_vendorId = $this->_getConfigData('merchant_id', true, $storeId);
347
  $this->_authcode = $this->_getConfigData('auth_code', true, $storeId);
@@ -351,95 +393,132 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
351
  ->setAuthCode($this->_authcode)
352
  ->setProduct($this->_productId)
353
  ->setTariff($this->_tariffId)
354
- ->setKey($this->_helper->getPaymentId($this->_code));
355
  }
356
 
357
  /**
358
- * Get the Order basic configuration for refund, void, and capture
359
  *
360
- * @param string $request
361
  * @param string $payment
362
  */
363
- public function assignOrderBasicParams(Varien_Object $request, $payment, $storeId = NULL)
364
  {
365
- //Reassign the Basic Params Based on store
366
- $this->_vendorId = $this->_getConfigData('merchant_id', true, $storeId);
367
- $this->_authcode = $this->_getConfigData('auth_code', true, $storeId);
368
-
369
- $getresponseData = unserialize($payment->getAdditionalData());
370
- $vendorId = ($getresponseData['vendor']) ? $getresponseData['vendor'] : $this->_vendorId;
371
- $authCode = ($getresponseData['auth_code']) ? $getresponseData['auth_code'] : $this->_authcode;
372
- $productId = ($getresponseData['product']) ? $getresponseData['product'] : $this->_productId;
373
- $tariffId = ($getresponseData['tariff']) ? $getresponseData['tariff'] : $this->_tariffId;
374
- $key = ($getresponseData['key']) ? $getresponseData['key'] : $this->_helper->getPaymentId($this->_code);
375
-
376
- $request->setVendor($vendorId)
377
- ->setAuthCode($authCode)
378
- ->setProduct($productId)
379
- ->setTariff($tariffId)
380
- ->setKey($key); }
381
 
382
  /**
383
  * Refund amount
384
  *
385
- * @param Varien_Object $invoicePayment
386
- * @param float $amount
387
- * @return Mage_Payment_Model_Abstract
388
  */
389
- public function refund(Varien_Object $payment, $amount) {
390
- $orderAmount = $this->_getAmount();
391
  if (!$this->canRefund()) {
392
  $this->showException('Refund action is not available.');
393
  }
394
 
395
  if ($payment->getRefundTransactionId() && $amount > 0) {
396
- $request = new Varien_Object();
397
- $storeId = $payment->getOrder()->getStoreId();
398
- $customerId = $payment->getOrder()->getCustomerId();
399
- $refundAmount = $this->_helper->getFormatedAmount($amount);
400
- $getTid = $this->_helper->makeValidNumber($payment->getRefundTransactionId());
401
- $this->assignOrderBasicParams($request, $payment, $storeId);
402
- if (in_array($this->_code, array(Novalnet_Payment_Model_Config::NN_ELVAT, Novalnet_Payment_Model_Config::NN_ELVDE))) {
403
- $getTid = $this->_helper->makeValidNumber($payment->getLastTransId());
404
- }
405
- $request->setTid($getTid)
406
- ->setRefundRequest(true)
407
- ->setRefundParam($refundAmount);
408
 
409
- if (!in_array(NULL, $request->toArray())) {
410
-
411
- $buildNovalnetParam = http_build_query($request->getData());
412
- $response = $this->_dataHelper->setRawCallRequest($buildNovalnetParam, Novalnet_Payment_Model_Config::PAYPORT_URL);
413
- $this->logNovalnetTransactionData($request, $response, $payment->getLastTransId(), $customerId, $storeId);
414
- if ($response->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
415
- $getTransactionStatus = $this->doNovalnetStatusCall($getTid, $storeId, Novalnet_Payment_Model_Config::TRANS_STATUS, NULL, NULL, $request);
416
- $loadTransaction = $this->_helper->loadTransactionStatus($getTid);
417
- $loadTransaction->setTransactionStatus($getTransactionStatus->getStatus())
418
- ->setAmount($this->_helper->getFormatedAmount($getTransactionStatus->getAmount(), 'RAW'))
419
- ->save();
420
-
421
- $txnid = $response->getTid();
422
- $refund_tid = !empty($txnid) ? $txnid : $payment->getLastTransId() . '-refund';
423
- if (in_array($this->_code, array(Novalnet_Payment_Model_Config::NN_INVOICE, Novalnet_Payment_Model_Config::NN_PREPAYMENT))) {
424
- $amountAfterRefund = ($this->_getAmount() - $payment->getOrder()->getBaseTotalRefunded());
425
- $loadTransaction->setAmount($amountAfterRefund)
426
- ->save();
427
- }
428
- $payment->setTransactionId($refund_tid)
429
- ->setLastTransId($refund_tid)
430
  ->save();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
431
 
432
- if ($txnid) { // Only log the novalnet transaction which contains TID
433
- $getTransactionStatus = $this->doNovalnetStatusCall($txnid, $storeId, Novalnet_Payment_Model_Config::TRANS_STATUS, NULL, NULL, $request);
434
- $response->setStatus($getTransactionStatus->getStatus());
435
- $amountAfterRefund = $this->_helper->getFormatedAmount($getTransactionStatus->getAmount(), 'RAW');
436
- $this->logNovalnetStatusData($response, $refund_tid, $customerId, $storeId, $amountAfterRefund);
 
 
437
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
438
  } else {
439
- $this->showException($response->getStatusDesc(), false);
440
- }
 
 
 
 
 
 
 
 
 
 
 
 
441
  } else {
442
- $this->showException('Error in you refund request');
443
  }
444
  } else {
445
  $this->showException('Error in you refund request');
@@ -448,67 +527,129 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
448
  }
449
 
450
  /**
451
- * Void payment
452
  *
453
- * @param Varien_Object $invoicePayment
454
- * @return Mage_Payment_Model_Abstract
455
  */
456
- public function void(Varien_Object $payment) {
457
- if (!$this->canVoid($payment)) {
458
- $this->showException('Void action is not available.');
 
 
 
 
 
 
 
 
 
 
 
 
459
  }
 
 
460
 
 
 
 
 
 
 
 
 
 
461
  $request = new Varien_Object();
462
- $storeId = $payment->getOrder()->getStoreId();
 
463
  $customerId = $payment->getOrder()->getCustomerId();
464
- $getTid = $this->_helper->makeValidNumber($payment->getLastTransId());
465
- $this->assignOrderBasicParams($request, $payment, $storeId);
466
- $request->setTid($getTid)
467
- ->setStatus(Novalnet_Payment_Model_Config::PAYMENT_VOID_STATUS)
468
- ->setEditStatus(true);
469
-
 
 
 
 
 
 
 
 
 
 
 
 
 
470
  if (!in_array(NULL, $request->toArray())) {
471
-
472
  $buildNovalnetParam = http_build_query($request->getData());
473
- $response = $this->_dataHelper->setRawCallRequest($buildNovalnetParam, Novalnet_Payment_Model_Config::PAYPORT_URL);
 
474
  $this->logNovalnetTransactionData($request, $response, $payment->getLastTransId(), $customerId, $storeId);
475
- if ($response->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
 
 
 
 
476
 
477
- $txnid = $response->getTid();
478
- $void_tid = !empty($txnid) ? $txnid : $payment->getLastTransId() . '-void';
 
 
 
 
 
 
 
 
 
479
 
480
- if (in_array($this->_code, array(Novalnet_Payment_Model_Config::NN_INVOICE, Novalnet_Payment_Model_Config::NN_PREPAYMENT))) {
481
- $bank_void_tid = !empty($txnid) ? $txnid : $payment->getLastTransId();
482
- $data = unserialize($payment->getAdditionalData());
483
- //$data['NnNoteAmount'] = $this->_dataHelper->getBankDetailsAmount($amountAfterRefund);
484
- $data['NnNoteTID'] = $this->_dataHelper->getBankDetailsTID($bank_void_tid);
485
- $payment->setAdditionalData(serialize($data));
486
- }
487
 
488
- $payment->setTransactionId($void_tid)
489
- ->setLastTransId($void_tid)
490
- ->save();
491
- $getTransactionStatus = $this->doNovalnetStatusCall($getTid, $storeId, Novalnet_Payment_Model_Config::TRANS_STATUS, NULL, NULL, $request);
492
- $loadTransaction = $this->_helper->loadTransactionStatus($getTid);
493
- $loadTransaction->setTransactionStatus($getTransactionStatus->getStatus())
494
- ->setAmount($getTransactionStatus->getAmount()) // void amount is zero so set without formating
495
- ->save();
496
- } else {
497
- $this->showException('Error in you void request');
 
 
 
 
 
 
 
 
 
 
 
 
498
  }
 
 
 
 
499
  } else {
500
  $this->showException('Error in you void request');
501
  }
502
  return $this;
503
  }
 
504
  /**
505
  * Get Method Session
506
  *
507
  * @return Checkout session
508
  */
509
- private function _getMethodSession($paymentCode = NULL) {
 
510
  $paymentCode = (!empty($paymentCode)) ? $paymentCode : $this->getCode();
511
- $checkoutSession = $this->_helper->_getCheckoutSession();
512
  if (!$checkoutSession->hasData($paymentCode)) {
513
  $checkoutSession->setData($paymentCode, new Varien_Object());
514
  }
@@ -518,11 +659,16 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
518
  /**
519
  * Unset method session
520
  *
521
- * @return method session
522
  */
523
- private function _unsetMethodSession($paymentCode = NULL) {
 
524
  $paymentCode = (!empty($paymentCode)) ? $paymentCode : $this->getCode();
525
- $this->_helper->_getCheckoutSession()->unsetData($paymentCode);
 
 
 
 
526
  return $this;
527
  }
528
 
@@ -531,18 +677,19 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
531
  *
532
  * @return mixed
533
  */
534
- public function _getConfigData($field, $globalMode = false, $store_id = NULL) {
535
- $storeId = is_null($store_id) ? $this->_helper->getMagentoStoreId() : $store_id;
536
- $path = $this->_helper->getNovalnetGlobalPath() . $field;
 
537
  if ($field == 'live_mode') {
538
- $getTestmodePaymentMethod = Mage::getStoreConfig($path, $storeId);
539
- if (!preg_match('/' . $this->_code . '/i', $getTestmodePaymentMethod)) {
540
  return false;
541
  }
542
  return true;
543
  } elseif (!is_null($field)) {
544
  return ($globalMode == false) ? trim($this->getConfigData($field, $storeId))
545
- : trim(Mage::getStoreConfig($path, $storeId));
546
  }
547
  return null;
548
  }
@@ -553,27 +700,29 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
553
  * @param array $response
554
  * @return mixed
555
  */
556
- public function doNovalnetPostbackCall($response) {
 
557
  //Required Parameters to be passed to the Server
558
  $request = $result = array();
559
-
560
- $this->_manualCheckValidate();
561
- $paymentKey = $this->_helper->getPaymentId($this->_code);
562
- if ($this->_validateBasicParams() && $this->_helper->checkIsNumeric($paymentKey)) {
563
- $request['vendor'] = $this->_vendorId;
564
- $request['auth_code'] = $this->_authcode;
565
- $request['product'] = $this->_productId;
566
- $request['tariff'] = $this->_tariffId;
567
- $request['key'] = $paymentKey;
568
- $request['tid'] = $response->getTid();
569
- $request['status'] = Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED;
570
- $request['order_no'] = $this->_getOrderId();
571
-
 
572
  if ($request['key'] == 27) {
573
  $request['invoice_ref'] = 'BNR-' . $request['product'] . '-' . $request['order_no'];
574
  }
575
  $result = new Varien_Object();
576
- $response = $this->_setNovalnetRequestCall($request, Novalnet_Payment_Model_Config::PAYPORT_URL);
577
  $result = $response->getRawBody();
578
  }
579
  return $result;
@@ -582,14 +731,15 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
582
  /**
583
  * Check the transaction status using API
584
  *
585
- * @param array $request_data
586
- * @param string $request_url
587
  * @param string $type
588
  *
589
  * @return mixed
590
  */
591
- public function _setNovalnetRequestCall($request_data, $request_url, $type = "") {
592
- if ($request_url == "") {
 
593
  $this->showException('Server Request URL is Empty');
594
  return;
595
  }
@@ -597,17 +747,17 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
597
  if (((int) $this->_getConfigData('gateway_timeout')) > 0) {
598
  $httpClientConfig['timeout'] = (int) $this->_getConfigData('gateway_timeout');
599
  }
600
- $client = new Varien_Http_Client($request_url, $httpClientConfig);
601
 
602
  if ($type == 'XML') {
603
- $client->setUri($request_url);
604
- $client->setRawData($request_data)->setMethod(Varien_Http_Client::POST);
605
  } else {
606
- $client->setParameterPost($request_data)->setMethod(Varien_Http_Client::POST);
607
  }
608
  $response = $client->request();
609
  if (!$response->isSuccessful()) {
610
- $this->showException($this->_helper->__('Gateway request error: %s', $response->getMessage()), false);
611
  }
612
  if ($type == 'XML') {
613
  $result = new Varien_Simplexml_Element($response->getRawBody());
@@ -624,33 +774,19 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
624
  *
625
  * @return object
626
  */
627
- private function _setNovalnetParam(Varien_Object $request, $paymentCode) {
628
- $infoInstance = $this->getInfoInstance();
629
- $helper = $this->_helper;
630
- $dataHelper = $this->_dataHelper;
631
- $getPaymentData = $this->_getNnPaymentData();
632
  if ($paymentCode) {
 
633
  switch ($paymentCode) {
634
- case Novalnet_Payment_Model_Config::NN_ELVDE:
635
- $request->setBankAccountHolder($getPaymentData->getNnAccountHolder())
636
- ->setBankAccount($getPaymentData->getNnAccountNumber())
637
- ->setBankCode($getPaymentData->getNnBankSortingCode())
638
- ->setAcdc( ($this->_getConfigData('acdc_check') ? $this->_getConfigData('acdc_check') : 0) );
639
- $infoInstance->setNnAccountNumber($helper->doMaskPaymentData($getPaymentData->getNnAccountNumber()))
640
- ->setNnBankSortingCode($helper->doMaskPaymentData($getPaymentData->getNnBankSortingCode()));
641
- break;
642
- case Novalnet_Payment_Model_Config::NN_ELVAT:
643
- $request->setBankAccountHolder($getPaymentData->getNnAccountHolder())
644
- ->setBankAccount($getPaymentData->getNnAccountNumber())
645
- ->setBankCode($getPaymentData->getNnBankSortingCode());
646
- $infoInstance->setNnAccountNumber($helper->doMaskPaymentData($getPaymentData->getNnAccountNumber()))
647
- ->setNnBankSortingCode($helper->doMaskPaymentData($getPaymentData->getNnBankSortingCode()));
648
- break;
649
  case Novalnet_Payment_Model_Config::NN_INVOICE:
650
  $paymentDuration = trim($this->_getConfigData('payment_duration'));
651
  $dueDate = $helper->setDueDate($paymentDuration);
652
- if ($dueDate)
653
  $request->setDueDate($dueDate);
 
654
  $request->setInvoiceType(Novalnet_Payment_Model_Config::INVOICE_PAYMENT_METHOD)
655
  ->setInvoiceRef('BNR-' . $request->getProduct() . '-' . $this->_getOrderId());
656
  break;
@@ -661,7 +797,6 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
661
  case Novalnet_Payment_Model_Config::NN_SOFORT:
662
  case Novalnet_Payment_Model_Config::NN_PAYPAL:
663
  case Novalnet_Payment_Model_Config::NN_IDEAL:
664
- case Novalnet_Payment_Model_Config::NN_SAFETYPAY:
665
  $this->_password = $this->_getConfigData('password', true);
666
  $request->setUniqid(uniqid())
667
  ->setCountryCode($request->getCountry())
@@ -673,58 +808,45 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
673
  ->setApiPw($helper->getEncodedParam($this->_getConfigData('api_password', true), $this->_password));
674
  }
675
 
676
- $this->_dataHelper->assignNovalnetReturnData($request, $this->_code);
677
- $this->_dataHelper->importNovalnetEncodeData($request, $this->_password);
678
  break;
679
  case Novalnet_Payment_Model_Config::NN_CC:
680
- $request->setCcHolder($dataHelper->novalnetCardDetails('novalnet_cc_owner'))
681
  ->setCcNo()
682
- ->setCcExpMonth($dataHelper->novalnetCardDetails('novalnet_cc_exp_month'))
683
- ->setCcExpYear($dataHelper->novalnetCardDetails('novalnet_cc_exp_year'))
684
- ->setCcCvc2($dataHelper->novalnetCardDetails('novalnet_cc_cid'))
685
- ->setCcType($dataHelper->novalnetCardDetails('novalnet_cc_type'))
686
- ->setPanHash($dataHelper->novalnetCardDetails('novalnet_cc_pan_hash'))
687
- ->setUniqueId($dataHelper->novalnetCardDetails('novalnet_cc_unique_id'));
 
 
 
 
 
 
 
 
 
 
688
  break;
689
  case Novalnet_Payment_Model_Config::NN_SEPA:
690
- $request->setBankAccountHolder($dataHelper->novalnetCardDetails('novalnet_sepa_owner'))
691
- ->setBankAccount()
692
- ->setBankCode()
693
- ->setBic()
694
- ->setIban()
695
- ->setSepaHash($dataHelper->novalnetCardDetails('novalnet_sepa_pan_hash'))
696
- ->setSepaUniqueId($dataHelper->novalnetCardDetails('novalnet_sepa_unique_id'))
697
- ->setIbanBicConfirmed($dataHelper->novalnetCardDetails('novalnet_sepa_iban_confirmed'));
698
- if ($this->_getConfigData('sepatypes') == 'DD_SEPA_SIGNED') {
699
- $request->setMandatePresent(0);
700
- $this->_getCheckout()->unsNnMandatePresent();
701
- $mandate_ref = $dataHelper->novalnetCardDetails('novalnet_sepa_mandate_ref');
702
- $mandate_signature_date = $dataHelper->novalnetCardDetails('novalnet_sepa_mandate_date');
703
- if ($mandate_ref && $mandate_signature_date) {
704
- $request->setMandatePresent(1)
705
- ->setMandateRef($mandate_ref)
706
- ->setMandateSignatureDate($mandate_signature_date);
707
- $this->_getCheckout()->setNnMandatePresent(1);
708
- }
709
- } else {
710
- $paymentDuration = trim($this->_getConfigData('sepa_due_date'));
711
- $dueDate = (!$paymentDuration) ? date('Y-m-d', strtotime('+7 days')) : date('Y-m-d', strtotime('+' . $paymentDuration . ' days'));
712
- $request->setSepaDueDate($dueDate);
713
- }
714
 
715
  break;
716
- case Novalnet_Payment_Model_Config::NN_CC3D:
717
- $payment = $infoInstance->getOrder()->getPayment();
718
- $request->setCountryCode($request->getCountry())
719
- ->setSession(session_id())
720
- ->setCcHolder(Mage::helper('core')->decrypt($this->_helper->_getCheckoutSession()->getNnCcOwner()))
721
- ->setCcNo(Mage::helper('core')->decrypt($this->_helper->_getCheckoutSession()->getNnCcNumber()))
722
- ->setCcExpMonth(Mage::helper('core')->decrypt($this->_helper->_getCheckoutSession()->getNnCcExpMonth()))
723
- ->setCcExpYear(Mage::helper('core')->decrypt($this->_helper->_getCheckoutSession()->getNnCcExpYear()))
724
- ->setCcCvc2(Mage::helper('core')->decrypt($this->_helper->_getCheckoutSession()->getNnCcCvc()));
725
- $dataHelper->assignNovalnetReturnData($request, $this->_code);
726
- $request->unsUserVariable_0(); // Unset uservariable as CC3D doesnot requires it
727
- break;
728
  }
729
  }
730
  return $request;
@@ -733,195 +855,191 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
733
  /**
734
  * Validate the novalnet response
735
  *
736
- * @param object $response
737
  * @param object $payment
738
- * @param string $request
739
  *
740
  * @return mixed
741
  */
742
- private function _validateNovalnetResponse($response, $payment, $request = NULL) {
743
- $result = $response;
 
 
 
 
 
744
  switch ($result->getStatus()) {
745
  case Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED:
746
- //set Novalnet Mode
747
- $ResponseTestMode = $result->getTestMode();
748
- $txnId = $result->getTid();
749
- $txnId = trim($txnId);
750
- $shopMode = $this->_getConfigData('live_mode');
751
-
752
- $testMode = (((isset($ResponseTestMode) && $ResponseTestMode == 1) || (isset($shopMode) && $shopMode == 0)) ? 1 : 0 );
753
- $data = array('NnTestOrder' => $testMode,
754
- 'vendor' => $this->_vendorId,
755
- 'auth_code' => $this->_authcode,
756
- 'product' => $this->_productId,
757
- 'tariff' => $this->_tariffId,
758
- 'key' => $this->_helper->getPaymentId($this->_code)
759
- );
760
- if ($this->_getConfigData('sepatypes') == 'DD_SEPA_SIGNED' && !$this->_getCheckout()->getNnMandatePresent()) {
761
- $sepaMandateUrl = $this->sepaMandateUrl($result);
762
- $data['NnSepaSigned'] = 1;
763
- $data['NnSepaMandateUrl'] = $sepaMandateUrl;
764
- $data['NnNcNo'] = $result->getNcNo();
765
- }
766
- if (in_array($this->_code, array(Novalnet_Payment_Model_Config::NN_INVOICE, Novalnet_Payment_Model_Config::NN_PREPAYMENT))) {
767
- $data['NnNote'] = $this->_dataHelper->getNote($response, $this->_getConfigData('payment_duration'));
768
- $data['NnNoteAmount'] = $this->_dataHelper->getBankDetailsAmount($response->getAmount());
769
- $data['NnNoteTID'] = $this->_dataHelper->getBankDetailsTID($txnId);
770
- $data['NnNoteTransfer'] = $this->_dataHelper->getBankDetailsTransfer($response);
771
- }
772
-
773
- /** @@ Update the transaction status and transaction overview **/
774
- $getTransactionStatus = $this->doNovalnetStatusCall($txnId);
775
- $result->setStatus($getTransactionStatus->getStatus());
776
- $this->logNovalnetStatusData($result, $txnId);
777
  $payment->setStatus(self::STATUS_APPROVED)
778
- ->setIsTransactionClosed(false) // set transaction opend to make payment void
779
  ->setAdditionalData(serialize($data))
780
  ->save();
781
-
782
- $magentoVersion = $this->_getHelper()->getMagentoVersion();
783
- $captureMode = (version_compare($magentoVersion, '1.6', '<')) ? false : true;
 
 
 
 
 
 
 
 
784
 
785
  // Capture the payment only if status is 100
786
- if (($getTransactionStatus->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED &&
787
- !in_array($this->_code, array(Novalnet_Payment_Model_Config::NN_INVOICE, Novalnet_Payment_Model_Config::NN_PREPAYMENT))) || ($getTransactionStatus->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED && ($this->_code == Novalnet_Payment_Model_Config::NN_SEPA && $this->_getCheckout()->getNnMandatePresent()))) {
788
- $payment->setTransactionId("$txnId-capture") // Add capture text to make the new transaction
789
- ->setParentTransactionId($txnId)
790
- ->setIsTransactionClosed($captureMode) // Close the transaction
791
- ->capture(null)
792
- ->setIsTransactionClosed(true)
793
- ->save();
794
- } elseif ((in_array($this->_code, array(Novalnet_Payment_Model_Config::NN_INVOICE, Novalnet_Payment_Model_Config::NN_PREPAYMENT)) && $getTransactionStatus->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) || (($this->_code == Novalnet_Payment_Model_Config::NN_SEPA && !$this->_getCheckout()->getNnMandatePresent()) && $getTransactionStatus->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED)) {
795
- $payment->setIsTransactionClosed(true);
796
- }
797
- $this->unsetFormMethodSession();
798
  $payment->setTransactionId($txnId)
799
  ->setLastTransId($txnId)
800
  ->setParentTransactionId(null)
801
  ->save();
 
 
802
 
803
  $this->doNovalnetPostbackCall($result); //Second Call
804
- if(!$this->isCallbackTypeCall()) {
805
- $this->logNovalnetTransactionData($request, $result, $txnId, $this->_helper->getCustomerId(), $this->_helper->getMagentoStoreId());
806
- }
807
- $statusText = ($result->getStatusText()) ? $result->getStatusText() : $this->_helper->__('successful');
 
808
  Mage::getSingleton('core/session')->addSuccess($statusText);
809
- return $this;
 
810
  default:
811
- $error = ($result->getStatusDesc()) ? $this->_helper->htmlEscape($result->getStatusDesc()) : $this->_helper->__('Error in capturing the payment');
812
- if(!$this->isCallbackTypeCall()) {
813
- $this->logNovalnetTransactionData($request, $result, $result->getTid(), $this->_helper->getCustomerId(), $this->_helper->getMagentoStoreId());
814
- }
 
815
  if ($error !== false) {
816
- $this->showException($error, false);
 
817
  }
818
- break;
819
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
820
  }
821
 
822
- /**
823
- * Unset Form method session
824
  *
 
825
  */
826
- public function unsetFormMethodSession() {
827
- $this->_getCheckout()->unsNnCcNumber()
828
- ->unsNnCcType()
829
- ->unsNnCcCvc()
830
- ->unsNnCcOwner()
831
- ->unsNnCcExpMonth()
832
- ->unsNnCcExpYear()
833
- ->unsNnPaymentCode();
834
- $this->_getCheckout()->unsNnMandatePresent()
835
- ->unsSepaFieldValidator()
836
- ->unsSepaMandateRef()
837
- ->unsSepaMandateDate()
838
- ->unsSepaHash()
839
- ->unsCcPanHash()
840
- ->unsCcFieldValidator();
841
- $this->_getCheckout()->unsElvDeAccountHolder()
842
- ->unsElvDeAccountNumber()
843
- ->unsElvDeBankSortingCode()
844
- ->unsElvAtAccountHolder()
845
- ->unsElvAtAccountNumber()
846
- ->unsElvAtBankSortingCode();
847
- $this->_getCheckout()->unsNnCallbackTelNovalnetElvgerman()
848
- ->unsNnCallbackEmailNovalnetElvgerman()
849
- ->unsNnCallbackTelNovalnetElvaustria()
850
- ->unsNnCallbackEmailNovalnetElvaustria()
851
- ->unsNnCallbackTelNovalnetCc()
852
- ->unsNnCallbackEmailNovalnetCc();
853
- }
854
-
855
- public function sepaMandateUrl($response) {
856
- $mandate_refer = $response->getMandateRef();
857
- $mandate_url = $response->getMandateUrl();
858
- $tid = trim($response->getTid());
859
- $mandate_ref = (isset($mandate_refer) && trim($mandate_refer) !='') ? ('&mandate_ref=' . $mandate_refer) : ('&mandate_ref=NN' . $this->_vendorId. '-' . $tid);
860
- $param = '?vendor_id='. $this->_vendorId . '&tid=' . $tid . $mandate_ref;
861
- if ($mandate_url && trim($mandate_url) !='' ) {
862
- if (strpos($mandate_url, "?") !== false) {
863
- $url = explode('?', $mandate_url);
864
- $comment = $url[0].$param;
865
- }
866
- }
867
- else {
868
- $url = 'https://payport.novalnet.de/sepa/mandate_pdf_generate.jsp';
869
- $comment = $url.$param;
870
- }
871
-
872
- return $comment;
873
- }
874
  /**
875
  * Make telephone payment first call and display the messages
876
  *
877
- * @return
878
  */
879
- public function doNovalnetPhoneFirstCall() {
880
- $methodSession = $this->_getMethodSession();
881
- $helper = $this->_helper;
882
- $phoneTid = $methodSession->getNnPhoneTid();
883
- if ($this->_isPlaceOrder() && ($this->_code == Novalnet_Payment_Model_Config::NN_TELEPHONE)) {
 
884
  if (!$this->checkAmountAllowed()) {
885
  return false;
886
  }
887
- if ($phoneTid) {
888
- $this->_validateSession();
889
- }
890
- $methodSession = $this->_getMethodSession(); // Reaasign method session after values unset
891
- if (!$phoneTid) {
892
- //invoke first call
893
- $storeId = $helper->getMagentoStoreId();
894
- $request = $this->buildRequest(Novalnet_Payment_Model_Config::POST_NORMAL, $storeId);
895
- $result = $this->_postRequest($request);
896
- $methodSession->setOrderAmount($request->getAmount())
897
- ->setNnTelOrderNo($request->getOrderNo());
898
-
899
- if (!$result) {
900
- $this->showException('Params (aryResponse) missing');
901
- }
902
-
903
- if ($result->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
904
- // Passing the Error Response from Novalnet's paygate to payment error
905
- $this->logNovalnetTransactionData($request, $result, $result->getTid(), $helper->getCustomerId(), $helper->getMagentoStoreId());
906
- $methodSession->setNnPhoneTid($result->getTid());
907
- $methodSession->setNnPhoneNo($result->getNovaltelNumber());
908
- $methodSession->setNnPhoneStatusText($result->getStatusDesc());
909
- $this->_getCheckout()->setNnTelTestOrder($result->getTestMode());
910
- $text = $helper->__('Following steps are required to complete your payment') . ':' . "\n\n";
911
- $text .= $helper->__('Step') . ' 1: ';
912
- $text .= $helper->__('Please call the telephone number displayed') . ': ' . preg_replace('/(\d{4})(\d{4})(\d{4})(\d{4})/', "$1 $2 $3 $4", $methodSession->getNnPhoneNo()) . ".\n";
913
- $text .= '* ' . $helper->__('This call will cost') . ' ' . str_replace('.', ',', $result->getAmount()) . " " . Mage::app()->getLocale()->currency($result->getCurrency())->getSymbol() . ' (' . $helper->__('inclusive tax') . ') ';
914
- $text .= $helper->__('and it is possible only for German landline connection') . '!*' . "\n\n";
915
- $text .= $helper->__('Step') . ' 2: ';
916
- $text .= $helper->__('Please wait for the beep and then hang up the listeners') . '.' . "\n";
917
- $text .= $helper->__('After your successful call, please proceed with the payment') . '.' . "\n";
918
-
919
- $this->text = $text;
920
- $this->showException($text, false); #show note for client to call...
921
- }else{
922
- $this->showException($result->getStatusDesc(), false);
923
- }
924
- }
925
  }
926
  }
927
 
@@ -933,35 +1051,41 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
933
  *
934
  * @return mixed
935
  */
936
- private function _validateSecondCallResponse($result, $payment) {
 
937
  $status = $result->getStatus();
938
  switch ($status) {
939
  case Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED:
940
  $serverResponse = $this->_getCheckout()->getNnTelTestOrder();
941
  $shopMode = $this->_getConfigData('live_mode');
942
- $testMode = (((isset($serverResponse) && $serverResponse == 1) || (isset($shopMode) && $shopMode == 0)) ? 1 : 0 );
 
943
  $data = array('NnTestOrder' => $testMode);
944
 
945
  $payment->setStatus(self::STATUS_APPROVED)
946
- ->setTransactionId($result->getTid())
947
  ->setLastTransId($result->getTid())
948
  ->setAdditionalData(serialize($data))
949
  ->save();
950
  $this->doNovalnetPostbackCall($result);
951
  $getTransactionStatus = $this->doNovalnetStatusCall($result->getTid());
952
  $result->setStatus($getTransactionStatus->getStatus()); // Combine Transaction status in result object
953
- $this->logNovalnetStatusData($result, $result->getTid());
954
- $statusText = ($result->getStatusText()) ? $result->getStatusText() : $this->_helper->__('successful');
 
955
  Mage::getSingleton('core/session')->addSuccess($statusText);
956
- $this->_unsetMethodSession();
957
- return $this;
958
  break;
959
  default:
960
- $error = ($result->getStatusDesc()) ? $this->_helper->htmlEscape($result->getStatusDesc()) : $this->_helper->__('Error in capturing the payment');
 
961
  if ($error !== false) {
962
- $this->showException($error, false);
 
963
  }
 
964
  }
 
965
  }
966
 
967
  /**
@@ -974,27 +1098,35 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
974
  *
975
  * @return mixed
976
  */
977
- public function doNovalnetStatusCall($tid, $storeId = NULL, $reqType = Novalnet_Payment_Model_Config::TRANS_STATUS, $extraOption = NULL, $requestData=NULL, $params = NULL) {
978
- $requestType = ($reqType == Novalnet_Payment_Model_Config::TRANS_STATUS) ? Novalnet_Payment_Model_Config::TRANS_STATUS : $reqType;
979
- $this->_manualCheckValidate($storeId);
980
-
981
- $VendorId = (isset($params) && $params->getVendor()) ? $params->getVendor() : $this->_vendorId;
982
- $AuthCode = (isset($params) && $params->getAuthCode()) ? $params->getAuthCode() : $this->_authcode;
983
- $ProductId = (isset($params) && $params->getProduct()) ? $params->getProduct() : $this->_productId;
 
 
 
 
984
 
985
  $request = '<?xml version="1.0" encoding="UTF-8"?>';
986
  $request .= '<nnxml><info_request>';
987
- $request .= '<vendor_id>' . $VendorId . '</vendor_id>';
988
- $request .= '<vendor_authcode>' . $AuthCode . '</vendor_authcode>';
989
  $request .= '<request_type>' . $requestType . '</request_type>';
990
- $request .= '<product_id>' . $ProductId . '</product_id>';
991
  $request .= '<tid>' . $tid . '</tid>' . $extraOption;
992
  $request .= '</info_request></nnxml>';
993
 
994
- if ($this->_validateBasicParams()) {
995
- $result = $this->_setNovalnetRequestCall($request, Novalnet_Payment_Model_Config::INFO_REQUEST_URL, 'XML');
996
- if($requestType == 'NOVALTEL_STATUS') { $requestData->setData($request); }
997
- return $result;
 
 
 
 
998
  }
999
  }
1000
 
@@ -1003,12 +1135,13 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1003
  *
1004
  * @return void
1005
  */
1006
- private function _validateSession() {
 
1007
  $methodSession = $this->_getMethodSession();
1008
  if ($methodSession->hasNnPhoneTid()) {
1009
- if ($methodSession->getOrderAmount() != $this->_helper->getFormatedAmount($this->_getAmount())) {
1010
- $this->_unsetMethodSession();
1011
- $this->showException('You have changed the order amount after receiving telephone number');
1012
  }
1013
  }
1014
  }
@@ -1018,11 +1151,12 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1018
  *
1019
  * @return Mage_Sales_Model_Order
1020
  */
1021
- protected function _getCheckout() {
1022
- if (Mage::app()->getStore()->isAdmin()) {
1023
- return $this->_helper->_getAdminCheckoutSession();
 
1024
  } else {
1025
- return $this->_helper->_getCheckoutSession();
1026
  }
1027
  }
1028
 
@@ -1032,12 +1166,14 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1032
  *
1033
  * @return bool
1034
  */
1035
- public function checkAmountAllowed() {
1036
- $amount = $this->_helper->getFormatedAmount($this->_getAmount());
1037
- if ($amount >= Novalnet_Payment_Model_Config::PHONE_PAYMENT_AMOUNT_MIN and $amount <= Novalnet_Payment_Model_Config::PHONE_PAYMENT_AMOUNT_MAX) {
 
 
1038
  return true;
1039
  }
1040
- $this->showException($this->_helper->__('Amounts below 0,99 Euros and above 10,00 Euros cannot be processed and are not accepted') . '!', false);
1041
  return false;
1042
  }
1043
 
@@ -1046,54 +1182,57 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1046
  *
1047
  * @return Varien_Object
1048
  */
1049
- public function getNovalnetIframe() {
1050
-
1051
- $amount = ($this->_helper->checkIsAdmin()) ? $this->_helper->_getAdminCheckoutSession()->getQuote()->getBaseGrandTotal() : $this->_helper->_getCheckoutSession()->getQuote()->getBaseGrandTotal();
1052
- $storeId = $this->_helper->getMagentoStoreId();
1053
- $this->_manualCheckValidate($storeId, $amount);
1054
- $url = Novalnet_Payment_Model_Config::CC_URL;
1055
- $billing = $this->_getCheckout()->getQuote()->getBillingAddress();
1056
- $sepaError = $this->_getConfigData('sepa_error');
1057
- $ccError = $this->_getConfigData('cc_error');
1058
-
1059
  //Required Parameters to be passed to the Server
1060
  $request = array();
1061
 
1062
- if ($this->_code == Novalnet_Payment_Model_Config::NN_SEPA) {
1063
- $request['lang'] = strtoupper(substr(Mage::app()->getLocale()->getLocaleCode(), 0, 2));
1064
- $request['vendor_id'] = $this->_vendorId;
1065
- $request['product_id'] = $this->_productId;
1066
- $request['payment_id'] = $this->_helper->getPaymentId($this->_code);
1067
- $request['country'] = $billing->getCountryId();
1068
- $request['authcode'] = $this->_authcode;
1069
-
1070
- $request['panhash'] = $sepaError ? $this->_getCheckout()->getSepaHash() : '';
1071
- $request['fldVdr'] = $this->_getCheckout()->getSepaFieldValidator();
1072
- $request['mandate_ref'] = $this->_getCheckout()->getSepaMandateRef();
1073
- $request['mandate_date'] = $this->_getCheckout()->getSepaMandateDate();
1074
- $request['name'] = utf8_decode($billing->getFirstname()).' '.utf8_decode($billing->getLastname());
1075
- $request['comp'] = utf8_decode($billing->getCompany());
1076
- $request['address'] = utf8_decode(implode(',', $billing->getStreet()));
1077
- $request['zip'] = $billing->getPostcode();
1078
- $request['city'] = utf8_decode($billing->getCity());
1079
- $request['email'] = $this->_getCheckout()->getQuote()->getCustomerEmail();
1080
-
1081
- $url = Novalnet_Payment_Model_Config::SEPA_URL;
1082
- } else {
1083
- $request['nn_lang_nn'] = strtoupper(substr(Mage::app()->getLocale()->getLocaleCode(), 0, 2));
1084
- $request['nn_vendor_id_nn'] = $this->_vendorId;
1085
- $request['nn_authcode_nn'] = $this->_authcode;
1086
- $request['nn_product_id_nn'] = $this->_productId;
1087
- $request['nn_payment_id_nn'] = $this->_helper->getPaymentId($this->_code);
1088
- $request['nn_hash'] = $ccError ? $this->_getCheckout()->getCcPanHash() : '';
1089
- $request['fldVdr'] = $this->_getCheckout()->getCcFieldValidator();
1090
- }
1091
-
 
 
 
 
 
1092
  if ($this->_vendorId && $this->_productId) {
1093
- $result = $this->_setNovalnetRequestCall($request, $url);
1094
- $result = $result->getRawBody();
1095
  } else {
1096
- $result = $this->_helper->__('Basic parameter not valid');
1097
  }
1098
  return $result;
1099
  }
@@ -1103,43 +1242,48 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1103
  *
1104
  * @return bool
1105
  */
1106
- public function validateNovalnetParams() {
1107
- $billing = $this->_getInfoObject()->getBillingAddress();
1108
- $helper = $this->_helper;
1109
- $sepaDueDate = $this->_getConfigData('sepa_due_date');
1110
-
 
 
 
 
 
 
1111
  if (!$this->_validateBasicParams()) {
1112
- $this->showException($this->_helper->__('Basic parameter not valid') . '!', false);
1113
  return false;
1114
- } elseif ($this->_referrerId && !$helper->checkIsNumeric($this->_referrerId)) {
1115
- $this->showException($this->_helper->__('Referrer ID is not valid') . '!', false);
1116
- return false;
1117
- } elseif ($this->_code == Novalnet_Payment_Model_Config::NN_SEPA && $this->_getConfigData('sepatypes') == 'DD_SEPA' && $sepaDueDate && ($sepaDueDate < 7 || !$helper->checkIsNumeric($sepaDueDate))) {
1118
- $this->showException($this->_helper->__('SEPA Due date is not valid') . '!', false);
1119
- return false;
1120
- } elseif ((int)$this->_getConfigData('manual_checking_amount') && (!$this->_helper->checkIsNumeric($this->_getConfigData('manual_checking_amount')) || !$this->_helper->checkIsNumeric($this->_getConfigData('second_product_id')) || !$this->_helper->checkIsNumeric($this->_getConfigData('second_tariff_id')))) {
1121
- $this->showException($this->_helper->__('Manual limit amount / Product-ID2 / Tariff-ID2 is not valid') . '!', false);
1122
  return false;
1123
- } elseif (!$this->_helper->validateEmail($this->_getInfoObject()->getCustomerEmail()) || !$billing->getFirstname() || !$billing->getLastname()) {
1124
- $this->showException($this->_helper->__('Customer name/email fields are not valid') . '!', false);
1125
  return false;
1126
  }
1127
  return true;
1128
  }
1129
 
1130
  /**
1131
- * validate manual checklimit and reassign product id and tariff id
1132
  *
1133
  * @param integer $storeId
1134
  * @param float $amount
1135
  */
1136
-
1137
- private function _manualCheckValidate($storeId = NULL, $amount=NULL) {
1138
- $amount = $this->_helper->getFormatedAmount(($amount) ? $amount : $this->_getAmount());
1139
- $storeId = is_null($storeId) ? $this->_helper->getMagentoStoreId() : $storeId;
1140
  $manualCheckAmt = (int) $this->_getConfigData('manual_checking_amount', false, $storeId);
1141
- $this->_productId = (strlen(trim($this->_getConfigData('second_product_id', false, $storeId))) && $manualCheckAmt && $manualCheckAmt <= $amount) ? trim($this->_getConfigData('second_product_id', false, $storeId)) : trim($this->_getConfigData('product_id', true, $storeId));
1142
- $this->_tariffId = (strlen(trim($this->_getConfigData('second_tariff_id', false, $storeId))) && $manualCheckAmt && $manualCheckAmt <= $amount) ? trim($this->_getConfigData('second_tariff_id', false, $storeId)) : trim($this->_getConfigData('tariff_id', true, $storeId));
 
 
 
 
1143
  }
1144
 
1145
  /**
@@ -1147,9 +1291,11 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1147
  *
1148
  * @return bool
1149
  */
1150
- private function _validateBasicParams() {
1151
- $helper = $this->_helper;
1152
- if ($helper->checkIsNumeric($this->_vendorId) && $this->_authcode && $helper->checkIsNumeric($this->_productId) && $helper->checkIsNumeric($this->_tariffId)) {
 
 
1153
  return true;
1154
  }
1155
  return false;
@@ -1159,16 +1305,15 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1159
  * Check whether callback option is enabled
1160
  *
1161
  */
1162
- public function isCallbackTypeCall() {
 
1163
  $callbackTid = "hasNnCallbackTid" . ucfirst($this->_code);
1164
- $total = $this->_helper->getFormatedAmount($this->_getAmount());
1165
  $callBackMinimum = (int) $this->_getConfigData('callback_minimum_amount');
1166
  $countryCode = strtoupper($this->_getInfoObject()->getBillingAddress()->getCountryId());
1167
 
1168
- return $this->_helper->_getCheckoutSession()->$callbackTid()
1169
- || ($this->_getConfigData('callback')
1170
- && ($callBackMinimum ? $total >= $callBackMinimum : true)
1171
- && ($this->_helper->isCallbackTypeAllowed($countryCode)));
1172
  }
1173
 
1174
  /**
@@ -1176,71 +1321,78 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1176
  *
1177
  * @return bool
1178
  */
1179
- private function _initiateCallbackProcess($paymentCode) {
1180
- $infoInstance = $this->getInfoInstance();
1181
- $isCallbackTypeCall = $this->isCallbackTypeCall();
1182
- $isPlaceOrder = $this->_isPlaceOrder();
1183
- $callbackPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('fraudCheckPayment');
1184
- if (in_array($paymentCode, $callbackPayment)) {
1185
- $payCode = ucfirst($paymentCode);
1186
- $callbackTid = "getNnCallbackTid" . $payCode;
1187
- $callbackOrderNo = "getNnCallbackOrderNo" . $payCode;
1188
- $callbackPin = "getNnCallbackPin" . $payCode;
1189
- $callbackNewPin = "getNnNewCallbackPin" . $payCode;
1190
- $setcallbackPin = "setNnCallbackPin" . $payCode;
1191
-
1192
- if (!$isPlaceOrder && $isCallbackTypeCall && $this->_getIncrementId() != $this->_getMethodSession()->$callbackOrderNo()) {
1193
- $this->_unsetMethodSession();
1194
- }
1195
- //validate callback session
1196
- $this->_validateCallbackSession();
1197
- $methodSession = $this->_getMethodSession();
1198
- if ($isCallbackTypeCall && $infoInstance->getCallbackPinValidationFlag() && $methodSession->$callbackTid()) {
1199
- $nnCallbackPin = $infoInstance->$callbackPin();
1200
- if (!$infoInstance->$callbackNewPin() && (!$this->_helper->checkIsValid($nnCallbackPin) || empty($nnCallbackPin))) {
1201
- $this->showException('PIN you have entered is incorrect or empty');
1202
- }
 
 
1203
  }
1204
- if ($isCallbackTypeCall && !$isPlaceOrder && $this->_getConfigData('callback') != 3) {
1205
- if ($methodSession->$callbackTid()) {
1206
- if ($infoInstance->$callbackNewPin()) {
1207
- $this->_regenerateCallbackPin();
1208
- } else {
1209
- $methodSession->$setcallbackPin($infoInstance->$callbackPin());
1210
- }
1211
  } else {
1212
- $this->_generateCallback();
1213
- }
1214
- } elseif ($isCallbackTypeCall && !$isPlaceOrder && $this->_getConfigData('callback') == 3) {
1215
-
1216
- if (!$methodSession->$callbackTid()) {
1217
- $this->_generateCallback();
1218
  }
 
 
1219
  }
1220
- if ($isPlaceOrder) {
1221
- $this->_validateCallbackProcess();
 
 
 
1222
  }
1223
  }
1224
- }
 
 
 
1225
 
1226
  /**
1227
  * validate order amount is getting changed after callback initiation
1228
  *
1229
  * throw Mage Exception
1230
  */
1231
- private function _validateCallbackSession() {
 
1232
  $payCode = ucfirst($this->_code);
1233
  $callbackTid = "hasNnCallbackTid" . $payCode;
1234
  $getNnDisableTime = "getNnDisableTime" . $payCode;
1235
  $methodSession = $this->_getMethodSession();
1236
  if ($methodSession->$callbackTid()) {
1237
  if ($methodSession->$getNnDisableTime() && time() > $methodSession->$getNnDisableTime()) {
1238
- $this->_unsetMethodSession();
1239
- } elseif ($methodSession->getOrderAmount() != $this->_helper->getFormatedAmount($this->_getAmount())) {
1240
- $this->_unsetMethodSession();
1241
- if (!$this->_isPlaceOrder() && $this->_getConfigData('callback') != 3) {
 
1242
  $this->showException('You have changed the order amount after getting PIN number, please try again with a new call');
1243
- } else if (!$this->_isPlaceOrder() && $this->_getConfigData('callback') == 3) {
 
1244
  $this->showException('You have changed the order amount after getting e-mail, please try again with a new call');
1245
  }
1246
  }
@@ -1252,32 +1404,34 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1252
  *
1253
  * @return mixed
1254
  */
1255
- private function _getIncrementId() {
1256
- $storeId = $this->_getHelper()->getMagentoStoreId();
1257
- $orders = Mage::getModel('sales/order')->getCollection()
1258
- ->addAttributeToFilter('store_id', $storeId)
1259
- ->setOrder('entity_id','DESC');
1260
- $lastIncrementId = $orders->getFirstItem()->getIncrementId();
1261
- if($lastIncrementId) {
1262
- $IncrementId = ++$lastIncrementId;
1263
- } else {
1264
- $IncrementId = $storeId.Mage::getModel('eav/entity_increment_numeric')->getNextId();
1265
- }
1266
- return $IncrementId;
 
1267
  }
1268
 
1269
  /**
1270
  * Make callback request and validate response
1271
  *
1272
  */
1273
- private function _generateCallback() {
 
1274
  $payCode = ucfirst($this->_code);
1275
  $callbackTid = "setNnCallbackTid" . $payCode;
1276
  $callbackOrderNo = "setNnCallbackOrderNo" . $payCode;
1277
 
1278
  $request = $this->buildRequest(Novalnet_Payment_Model_Config::POST_CALLBACK);
1279
- $response = $this->_postRequest($request);
1280
- $this->logNovalnetTransactionData($request, $response, $response->getTid());
1281
  if ($response->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
1282
  $this->_getMethodSession()
1283
  ->$callbackTid(trim($response->getTid()))
@@ -1286,14 +1440,15 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1286
  ->setOrderAmount($request->getAmount())
1287
  ->setNnCallbackSuccessState(true)
1288
  ->$callbackOrderNo(trim($response->getOrderNo()))
1289
- ->setNnResponseData($response);
 
1290
  if ($this->_getConfigData('callback') == 3) {
1291
- $text = $this->_helper->__('Please reply to the e-mail');
1292
- } elseif ($this->_getConfigData('callback') == 1) {
1293
- $text = $this->_helper->__('You will shortly receive a PIN by phone / SMS. Please enter the PIN in the appropriate text box');
1294
  }
1295
  } else {
1296
- $text = $this->_helper->htmlEscape($response->getStatusDesc());
1297
  }
1298
  $this->showException($text, false);
1299
  }
@@ -1302,14 +1457,15 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1302
  * Regenerate new pin for callback process
1303
  *
1304
  */
1305
- private function _regenerateCallbackPin() {
 
1306
  $callbackTid = "getNnCallbackTid" . ucfirst($this->_code);
1307
  $methodSession = $this->_getMethodSession();
1308
  $response = $this->doNovalnetStatusCall($methodSession->$callbackTid(), NULL, Novalnet_Payment_Model_Config::TRANSMIT_PIN_AGAIN);
1309
  if ($response->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
1310
- $text = $this->_helper->__('You will shortly receive a PIN by phone / SMS. Please enter the PIN in the appropriate text box');
1311
  } else {
1312
- $text = $this->_helper->htmlEscape($response->getStatusMessage()); //status_message
1313
  }
1314
  $this->showException($text, false);
1315
  }
@@ -1318,18 +1474,19 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1318
  * validate callback response
1319
  *
1320
  */
1321
- private function _validateCallbackProcess() {
 
1322
  $payCode = ucfirst($this->_code);
1323
  $callbackTid = "getNnCallbackTid" . $payCode;
1324
  $callbackPin = "getNnCallbackPin" . $payCode;
1325
  $setNnDisableTime = "setNnDisableTime" . $payCode;
1326
- $getNnDisableTime = "getNnDisableTime" . $payCode;
1327
  $methodSession = $this->_getMethodSession();
 
1328
  if ($methodSession->getNnCallbackSuccessState()) {
1329
  if ($this->_getConfigData('callback') == 3) {
1330
  $type = Novalnet_Payment_Model_Config::REPLY_EMAIL_STATUS;
1331
  $extraOption = '';
1332
- } elseif ($this->_getConfigData('callback') == 1) {
1333
  $type = Novalnet_Payment_Model_Config::PIN_STATUS;
1334
  $extraOption = '<pin>' . $methodSession->$callbackPin() . '</pin>';
1335
  }
@@ -1344,7 +1501,9 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1344
  if ($result->getStatus() == Novalnet_Payment_Model_Config::METHOD_DISABLE_CODE) {
1345
  $methodSession->$setNnDisableTime(time() + (30 * 60));
1346
  }
1347
- $error = ($result->getStatusDesc() || $result->getStatusMessage()) ? $this->_helper->htmlEscape($result->getStatusMessage() . $result->getStatusDesc()) : $this->_helper->htmlEscape($result->pin_status['status_message']);
 
 
1348
  $this->showException($error, false);
1349
  }
1350
  }
@@ -1354,13 +1513,15 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1354
  * Log novalnet transaction data
1355
  *
1356
  */
1357
- public function logNovalnetTransactionData($request, $response, $txnId, $customerId = NULL, $storeId = NULL) {
1358
- $this->_dataHelper->doRemoveSensitiveData($request, $this->_code);
1359
- $shopUrl = ($response->getMemburl()) ? $response->getMemburl() : $this->_helper->getCurrentSiteUrl();
1360
- $customerId = ($customerId) ? $customerId : $this->_helper->getCustomerId();
1361
- $storeId = ($storeId) ? $storeId : $this->_helper->getMagentoStoreId();
1362
- $modNovalTransactionOverview = $this->_helper->getModelTransactionOverview();
1363
- $modNovalTransactionOverview->setTransactionId($txnId)
 
 
1364
  ->setOrderId($this->_getOrderId())
1365
  ->setRequestData(serialize($request->getData()))
1366
  ->setResponseData(serialize($response->getData()))
@@ -1368,59 +1529,37 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1368
  ->setStatus($response->getStatus())
1369
  ->setStoreId($storeId)
1370
  ->setShopUrl($shopUrl)
1371
- ->setCreatedDate($this->_helper->getCurrentDateTime())
1372
  ->save();
1373
  }
1374
 
1375
- /**
1376
- * Log novalnet transaction status data
1377
- *
1378
- */
1379
- public function logNovalnetStatusData($response, $txnId, $customerId = NULL, $storeId = NULL, $amount = NULL) {
1380
- $shopUrl = ($response->getMemburl()) ? $response->getMemburl() : $this->_helper->getCurrentSiteUrl();
1381
- $customerId = ($customerId) ? $customerId : $this->_helper->getCustomerId();
1382
- $storeId = ($storeId) ? $storeId : $this->_helper->getMagentoStoreId();
1383
- $amount = ($amount) ? $amount : $this->_getAmount();
1384
- $modNovalTransactionStatus = $this->_helper->getModelTransactionStatus();
1385
- $modNovalTransactionStatus->setTransactionNo($txnId)
1386
- ->setOrderId($this->_getOrderId()) //order number
1387
- ->setTransactionStatus($response->getStatus()) //transaction status code
1388
- ->setNcNo($response->getNcNo())
1389
- ->setCustomerId($customerId) //customer number
1390
- ->setPaymentName($this->_code) //payment name
1391
- ->setAmount($amount) //amount
1392
- ->setRemoteIp($this->_helper->getRealIpAddr()) //remote ip
1393
- ->setStoreId($storeId) //store id
1394
- ->setShopUrl($shopUrl)
1395
- ->setCreatedDate($this->_helper->getCurrentDateTime()) //created date
1396
- ->save();
1397
-
1398
- }
1399
-
1400
  /**
1401
  * validate basic params to load Cc & SEPA Iframe
1402
  *
1403
  * @return bool
1404
  */
1405
-
1406
- public function validateNovalnetIframeParams() {
1407
- //$this->_manualCheckValidate();
1408
- if (!$this->_validateBasicParams()) {
 
 
1409
  return false;
1410
- } elseif ((int)$this->_getConfigData('manual_checking_amount') && (!$this->_helper->checkIsNumeric($this->_getConfigData('manual_checking_amount')) || !$this->_helper->checkIsNumeric($this->_getConfigData('second_product_id')) || !$this->_helper->checkIsNumeric($this->_getConfigData('second_tariff_id')))) {
 
1411
  return false;
1412
  }
1413
- $this->_manualCheckValidate();
1414
  return true;
1415
  }
1416
 
1417
  /**
1418
- * Get current infoinstance
1419
  *
1420
  * @return Mage_Payment_Model_Method_Abstract
1421
  */
1422
-
1423
- private function _getInfoInstance() {
1424
  if (!isset($this->infoInstance)) {
1425
  $this->infoInstance = $this->getInfoInstance();
1426
  }
@@ -1432,7 +1571,8 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1432
  *
1433
  * @return Mage_Payment_Model_Method_Abstract
1434
  */
1435
- private function _getInfoObject() {
 
1436
  $info = $this->_getInfoInstance();
1437
  if ($this->_isPlaceOrder()) {
1438
  return $info->getOrder();
@@ -1446,7 +1586,8 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1446
  *
1447
  * @return bool
1448
  */
1449
- private function _isPlaceOrder() {
 
1450
  $info = $this->_getInfoInstance();
1451
  if ($info instanceof Mage_Sales_Model_Quote_Payment) {
1452
  return false;
@@ -1460,7 +1601,8 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1460
  *
1461
  * @return string
1462
  */
1463
- private function _getAmount() {
 
1464
  $info = $this->_getInfoInstance();
1465
  if ($this->_isPlaceOrder()) {
1466
  return (double) $info->getOrder()->getBaseGrandTotal();
@@ -1474,7 +1616,8 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1474
  *
1475
  * @return string
1476
  */
1477
- private function _getOrderId() {
 
1478
  $info = $this->_getInfoInstance();
1479
  if ($this->_isPlaceOrder()) {
1480
  return $info->getOrder()->getIncrementId();
@@ -1483,62 +1626,72 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1483
  }
1484
  }
1485
 
1486
- /**
1487
- * Get payment data for current order
1488
- *
1489
- * @return Mage_Payment_Model_Method_Abstract
1490
- */
1491
- private function _getNnPaymentData() {
1492
- $info = $this->_getInfoInstance();
1493
- if ($this->_isPlaceOrder()) {
1494
- return $info->getOrder()->getPayment();
1495
- } else {
1496
- return $info;
1497
- }
1498
- }
1499
-
1500
  /**
1501
  * Retrieve model helper
1502
  *
1503
- * @return Novalnet_Payment_Helper_Data
1504
  */
1505
- protected function _getHelper() {
 
1506
  return Mage::helper('novalnet_payment');
1507
  }
1508
 
1509
  /**
1510
  * Retrieve Assign data helper
1511
  *
1512
- * @return Novalnet_Payment_Helper_AssignData
1513
  */
1514
- protected function _getDataHelper() {
 
1515
  return Mage::helper('novalnet_payment/AssignData');
1516
  }
1517
 
1518
- /**
1519
- * Show expection
1520
  *
1521
- * @param $string
1522
- * @param $lang
1523
  * @return Mage::throwException
1524
  */
1525
- public function showException($string, $lang=true){
1526
- if($lang)
1527
- $string = $this->_helper->__($string);
 
 
1528
 
1529
- return Mage::throwException($string);
1530
- }
1531
 
1532
- /**
1533
  * Assign helper utilities needed for the payment process
1534
  *
1535
  */
1536
- public function assignUtilities(){
1537
- if(!$this->_helper){
1538
- $this->_helper = $this->_getHelper();
1539
- }
1540
- if(!$this->_dataHelper){
1541
- $this->_dataHelper = $this->_getDataHelper();
1542
- }
1543
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1544
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
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
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_Method_Abstract
27
+ {
28
 
29
  protected $_isGateway = false;
30
+ protected $_canAuthorize = false;
31
  protected $_canCapture = false;
32
  protected $_canCapturePartial = false;
33
  protected $_canRefund = true;
41
  protected $_mustTransimitInvoicingData = false;
42
  protected $_mustTransimitInvoicingItemTypes = false;
43
  protected $_canCancelInvoice = false;
44
+ protected $_methodType = '';
45
+ protected $_redirectUrl = '';
 
46
  var $infoInstance;
47
+ var $helper;
48
+ var $dataHelper;
49
 
50
  /**
51
  * Load Basic Params in constructor
52
  *
53
  * @return
54
  */
55
+ public function __construct()
56
+ {
57
  //Novalnet Basic parameters
58
+ $this->assignUtilities();
59
  $this->_vendorId = $this->_getConfigData('merchant_id', true);
60
  $this->_authcode = $this->_getConfigData('auth_code', true);
61
  $this->_productId = $this->_getConfigData('product_id', true);
69
  * @param Mage_Sales_Model_Quote
70
  * @return bool
71
  */
72
+ public function isAvailable($quote = null)
73
+ {
74
  $getNnDisableTime = "getNnDisableTime" . ucfirst($this->_code); //Dynamic Getter based on payment methods
75
  $minOrderCount = $this->_getConfigData('orderscount');
76
  $userGroupId = $this->_getConfigData('user_group_excluded');
77
+
78
+ if ($this->helper->checkOrdersCount($minOrderCount)) {
79
  return false;
80
+ } else if (!$this->helper->checkCustomerAccess($userGroupId)) {
81
  return false;
82
+ } else if (!empty($quote) && !$this->helper->isModuleActive($quote->getGrandTotal())) {
83
  return false;
84
  } else if (time() < $this->_getMethodSession()->$getNnDisableTime()) {
85
  return false;
86
  }
87
+ $this->paymentRefillValidate();
 
88
 
89
+ return parent::isAvailable($quote);
 
 
 
 
 
 
 
 
 
 
 
 
90
  }
91
 
92
  /**
94
  *
95
  * @return Mage_Payment_Model_Abstract
96
  */
97
+ public function validate()
98
+ {
99
  parent::validate();
100
  $infoInstance = $this->_getInfoInstance();
101
  if (!$this->_isPlaceOrder()) {
102
 
103
+ // validate the Novalnet basic params and billing informations
104
  $this->validateNovalnetParams();
105
  //customer_no verification
106
+ $this->helper->customerNumberValidation();
107
+ // validate the form payment method values
108
+ $this->dataHelper->validateNovalnetData($this->_code, $infoInstance);
109
 
110
+ // unset the telephone payment data
111
  if ($this->_code != Novalnet_Payment_Model_Config::NN_TELEPHONE &&
112
  $this->_getMethodSession(Novalnet_Payment_Model_Config::NN_TELEPHONE)->getNnPhoneTid()) {
113
+ $this->unsetMethodSession(Novalnet_Payment_Model_Config::NN_TELEPHONE);
114
  }
115
+
116
+ if ($this->_code == Novalnet_Payment_Model_Config::NN_TELEPHONE) {
117
+ $this->doNovalnetPhoneFirstCall();
118
+ }
119
+ }
120
+
121
+ $callbackPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('fraudCheckPayment');
122
+ if (in_array($this->_code, $callbackPayment) || ($this->_code == 'novalnetCc'
123
+ && $this->_getConfigData('active_cc3d') != 1)) {
124
+ $this->_initiateCallbackProcess($this->_code);
125
+ }
126
+
127
+ if (!$this->isCallbackTypeCall() && $this->_isPlaceOrder()) {
128
+ $this->_sendRequestToNovalnet();
129
  }
 
 
130
  return $this;
131
  }
132
 
133
  /**
134
+ * Payment form refill validation
135
  *
 
 
 
136
  */
137
+ public function paymentRefillValidate()
138
+ {
139
+ // set method session
140
+ $this->_getMethodSession();
141
+ $prevPaymentCode = $this->_getCheckout()->getNnPaymentCode();
142
+ // check the users (guest or login)
143
+ $customerSession = $this->helper->getCustomerSession();
144
+ $coreSession = $this->helper->getCoresession();
145
+ if (!$customerSession->isLoggedIn() && $coreSession->getGuestloginvalue()
146
+ == '') {
147
+ $coreSession->setGuestloginvalue('1');
148
+ } elseif ($coreSession->getGuestloginvalue() == '1' && $customerSession->isLoggedIn()) {
149
+ $coreSession->setGuestloginvalue('0');
150
+ $this->unsetMethodSession($prevPaymentCode);
151
+ }
152
+
153
+ // unset form previous payment method session
154
+ $paymentCode = $this->_getCheckout()->getQuote()->getPayment()->getMethod();
155
+ if ($paymentCode && !preg_match("/novalnet/i", $paymentCode) && $prevPaymentCode && $paymentCode != $prevPaymentCode) {
156
+ $this->unsetMethodSession($prevPaymentCode);
157
+ }
158
+ }
159
+
160
+ /**
161
+ * Assign Form Data in quote instance
162
+ *
163
+ * @return Mage_Payment_Model_Abstract Object
164
+ */
165
+ public function assignData($data)
166
+ {
167
+ $infoInstance = $this->_getInfoInstance();
168
+ // unset form previous payment method session
169
+ $prevPaymentCode = $this->_getCheckout()->getNnPaymentCode();
170
+ if ($prevPaymentCode && $this->_code != $prevPaymentCode) {
171
+ $this->unsetMethodSession($prevPaymentCode);
172
+ }
173
+ $this->dataHelper->assignNovalnetData($this->_code, $data, $infoInstance);
 
 
 
 
 
174
  return $this;
175
  }
176
 
177
+ /**
178
+ * Assign the Novalnet direct payment methods request
179
+ *
180
+ */
181
+ private function _sendRequestToNovalnet()
182
+ {
183
+ $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
184
+ array_push($redirectPayment, Novalnet_Payment_Model_Config::NN_TELEPHONE);
185
+ if ($this->_code && !in_array($this->_code, $redirectPayment)) {
186
+
187
+ if ($this->_code == Novalnet_Payment_Model_Config::NN_CC && !$this->helper->checkIsAdmin()
188
+ && $this->_getConfigData('active_cc3d') == 1) {
189
+ return false;
190
+ }
191
+
192
+ $storeId = $this->helper->getMagentoStoreId();
193
+ $request = $this->buildRequest(Novalnet_Payment_Model_Config::POST_NORMAL, $storeId);
194
+ $methodSession = $this->_getMethodSession($this->_code);
195
+ $methodSession->setPaymentReqData($request);
196
+ }
197
+ }
198
+
199
  /**
200
  * Capture
201
  *
202
+ * @param Varien_Object $payment
203
  * @param float $amount
204
  * @return Mage_Payment_Model_Abstract
205
  */
206
+ public function capture(Varien_Object $payment, $amount)
207
+ {
208
+ $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
209
+ array_push($redirectPayment, Novalnet_Payment_Model_Config::NN_TELEPHONE);
 
 
 
 
 
 
210
  $responseCodeApproved = Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED;
 
211
 
212
+ if ($this->canCapture() && $this->_code && !in_array($this->_code, $redirectPayment)) {
213
+ $lastTranId = $this->helper->makeValidNumber($payment->getLastTransId());
214
+ $loadTransStatus = $this->helper->loadTransactionStatus($lastTranId);
 
 
 
 
 
 
 
 
215
  $transStatus = $loadTransStatus->getTransactionStatus();
 
216
 
217
+ if (!empty($transStatus) && $transStatus != $responseCodeApproved) {
218
+
219
+ //Send capture request to Payport
220
+ $response = $this->_performPayportRequest($payment, 'capture');
221
  if ($response->getStatus() == $responseCodeApproved) {
222
  $loadTransStatus->setTransactionStatus($responseCodeApproved)
223
+ ->save();
 
 
 
 
 
 
 
224
 
225
+ $magentoVersion = $this->_getHelper()->getMagentoVersion();
226
+ // make capture transaction open for lower versions to make refund
227
+ if (version_compare($magentoVersion, '1.6', '<')) {
228
+ $payment->setIsTransactionClosed(false)
229
+ ->save();
230
+ }
231
+ if ($transStatus != $responseCodeApproved) {
232
+ $transMode = (version_compare($magentoVersion, '1.6', '<'))
233
+ ? false : true;
234
+ $payment->setTransactionId($lastTranId)
235
+ ->setIsTransactionClosed($transMode);
236
+ $transaction = $payment->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE, null, false);
237
+ $transaction->setParentTxnId(null)
238
+ ->save();
239
+ }
240
  } else {
241
  $this->showException('Error in you capture request');
242
  }
 
243
  }
244
  }
245
  return $this;
251
  * @param string $type
252
  * @return Mage_Novalnet_Model_Novalnet_Request
253
  */
254
+ public function buildRequest($type = Novalnet_Payment_Model_Config::POST_NORMAL,
255
+ $storeId = NULL
256
+ ) {
257
  $payCode = ucfirst($this->_code);
258
+ $helper = $this->helper;
259
  $callbackTelNo = "getNnCallbackTel" . $payCode;
260
  $callbackEmail = "getNnCallbackEmail" . $payCode;
261
+ $refernceOne = trim(strip_tags(trim($this->_getConfigData('reference_one'))));
262
+ $refernceTwo = trim(strip_tags(trim($this->_getConfigData('reference_two'))));
263
 
264
+ if ($type == Novalnet_Payment_Model_Config::POST_NORMAL || $type == Novalnet_Payment_Model_Config::POST_CALLBACK) {
 
265
  $request = new Varien_Object();
266
  $amount = $helper->getFormatedAmount($this->_getAmount());
267
  $billing = $this->_getInfoObject()->getBillingAddress();
268
+ $email = $billing->getEmail() ? $billing->getEmail() : $this->_getInfoObject()->getCustomerEmail();
269
  $this->assignNnAuthData($request, $storeId);
270
  $request->setTestMode((!$this->_getConfigData('live_mode')) ? 1 : 0)
271
  ->setAmount($amount)
285
  ->setFax($billing->getFax())
286
  ->setRemoteIp($helper->getRealIpAddr())
287
  ->setGender('u')
288
+ ->setEmail($email)
289
  ->setOrderNo($this->_getOrderId())
290
  ->setSystemUrl(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB))
291
+ ->setSystemIp($helper->getServerAddr())
292
+ ->setSystemName('magento')
293
+ ->setSystemVersion($helper->getMagentoVersion() . '-' . $helper->getNovalnetVersion())
294
+ ->setInput1('order_id')
295
  ->setInputval1($this->_getOrderId());
296
 
297
+ if ($this->_referrerId) {
298
+ $request->setReferrerId($this->_referrerId);
299
+ }
300
+ if ($refernceOne) {
301
+ $request->setInput2('reference1')
302
+ ->setInputval2($refernceOne);
303
+ }
304
+ if ($refernceTwo) {
305
+ $request->setInput3('reference2')
306
+ ->setInputval3($refernceTwo);
307
+ }
308
+ if ($helper->checkIsAdmin()) {
309
+ $adminUserId = Mage::getSingleton('admin/session')->getUser()->getUserId();
310
+ $request->setInput4('admin_user')
311
+ ->setInputval4($adminUserId);
312
+ }
313
  $this->_setNovalnetParam($request, $this->_code);
314
  }
315
 
337
  * @param string $type
338
  * @return Varien_Object
339
  */
340
+ public function postRequest($request)
341
+ {
342
  $result = new Varien_Object();
343
+ $helper = $this->helper;
344
  $paymentKey = $helper->getPaymentId($this->_code);
345
+ $payportUrl = $helper->getPayportUrl('paygate');
346
  if ($this->_validateBasicParams() && $helper->checkIsNumeric($paymentKey)
347
+ && $paymentKey == $request->getKey() && $request->getAmount() && $helper->checkIsNumeric($request->getAmount())) {
348
+ $response = $this->_setNovalnetRequestCall($request->getData(), $payportUrl);
349
+ parse_str($response->getBody(), $data);
350
+ $result->addData($data);
351
  } else {
352
  $this->showException($helper->__('Required parameter not valid') . '!', false);
353
  }
354
  return $result;
355
  }
356
 
357
+ /**
358
+ * Do XML call request to server
359
+ *
360
+ * @param Varien_Object $requestData
361
+ * @param String $requestUrl
362
+ * @return Mage_Payment_Model_Abstract Object
363
+ */
364
+ public function setRawCallRequest($requestData, $requestUrl)
365
+ {
366
+ $httpClientConfig = array('maxredirects' => 0);
367
+ $client = new Varien_Http_Client($requestUrl, $httpClientConfig);
368
+ $client->setRawData($requestData)->setMethod(Varien_Http_Client::POST);
369
+ $response = $client->request();
370
+ if (!$response->isSuccessful()) {
371
+ Mage::throwException($this->_getHelper()->__('Gateway request error: %s', $response->getMessage()));
372
+ }
373
+ $result = new Varien_Object();
374
+ parse_str($response->getBody(), $data);
375
+ $result->addData($data);
376
+ return $result;
377
+ }
378
+
379
  /**
380
  * Assign Novalnet Authentication Data
381
  *
382
  * @param Varien_Object $request
383
+ * @param int $storeId
384
  */
385
+ public function assignNnAuthData(Varien_Object $request, $storeId = NULL)
386
+ {
387
  //Reassign the Basic Params Based on store
388
  $this->_vendorId = $this->_getConfigData('merchant_id', true, $storeId);
389
  $this->_authcode = $this->_getConfigData('auth_code', true, $storeId);
393
  ->setAuthCode($this->_authcode)
394
  ->setProduct($this->_productId)
395
  ->setTariff($this->_tariffId)
396
+ ->setKey($this->helper->getPaymentId($this->_code));
397
  }
398
 
399
  /**
400
+ * Set the Order basic configuration
401
  *
 
402
  * @param string $payment
403
  */
404
+ public function assignVendorConfig($payment = NULL)
405
  {
406
+ //Reassign the Basic Params Based on store
407
+ $getresponseData = NULL;
408
+ if ($payment) {
409
+ $getresponseData = unserialize($payment->getAdditionalData());
410
+ }
411
+ $this->_vendorId = ($getresponseData['vendor']) ? $getresponseData['vendor']
412
+ : $this->_vendorId;
413
+ $this->_authcode = ($getresponseData['auth_code']) ? $getresponseData['auth_code']
414
+ : $this->_authcode;
415
+ $this->_productId = ($getresponseData['product']) ? $getresponseData['product']
416
+ : $this->_productId;
417
+ $this->_tariffId = ($getresponseData['tariff']) ? $getresponseData['tariff']
418
+ : $this->_tariffId;
419
+ }
 
 
420
 
421
  /**
422
  * Refund amount
423
  *
424
+ * @param Varien_Object $payment
425
+ * @param float $amount
426
+ * @return Mage_Payment_Model_Abstract
427
  */
428
+ public function refund(Varien_Object $payment, $amount)
429
+ {
430
  if (!$this->canRefund()) {
431
  $this->showException('Refund action is not available.');
432
  }
433
 
434
  if ($payment->getRefundTransactionId() && $amount > 0) {
435
+ $helper = $this->helper;
436
+ $refundAmount = $helper->getFormatedAmount($amount);
437
+ $getTid = $helper->makeValidNumber($payment->getRefundTransactionId());
438
+ $data = unserialize($payment->getAdditionalData());
439
+ if ($this->_code == Novalnet_Payment_Model_Config::NN_SEPA) {
440
+ $getTid = $helper->makeValidNumber($payment->getLastTransId());
441
+ if (isset($data['NnSepaParentTid']) && $data['NnSepaParentTid']) {
442
+ $getTid = $data['NnSepaParentTid'];
443
+ }
444
+ }
 
 
445
 
446
+ if ($this->_code == Novalnet_Payment_Model_Config::NN_INVOICE) {
447
+ $this->_refundValidation($payment, $refundAmount);
448
+ }
449
+ //Send refund request to Payport
450
+ $response = $this->_performPayportRequest($payment, 'refund', $refundAmount, $getTid);
451
+
452
+ if ($response->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
453
+ $getTransactionStatus = $this->doNovalnetStatusCall($getTid, $payment, Novalnet_Payment_Model_Config::TRANS_STATUS);
454
+ $loadTransaction = $helper->loadTransactionStatus($getTid);
455
+ $loadTransaction->setTransactionStatus($getTransactionStatus->getStatus())
456
+ ->setAmount($helper->getFormatedAmount($getTransactionStatus->getAmount(), 'RAW'))
457
+ ->save();
458
+ $data['fullRefund'] = ((string)$this->_getAmount() == (string)$amount) ? true : false;
459
+ $txnid = $response->getTid(); // response tid
460
+ $refundTid = !empty($txnid) ? $txnid : $payment->getLastTransId() . '-refund';
461
+
462
+ if (in_array($this->_code, array(Novalnet_Payment_Model_Config::NN_INVOICE,
463
+ Novalnet_Payment_Model_Config::NN_PREPAYMENT))) {
464
+ $amountAfterRefund = ($this->_getAmount() - $payment->getOrder()->getBaseTotalRefunded());
465
+ $loadTransaction->setAmount($amountAfterRefund)
 
466
  ->save();
467
+ $data['NnTid'] = $data['NnTid'] . '-refund';
468
+ $refundTid = $data['NnTid'];
469
+ }
470
+
471
+ if ($refundTid) {
472
+ $refAmount = Mage::helper('core')->currency($amount, true, false);
473
+ if (!isset($data['refunded_tid'])) {
474
+ $refundedTid = array('refunded_tid'=> array($refundTid => array('reftid' => $refundTid , 'refamount' => $refAmount , 'reqtid' => $getTid)));
475
+ $data = array_merge($data, $refundedTid);
476
+ } else {
477
+ $data['refunded_tid'][$refundTid]['reftid'] = $refundTid;
478
+ $data['refunded_tid'][$refundTid]['refamount'] = $refAmount;
479
+ $data['refunded_tid'][$refundTid]['reqtid'] = $getTid;
480
+ }
481
+ }
482
 
483
+ // For SEPA payment after submitting to bank
484
+ if ($getTransactionStatus->getStatus() && $this->_code == Novalnet_Payment_Model_Config::NN_SEPA) {
485
+ $data['NnSepaParentTid'] = $getTid;
486
+ if ($getTransactionStatus->getStatus() == Novalnet_Payment_Model_Config::PAYMENT_VOID_STATUS
487
+ && $getTransactionStatus->getChildTidInfo()) {
488
+ parse_str($getTransactionStatus->getChildTidInfo(), $resInfo);
489
+ $data['NnSepaParentTid'] = $resInfo['tid1'];
490
  }
491
+ }
492
+
493
+ $magentoVersion = $this->_getHelper()->getMagentoVersion();
494
+ // make capture transaction open for lower versions to make refund
495
+ if (version_compare($magentoVersion, '1.6', '<')) {
496
+ $order = $payment->getOrder();
497
+ $canRefundMore = $order->canCreditmemo();
498
+
499
+ $payment->setTransactionId($refundTid)
500
+ ->setLastTransId($refundTid)
501
+ ->setAdditionalData(serialize($data))
502
+ ->setIsTransactionClosed(1) // refund initiated by merchant
503
+ ->setShouldCloseParentTransaction(!$canRefundMore)
504
+ ->save();
505
  } else {
506
+ $payment->setTransactionId($refundTid)
507
+ ->setLastTransId($refundTid)
508
+ ->setAdditionalData(serialize($data))
509
+ ->save();
510
+ }
511
+
512
+ if ($txnid) { // Only log the novalnet transaction which contains TID
513
+ if ($this->_code == Novalnet_Payment_Model_Config::NN_SEPA) {
514
+ $amount = ($this->_getAmount() - $payment->getOrder()->getBaseTotalRefunded());
515
+ }
516
+ $getTransactionStatus = $this->doNovalnetStatusCall($txnid, $payment, Novalnet_Payment_Model_Config::TRANS_STATUS);
517
+ $response->setStatus($getTransactionStatus->getStatus());
518
+ $helper->doTransactionStatusSave($response, $getTransactionStatus, $payment, $amount, $loadTransaction->getCustomerId);
519
+ }
520
  } else {
521
+ $this->showException($response->getStatusDesc(), false);
522
  }
523
  } else {
524
  $this->showException('Error in you refund request');
527
  }
528
 
529
  /**
530
+ * refund validation for InvoicePayment
531
  *
532
+ * @return boolean
 
533
  */
534
+ private function _refundValidation($payment, $refundAmount)
535
+ {
536
+ $orderId = $payment->getOrder()->getIncrementId();
537
+ $callbackTrans = $this->helper->loadCallbackValue($orderId);
538
+ $callbackValue = $callbackTrans && $callbackTrans->getCallbackAmount() != NULL
539
+ ? $callbackTrans->getCallbackAmount() : '';
540
+ $currency = Mage::app()->getLocale()->currency($this->_getInfoObject()->getBaseCurrencyCode())->getSymbol();
541
+ if ($callbackValue < (string) $refundAmount) {
542
+ $this->showException('Maximum amount available to refund is ' . $currency . $this->helper->getFormatedAmount($callbackValue, 'RAW'));
543
+ }
544
+ $refundedAmount = $this->helper->getFormatedAmount($payment->getAmountRefunded());
545
+ $totalrefundAmount = $refundedAmount + $refundAmount;
546
+ $availAmount = $callbackValue - $refundedAmount;
547
+ if ($payment->getAmountRefunded() && $callbackValue < (string) $totalrefundAmount) {
548
+ $this->showException('Maximum amount available to refund is ' . $currency . $this->helper->getFormatedAmount($availAmount, 'RAW'));
549
  }
550
+ return true;
551
+ }
552
 
553
+ /**
554
+ * Perform Novalnet request for Void, Capture, Refund
555
+ *
556
+ * @param Varien_Object $payment
557
+ * @return $response
558
+ */
559
+ private function _performPayportRequest($payment, $requestType,
560
+ $refundAmount = NULL, $refundTid = NULL
561
+ ) {
562
  $request = new Varien_Object();
563
+ $helper = $this->helper;
564
+ $storeId = $helper->getMagentoStoreId();
565
  $customerId = $payment->getOrder()->getCustomerId();
566
+ $getTid = ($requestType == 'refund') ? $refundTid : $payment->getLastTransId();
567
+ $this->assignVendorConfig($payment);
568
+ $getresponseData = unserialize($payment->getAdditionalData());
569
+ $key = ($getresponseData['key']) ? $getresponseData['key'] : $helper->getPaymentId($this->_code);
570
+ $request->setVendor($this->_vendorId)
571
+ ->setAuthCode($this->_authcode)
572
+ ->setProduct($this->_productId)
573
+ ->setTariff($this->_tariffId)
574
+ ->setKey($key)
575
+ ->setTid($helper->makeValidNumber($getTid));
576
+ if ($requestType == 'void' || $requestType == 'capture') {
577
+ $request->setEditStatus(true);
578
+ $setStatus = ($requestType == 'capture') ? Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED
579
+ : Novalnet_Payment_Model_Config::PAYMENT_VOID_STATUS;
580
+ $request->setStatus($setStatus);
581
+ } else {
582
+ $request->setRefundRequest(true)
583
+ ->setRefundParam($refundAmount);
584
+ }
585
  if (!in_array(NULL, $request->toArray())) {
 
586
  $buildNovalnetParam = http_build_query($request->getData());
587
+ $payportUrl = $helper->getPayportUrl('paygate');
588
+ $response = $this->setRawCallRequest($buildNovalnetParam, $payportUrl);
589
  $this->logNovalnetTransactionData($request, $response, $payment->getLastTransId(), $customerId, $storeId);
590
+ } else {
591
+ $this->showException('Error in processing the transactions request');
592
+ }
593
+ return $response;
594
+ }
595
 
596
+ /**
597
+ * Void payment
598
+ *
599
+ * @param Varien_Object $payment
600
+ * @return Mage_Payment_Model_Abstract
601
+ */
602
+ public function void(Varien_Object $payment)
603
+ {
604
+ if (!$this->canVoid($payment)) {
605
+ $this->showException('Void action is not available.');
606
+ }
607
 
608
+ //Send void request to Payport
609
+ $response = $this->_performPayportRequest($payment, 'void');
 
 
 
 
 
610
 
611
+ if ($response->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
612
+
613
+ $txnid = $response->getTid();
614
+ $voidTid = !empty($txnid) ? $txnid : $payment->getLastTransId() . '-void';
615
+ $invoicePayment = (in_array($this->_code, array(Novalnet_Payment_Model_Config::NN_INVOICE,
616
+ Novalnet_Payment_Model_Config::NN_PREPAYMENT)));
617
+ $data = unserialize($payment->getAdditionalData());
618
+ $data['voidTid'] = $voidTid;
619
+ if ($invoicePayment) {
620
+ $bankVoidTid = !empty($txnid) ? $txnid : $payment->getLastTransId();
621
+ $data['NnNoteTID'] = $this->dataHelper->getBankDetailsTID($bankVoidTid);
622
+ }
623
+
624
+ $payment->setTransactionId($voidTid)
625
+ ->setLastTransId($voidTid)
626
+ ->setAdditionalData(serialize($data))
627
+ ->save();
628
+ $getTid = $this->helper->makeValidNumber($payment->getLastTransId());
629
+ $getTransactionStatus = $this->doNovalnetStatusCall($getTid, $payment, Novalnet_Payment_Model_Config::TRANS_STATUS);
630
+ $transAmount = $getTransactionStatus->getAmount();
631
+ if ($invoicePayment) {
632
+ $transAmount = $this->helper->getFormatedAmount($getTransactionStatus->getAmount(), 'RAW');
633
  }
634
+ $loadTransaction = $this->helper->loadTransactionStatus($getTid);
635
+ $loadTransaction->setTransactionStatus($getTransactionStatus->getStatus())
636
+ ->setAmount($transAmount)
637
+ ->save();
638
  } else {
639
  $this->showException('Error in you void request');
640
  }
641
  return $this;
642
  }
643
+
644
  /**
645
  * Get Method Session
646
  *
647
  * @return Checkout session
648
  */
649
+ private function _getMethodSession($paymentCode = NULL)
650
+ {
651
  $paymentCode = (!empty($paymentCode)) ? $paymentCode : $this->getCode();
652
+ $checkoutSession = $this->_getCheckout();
653
  if (!$checkoutSession->hasData($paymentCode)) {
654
  $checkoutSession->setData($paymentCode, new Varien_Object());
655
  }
659
  /**
660
  * Unset method session
661
  *
662
+ * @return method session
663
  */
664
+ public function unsetMethodSession($paymentCode = NULL)
665
+ {
666
  $paymentCode = (!empty($paymentCode)) ? $paymentCode : $this->getCode();
667
+ $checkoutSession = $this->_getCheckout();
668
+ $checkoutSession->unsetData($paymentCode);
669
+ if ($checkoutSession->getNnPaymentCode()) {
670
+ $checkoutSession->unsNnPaymentCode();
671
+ }
672
  return $this;
673
  }
674
 
677
  *
678
  * @return mixed
679
  */
680
+ public function _getConfigData($field, $globalMode = false, $storeId = NULL)
681
+ {
682
+ $storeId = is_null($storeId) ? $this->helper->getMagentoStoreId() : $storeId;
683
+ $path = $this->helper->getNovalnetGlobalPath() . $field;
684
  if ($field == 'live_mode') {
685
+ $getTestmodePayments = Mage::getStoreConfig($path, $storeId);
686
+ if (!preg_match('/' . $this->_code . '/i', $getTestmodePayments)) {
687
  return false;
688
  }
689
  return true;
690
  } elseif (!is_null($field)) {
691
  return ($globalMode == false) ? trim($this->getConfigData($field, $storeId))
692
+ : trim(Mage::getStoreConfig($path, $storeId));
693
  }
694
  return null;
695
  }
700
  * @param array $response
701
  * @return mixed
702
  */
703
+ public function doNovalnetPostbackCall($response)
704
+ {
705
  //Required Parameters to be passed to the Server
706
  $request = $result = array();
707
+ $helper = $this->helper;
708
+ $paymentKey = $helper->getPaymentId($this->_code);
709
+ $payportUrl = $helper->getPayportUrl('paygate');
710
+ if ($this->_validateBasicParams() && $this->helper->checkIsNumeric($paymentKey)) {
711
+ $request = array(
712
+ 'vendor' => $this->_vendorId,
713
+ 'auth_code' => $this->_authcode,
714
+ 'product' => $this->_productId,
715
+ 'tariff' => $this->_tariffId,
716
+ 'key' => $paymentKey,
717
+ 'tid' => $response->getTid(),
718
+ 'status' => Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED,
719
+ 'order_no' => $this->_getOrderId()
720
+ );
721
  if ($request['key'] == 27) {
722
  $request['invoice_ref'] = 'BNR-' . $request['product'] . '-' . $request['order_no'];
723
  }
724
  $result = new Varien_Object();
725
+ $response = $this->_setNovalnetRequestCall($request, $payportUrl);
726
  $result = $response->getRawBody();
727
  }
728
  return $result;
731
  /**
732
  * Check the transaction status using API
733
  *
734
+ * @param array $requestData
735
+ * @param string $requestUrl
736
  * @param string $type
737
  *
738
  * @return mixed
739
  */
740
+ private function _setNovalnetRequestCall($requestData, $requestUrl, $type = "")
741
+ {
742
+ if ($requestUrl == "") {
743
  $this->showException('Server Request URL is Empty');
744
  return;
745
  }
747
  if (((int) $this->_getConfigData('gateway_timeout')) > 0) {
748
  $httpClientConfig['timeout'] = (int) $this->_getConfigData('gateway_timeout');
749
  }
750
+ $client = new Varien_Http_Client($requestUrl, $httpClientConfig);
751
 
752
  if ($type == 'XML') {
753
+ $client->setUri($requestUrl);
754
+ $client->setRawData($requestData)->setMethod(Varien_Http_Client::POST);
755
  } else {
756
+ $client->setParameterPost($requestData)->setMethod(Varien_Http_Client::POST);
757
  }
758
  $response = $client->request();
759
  if (!$response->isSuccessful()) {
760
+ $this->showException($this->helper->__('Gateway request error: %s', $response->getMessage()), false);
761
  }
762
  if ($type == 'XML') {
763
  $result = new Varien_Simplexml_Element($response->getRawBody());
774
  *
775
  * @return object
776
  */
777
+ private function _setNovalnetParam(Varien_Object $request, $paymentCode)
778
+ {
779
+ $helper = $this->helper;
780
+ $dataHelper = $this->dataHelper;
 
781
  if ($paymentCode) {
782
+ $methodSession = $this->_getCheckout()->getData($paymentCode);
783
  switch ($paymentCode) {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
784
  case Novalnet_Payment_Model_Config::NN_INVOICE:
785
  $paymentDuration = trim($this->_getConfigData('payment_duration'));
786
  $dueDate = $helper->setDueDate($paymentDuration);
787
+ if ($dueDate) {
788
  $request->setDueDate($dueDate);
789
+ }
790
  $request->setInvoiceType(Novalnet_Payment_Model_Config::INVOICE_PAYMENT_METHOD)
791
  ->setInvoiceRef('BNR-' . $request->getProduct() . '-' . $this->_getOrderId());
792
  break;
797
  case Novalnet_Payment_Model_Config::NN_SOFORT:
798
  case Novalnet_Payment_Model_Config::NN_PAYPAL:
799
  case Novalnet_Payment_Model_Config::NN_IDEAL:
 
800
  $this->_password = $this->_getConfigData('password', true);
801
  $request->setUniqid(uniqid())
802
  ->setCountryCode($request->getCountry())
808
  ->setApiPw($helper->getEncodedParam($this->_getConfigData('api_password', true), $this->_password));
809
  }
810
 
811
+ $this->dataHelper->assignNovalnetReturnData($request, $this->_code);
812
+ $this->dataHelper->importNovalnetEncodeData($request, $this->_password);
813
  break;
814
  case Novalnet_Payment_Model_Config::NN_CC:
815
+ $request->setCcHolder($methodSession->getNnCcOwner())
816
  ->setCcNo()
817
+ ->setCcExpMonth($methodSession->getNnCcExpMonth())
818
+ ->setCcExpYear($methodSession->getNnCcExpYear())
819
+ ->setCcCvc2($methodSession->getNnCcCvc())
820
+ ->setCcType($methodSession->getNnCcType())
821
+ ->setPanHash($methodSession->getCcPanHash())
822
+ ->setUniqueId($methodSession->getCcUniqueId());
823
+ if ($this->_code == Novalnet_Payment_Model_Config::NN_CC && !$helper->checkIsAdmin()
824
+ && $this->_getConfigData('active_cc3d') == 1) {
825
+ $this->_password = $this->_getConfigData('password', true);
826
+ $amount = $helper->getFormatedAmount($this->_getAmount());
827
+ $request->setCountryCode($request->getCountry())
828
+ ->setSession(session_id())
829
+ ->setencodedAmount($helper->getEncodedParam($amount, $this->_password));
830
+ $dataHelper->assignNovalnetReturnData($request, $this->_code);
831
+ $request->unsUserVariable_0(); // Unset uservariable as CC3D doesnot requires it
832
+ }
833
  break;
834
  case Novalnet_Payment_Model_Config::NN_SEPA:
835
+ $request->setBankAccountHolder($methodSession->getSepaHolder())
836
+ ->setBankAccount()
837
+ ->setBankCode()
838
+ ->setBic()
839
+ ->setIban()
840
+ ->setSepaHash($methodSession->getSepaHash())
841
+ ->setSepaUniqueId($methodSession->getSepaUniqueId())
842
+ ->setIbanBicConfirmed($methodSession->getIbanConfirmed());
843
+
844
+ $paymentDuration = trim($this->_getConfigData('sepa_due_date'));
845
+ $dueDate = (!$paymentDuration) ? date('Y-m-d', strtotime('+7 days'))
846
+ : date('Y-m-d', strtotime('+' . $paymentDuration . ' days'));
847
+ $request->setSepaDueDate($dueDate);
 
 
 
 
 
 
 
 
 
 
 
848
 
849
  break;
 
 
 
 
 
 
 
 
 
 
 
 
850
  }
851
  }
852
  return $request;
855
  /**
856
  * Validate the novalnet response
857
  *
 
858
  * @param object $payment
 
859
  *
860
  * @return mixed
861
  */
862
+ public function validateNovalnetResponse($payment, $result = NULL)
863
+ {
864
+ $order = $payment->getOrder();
865
+ $request = $this->_getMethodSession()->getPaymentReqData();
866
+ $orderId = isset($result) && $result->getOrderNo() ? $result->getOrderNo()
867
+ : $order->getIncrementId();
868
+
869
  switch ($result->getStatus()) {
870
  case Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED:
871
+ $txnId = trim($result->getTid());
872
+ $data = $this->_setPaymentAddtionaldata($result);
873
+ /** @@ Update the transaction status and transaction overview * */
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
874
  $payment->setStatus(self::STATUS_APPROVED)
 
875
  ->setAdditionalData(serialize($data))
876
  ->save();
877
+ $order->setPayment($payment);
878
+ $order->save();
879
+
880
+ $getTransactionStatus = $this->doNovalnetStatusCall($txnId, $payment);
881
+ $result->setStatus($getTransactionStatus->getStatus());
882
+ $this->helper->doTransactionStatusSave($result, $getTransactionStatus, $payment);
883
+ // check magento version
884
+ $magentoVersion = $this->_getHelper()->getMagentoVersion();
885
+ $captureMode = (version_compare($magentoVersion, '1.6', '<')) ? false
886
+ : true;
887
+ $responseCodeApproved = ($getTransactionStatus->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED);
888
 
889
  // Capture the payment only if status is 100
890
+ if ($order->canInvoice() && $responseCodeApproved && $this->_code
891
+ != Novalnet_Payment_Model_Config::NN_PREPAYMENT) {
892
+ $payment->setTransactionId($txnId) // Add capture text to make the new transaction
893
+ ->setIsTransactionClosed($captureMode) // Close the transaction
894
+ ->capture(null)
895
+ ->save();
896
+ $orderStatus = $this->_getConfigData('order_status')
897
+ ? $this->_getConfigData('order_status') : Mage_Sales_Model_Order::STATE_PROCESSING; // If after status is empty set default status
898
+ $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $orderStatus, $this->helper->__('Payment was successful.'), true);
899
+ }
 
 
900
  $payment->setTransactionId($txnId)
901
  ->setLastTransId($txnId)
902
  ->setParentTransactionId(null)
903
  ->save();
904
+ $order->setPayment($payment);
905
+ $order->save();
906
 
907
  $this->doNovalnetPostbackCall($result); //Second Call
908
+ if (!$this->isCallbackTypeCall()) {
909
+ $this->logNovalnetTransactionData($request, $result, $txnId, $this->helper->getCustomerId(), $this->helper->getMagentoStoreId());
910
+ }
911
+ $statusText = ($result->getStatusText()) ? $result->getStatusText()
912
+ : $this->helper->__('successful');
913
  Mage::getSingleton('core/session')->addSuccess($statusText);
914
+ $error = false;
915
+ break;
916
  default:
917
+ $error = ($result->getStatusDesc()) ? $this->helper->htmlEscape($result->getStatusDesc())
918
+ : $this->helper->__('Error in capturing the payment');
919
+ if (!$this->isCallbackTypeCall()) {
920
+ $this->logNovalnetTransactionData($request, $result, $result->getTid(), $this->helper->getCustomerId(), $this->helper->getMagentoStoreId());
921
+ }
922
  if ($error !== false) {
923
+ $this->saveCancelledOrder($result, $payment);
924
+ Mage::getSingleton('core/session')->addError($error);
925
  }
926
+ break;
927
  }
928
+ return $error;
929
+ }
930
+
931
+ /**
932
+ * payment method cancellation process
933
+ *
934
+ */
935
+ public function saveCancelledOrder($result, $payment)
936
+ {
937
+ $order = $payment->getOrder();
938
+
939
+ $statusMessage = $result->getStatusMessage() ? $result->getStatusMessage() : ($result->getStatusDesc() ? $result->getStatusDesc()
940
+ : ($result->getStatusText() ? $result->getStatusText() : $this->helper->__('Payment was not successfull')));
941
+
942
+ $paystatus = "<b><font color='red'>" . $this->helper->__('Payment Failed') . "</font> - " . $statusMessage . "</b>";
943
+ $data = unserialize($payment->getAdditionalData());
944
+ //set Novalnet Mode
945
+ $authorizeKey = $this->_getConfigData('password', true);
946
+ $serverResponse = ($result->getTestMode() && is_numeric($result->getTestMode()))
947
+ ? $result->getTestMode()
948
+ : $this->helper->getDecodedParam($result->getTestMode(), $authorizeKey);
949
+ $shopMode = $this->_getConfigData('live_mode', true);
950
+ $testMode = (((isset($serverResponse) && $serverResponse == 1) || (isset($shopMode)
951
+ && $shopMode == 0)) ? 1 : 0 );
952
+ $data['NnTestOrder'] = $testMode;
953
+ $data['NnComments'] = $paystatus;
954
+ $payment->setLastTransId($result->getTid())
955
+ ->setAdditionalData(serialize($data))
956
+ ->save();
957
+ $order->registerCancellation($statusMessage)
958
+ ->save();
959
  }
960
 
961
+ /**
962
+ * Set Payment method additional informations
963
  *
964
+ * @return array
965
  */
966
+ private function _setPaymentAddtionaldata($result)
967
+ {
968
+ $txnId = trim($result->getTid());
969
+ $request = $this->_getMethodSession()->getPaymentReqData();
970
+ //set Novalnet Mode
971
+ $responseTestMode = $result->getTestMode();
972
+ $shopMode = $this->_getConfigData('live_mode');
973
+ $testMode = (((isset($responseTestMode) && $responseTestMode == 1) || (isset($shopMode)
974
+ && $shopMode == 0)) ? 1 : 0 );
975
+ $data = array('NnTestOrder' => $testMode,
976
+ 'NnTid' => $txnId,
977
+ 'vendor' => ($request->getVendor()) ? $request->getVendor() : $this->_vendorId,
978
+ 'auth_code' => ($request->getAuthCode()) ? $request->getAuthCode() : $this->_authcode,
979
+ 'product' => ($request->getProduct()) ? $request->getProduct() : $this->_productId,
980
+ 'tariff' => ($request->getTariff()) ? $request->getTariff() : $this->_tariffId,
981
+ 'key' => ($request->getKey()) ? $request->getKey() : $this->helper->getPaymentId($this->_code),
982
+ );
983
+ if (in_array($this->_code, array(Novalnet_Payment_Model_Config::NN_INVOICE,
984
+ Novalnet_Payment_Model_Config::NN_PREPAYMENT))) {
985
+ $data['NnNote'] = $this->dataHelper->getNote($result);
986
+ $data['NnNoteAmount'] = $this->dataHelper->getBankDetailsAmount($result->getAmount());
987
+ $data['NnNoteTID'] = $this->dataHelper->getBankDetailsTID($txnId);
988
+ }
989
+ return $data;
990
+ }
991
+
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
992
  /**
993
  * Make telephone payment first call and display the messages
994
  *
 
995
  */
996
+ public function doNovalnetPhoneFirstCall()
997
+ {
998
+ $methodSession = $this->_getMethodSession();
999
+ $helper = $this->helper;
1000
+ $phoneTid = $methodSession->getNnPhoneTid();
1001
+ if ($this->_code == Novalnet_Payment_Model_Config::NN_TELEPHONE) {
1002
  if (!$this->checkAmountAllowed()) {
1003
  return false;
1004
  }
1005
+ if ($phoneTid) {
1006
+ $this->_validateSession();
1007
+ }
1008
+ $methodSession = $this->_getMethodSession(); // Reassign method session after values unset
1009
+ if (!$phoneTid) {
1010
+ //invoke first call
1011
+ $storeId = $helper->getMagentoStoreId();
1012
+ $request = $this->buildRequest(Novalnet_Payment_Model_Config::POST_NORMAL, $storeId);
1013
+ $result = $this->postRequest($request);
1014
+ $methodSession->setOrderAmount($request->getAmount())
1015
+ ->setNnTelOrderNo($request->getOrderNo());
1016
+
1017
+ if (!$result) {
1018
+ $this->showException('Params (aryResponse) missing');
1019
+ }
1020
+
1021
+ if ($result->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
1022
+ // Passing the Error Response from Novalnet's paygate to payment error
1023
+ $this->logNovalnetTransactionData($request, $result, $result->getTid(), $helper->getCustomerId(), $helper->getMagentoStoreId());
1024
+ $methodSession->setNnPhoneTid($result->getTid());
1025
+ $methodSession->setNnPhoneNo($result->getNovaltelNumber());
1026
+ $methodSession->setNnPhoneStatusText($result->getStatusDesc());
1027
+ $this->_getCheckout()->setNnTelTestOrder($result->getTestMode());
1028
+ $text = $helper->__('Following steps are required to complete your payment') . ':' . "\n\n";
1029
+ $text .= $helper->__('Step') . ' 1: ';
1030
+ $text .= $helper->__('Please call the telephone number displayed') . ': ' . preg_replace('/(\d{4})(\d{4})(\d{4})(\d{4})/', "$1 $2 $3 $4", $methodSession->getNnPhoneNo()) . ".\n";
1031
+ $text .= '* ' . $helper->__('This call will cost') . ' ' . str_replace('.', ',', $result->getAmount()) . " " . Mage::app()->getLocale()->currency($result->getCurrency())->getSymbol() . ' (' . $helper->__('including VAT') . ') ';
1032
+ $text .= $helper->__('and it is possible only for German landline connection') . '!*' . "\n\n";
1033
+ $text .= $helper->__('Step') . ' 2: ';
1034
+ $text .= $helper->__('Please wait for the beep and then hang up the listeners') . '.' . "\n";
1035
+ $text .= $helper->__('After your successful call, please proceed with the payment') . '.' . "\n";
1036
+
1037
+ $this->text = $text;
1038
+ $this->showException($text, false); #show note for client to call...
1039
+ } else {
1040
+ $this->showException($result->getStatusDesc(), false);
1041
+ }
1042
+ }
1043
  }
1044
  }
1045
 
1051
  *
1052
  * @return mixed
1053
  */
1054
+ public function validateSecondCallResponse($result, $payment, $paymentCode)
1055
+ {
1056
  $status = $result->getStatus();
1057
  switch ($status) {
1058
  case Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED:
1059
  $serverResponse = $this->_getCheckout()->getNnTelTestOrder();
1060
  $shopMode = $this->_getConfigData('live_mode');
1061
+ $testMode = (((isset($serverResponse) && $serverResponse == 1) || (isset($shopMode)
1062
+ && $shopMode == 0)) ? 1 : 0 );
1063
  $data = array('NnTestOrder' => $testMode);
1064
 
1065
  $payment->setStatus(self::STATUS_APPROVED)
1066
+ ->setTransactionId($result->getTid())
1067
  ->setLastTransId($result->getTid())
1068
  ->setAdditionalData(serialize($data))
1069
  ->save();
1070
  $this->doNovalnetPostbackCall($result);
1071
  $getTransactionStatus = $this->doNovalnetStatusCall($result->getTid());
1072
  $result->setStatus($getTransactionStatus->getStatus()); // Combine Transaction status in result object
1073
+ $this->helper->doTransactionStatusSave($result, $getTransactionStatus, $payment);
1074
+ $statusText = ($result->getStatusText()) ? $result->getStatusText()
1075
+ : $this->helper->__('successful');
1076
  Mage::getSingleton('core/session')->addSuccess($statusText);
1077
+ $error = false;
 
1078
  break;
1079
  default:
1080
+ $error = ($result->getStatusDesc()) ? $this->helper->htmlEscape($result->getStatusDesc())
1081
+ : $this->helper->__('Error in capturing the payment');
1082
  if ($error !== false) {
1083
+ $this->saveCancelledOrder($result, $payment);
1084
+ Mage::getSingleton('core/session')->addError($error);
1085
  }
1086
+ break;
1087
  }
1088
+ return $error;
1089
  }
1090
 
1091
  /**
1098
  *
1099
  * @return mixed
1100
  */
1101
+ public function doNovalnetStatusCall($tid, $payment = NULL, $reqType = Novalnet_Payment_Model_Config::TRANS_STATUS,
1102
+ $extraOption = NULL, $requestData = NULL
1103
+ ) {
1104
+
1105
+ $requestType = ($reqType == Novalnet_Payment_Model_Config::TRANS_STATUS)
1106
+ ? Novalnet_Payment_Model_Config::TRANS_STATUS : $reqType;
1107
+ if ($payment != NULL) {
1108
+ $this->assignVendorConfig($payment);
1109
+ } else {
1110
+ $this->_manualCheckValidate();
1111
+ }
1112
 
1113
  $request = '<?xml version="1.0" encoding="UTF-8"?>';
1114
  $request .= '<nnxml><info_request>';
1115
+ $request .= '<vendor_id>' . $this->_vendorId . '</vendor_id>';
1116
+ $request .= '<vendor_authcode>' . $this->_authcode . '</vendor_authcode>';
1117
  $request .= '<request_type>' . $requestType . '</request_type>';
1118
+ $request .= '<product_id>' . $this->_productId . '</product_id>';
1119
  $request .= '<tid>' . $tid . '</tid>' . $extraOption;
1120
  $request .= '</info_request></nnxml>';
1121
 
1122
+ if ($this->_vendorId && $this->_authcode && $this->_productId) {
1123
+ $infoRequestUrl = $this->helper->getPayportUrl('infoport');
1124
+ $result = $this->_setNovalnetRequestCall($request, $infoRequestUrl, 'XML');
1125
+
1126
+ if ($requestType == 'NOVALTEL_STATUS') {
1127
+ $requestData->setData($request);
1128
+ }
1129
+ return $result;
1130
  }
1131
  }
1132
 
1135
  *
1136
  * @return void
1137
  */
1138
+ private function _validateSession()
1139
+ {
1140
  $methodSession = $this->_getMethodSession();
1141
  if ($methodSession->hasNnPhoneTid()) {
1142
+ if ($methodSession->getOrderAmount() != $this->helper->getFormatedAmount($this->_getAmount())) {
1143
+ $this->unsetMethodSession();
1144
+ $this->showException($this->helper->__('You have changed the order amount after receiving telephone number'));
1145
  }
1146
  }
1147
  }
1151
  *
1152
  * @return Mage_Sales_Model_Order
1153
  */
1154
+ protected function _getCheckout()
1155
+ {
1156
+ if ($this->helper->checkIsAdmin()) {
1157
+ return $this->helper->_getAdminCheckoutSession();
1158
  } else {
1159
+ return $this->helper->_getCheckoutSession();
1160
  }
1161
  }
1162
 
1166
  *
1167
  * @return bool
1168
  */
1169
+ public function checkAmountAllowed()
1170
+ {
1171
+ $amount = $this->helper->getFormatedAmount($this->_getAmount());
1172
+ if ($amount >= Novalnet_Payment_Model_Config::PHONE_PAYMENT_AMOUNT_MIN and $amount
1173
+ <= Novalnet_Payment_Model_Config::PHONE_PAYMENT_AMOUNT_MAX) {
1174
  return true;
1175
  }
1176
+ $this->showException($this->helper->__('Amounts below 0,99 Euros and above 10,00 Euros cannot be processed and are not accepted') . '!', false);
1177
  return false;
1178
  }
1179
 
1182
  *
1183
  * @return Varien_Object
1184
  */
1185
+ public function getNovalnetIframe()
1186
+ {
1187
+ $helper = $this->helper;
1188
+ $amount = ($helper->checkIsAdmin()) ? $helper->_getAdminCheckoutSession()->getQuote()->getBaseGrandTotal()
1189
+ : $helper->_getCheckoutSession()->getQuote()->getBaseGrandTotal();
1190
+ $storeId = $helper->getMagentoStoreId();
1191
+ $methodSession = $this->_getMethodSession($this->_code);
1192
+ $this->_manualCheckValidate($storeId, $amount);
 
 
1193
  //Required Parameters to be passed to the Server
1194
  $request = array();
1195
 
1196
+ if ($this->_code == Novalnet_Payment_Model_Config::NN_SEPA) {
1197
+ $billing = $this->_getCheckout()->getQuote()->getBillingAddress();
1198
+ $sepaRefill = $this->_getConfigData('sepa_refill');
1199
+ $url = $helper->getPayportUrl('sepa');
1200
+ $request = array(
1201
+ 'lang' => strtoupper(substr(Mage::app()->getLocale()->getLocaleCode(), 0, 2)),
1202
+ 'vendor_id' => $this->_vendorId,
1203
+ 'product_id' => $this->_productId,
1204
+ 'payment_id' => $helper->getPaymentId($this->_code),
1205
+ 'country' => $billing->getCountryId(),
1206
+ 'authcode' => $this->_authcode,
1207
+ 'panhash' => $sepaRefill ? $methodSession->getSepaHash() : '',
1208
+ 'fldVdr' => ($sepaRefill && $methodSession->getSepaHash() && $methodSession->getSepaFieldValidator())
1209
+ ? $methodSession->getSepaFieldValidator() : '',
1210
+ 'name' => utf8_decode($billing->getFirstname()) . ' ' . utf8_decode($billing->getLastname()),
1211
+ 'comp' => utf8_decode($billing->getCompany()),
1212
+ 'address' => utf8_decode(implode(',', $billing->getStreet())),
1213
+ 'zip' => $billing->getPostcode(),
1214
+ 'city' => utf8_decode($billing->getCity()),
1215
+ 'email' => $this->_getCheckout()->getQuote()->getCustomerEmail()
1216
+ );
1217
+ } else {
1218
+ $ccRefill = $this->_getConfigData('cc_refill');
1219
+ $url = $helper->getPayportUrl('cc');
1220
+ $request = array(
1221
+ 'nn_lang_nn' => strtoupper(substr(Mage::app()->getLocale()->getLocaleCode(), 0, 2)),
1222
+ 'nn_vendor_id_nn' => $this->_vendorId,
1223
+ 'nn_authcode_nn' => $this->_authcode,
1224
+ 'nn_product_id_nn' => $this->_productId,
1225
+ 'nn_payment_id_nn' => $helper->getPaymentId($this->_code),
1226
+ 'nn_hash' => $ccRefill ? $methodSession->getCcPanHash() : '',
1227
+ 'fldVdr' => ($ccRefill && $methodSession->getCcPanHash() && $methodSession->getCcFieldValidator())
1228
+ ? $methodSession->getCcFieldValidator() : '',
1229
+ );
1230
+ }
1231
  if ($this->_vendorId && $this->_productId) {
1232
+ $response = $this->_setNovalnetRequestCall($request, $url);
1233
+ $result = $response->getRawBody();
1234
  } else {
1235
+ $result = $helper->__('Basic parameter not valid');
1236
  }
1237
  return $result;
1238
  }
1242
  *
1243
  * @return bool
1244
  */
1245
+ public function validateNovalnetParams()
1246
+ {
1247
+ $infoObjBilling = $this->_getInfoObject()->getBillingAddress();
1248
+ $quoteBilling = $this->_getCheckout()->getQuote()->getBillingAddress();
1249
+ $cusEmail = ($quoteBilling->getEmail()) ? $quoteBilling->getEmail() : $this->_getInfoObject()->getCustomerEmail();
1250
+ $cusFirstname = ($quoteBilling->getFirstname()) ? $quoteBilling->getFirstname()
1251
+ : $infoObjBilling->getFirstname();
1252
+ $cusLastname = ($quoteBilling->getLastname()) ? $quoteBilling->getLastname()
1253
+ : $infoObjBilling->getLastname();
1254
+ $manualCheckAmt = (int) $this->_getConfigData('manual_checking_amount');
1255
+ $helper = $this->helper;
1256
  if (!$this->_validateBasicParams()) {
1257
+ $this->showException($helper->__('Basic parameter not valid') . '!', false);
1258
  return false;
1259
+ } elseif ($manualCheckAmt && (!$helper->checkIsNumeric($manualCheckAmt) || !$helper->checkIsNumeric($this->_getConfigData('second_product_id'))
1260
+ || !$helper->checkIsNumeric($this->_getConfigData('second_tariff_id')))) {
1261
+ $this->showException($helper->__('Manual limit amount / Product-ID2 / Tariff-ID2 is not valid') . '!', false);
 
 
 
 
 
1262
  return false;
1263
+ } elseif (!$helper->validateEmail($cusEmail) || !$cusFirstname || !$cusLastname) {
1264
+ $this->showException($helper->__('Customer name/email fields are not valid') . '!', false);
1265
  return false;
1266
  }
1267
  return true;
1268
  }
1269
 
1270
  /**
1271
+ * validate manual check-limit and reassign product id and tariff id
1272
  *
1273
  * @param integer $storeId
1274
  * @param float $amount
1275
  */
1276
+ private function _manualCheckValidate($storeId = NULL, $amount = NULL)
1277
+ {
1278
+ $amount = $this->helper->getFormatedAmount(($amount) ? $amount : $this->_getAmount());
1279
+ $storeId = is_null($storeId) ? $this->helper->getMagentoStoreId() : $storeId;
1280
  $manualCheckAmt = (int) $this->_getConfigData('manual_checking_amount', false, $storeId);
1281
+ $this->_productId = (strlen(trim($this->_getConfigData('second_product_id', false, $storeId)))
1282
+ && $manualCheckAmt && $manualCheckAmt <= $amount) ? trim($this->_getConfigData('second_product_id', false, $storeId))
1283
+ : trim($this->_getConfigData('product_id', true, $storeId));
1284
+ $this->_tariffId = (strlen(trim($this->_getConfigData('second_tariff_id', false, $storeId)))
1285
+ && $manualCheckAmt && $manualCheckAmt <= $amount) ? trim($this->_getConfigData('second_tariff_id', false, $storeId))
1286
+ : trim($this->_getConfigData('tariff_id', true, $storeId));
1287
  }
1288
 
1289
  /**
1291
  *
1292
  * @return bool
1293
  */
1294
+ private function _validateBasicParams()
1295
+ {
1296
+ $helper = $this->helper;
1297
+ if ($helper->checkIsNumeric($this->_vendorId) && $this->_authcode && $helper->checkIsNumeric($this->_productId)
1298
+ && $helper->checkIsNumeric($this->_tariffId)) {
1299
  return true;
1300
  }
1301
  return false;
1305
  * Check whether callback option is enabled
1306
  *
1307
  */
1308
+ public function isCallbackTypeCall()
1309
+ {
1310
  $callbackTid = "hasNnCallbackTid" . ucfirst($this->_code);
1311
+ $total = $this->helper->getFormatedAmount($this->_getAmount());
1312
  $callBackMinimum = (int) $this->_getConfigData('callback_minimum_amount');
1313
  $countryCode = strtoupper($this->_getInfoObject()->getBillingAddress()->getCountryId());
1314
 
1315
+ return $this->helper->_getCheckoutSession()->$callbackTid() || ($this->_getConfigData('callback')
1316
+ && ($callBackMinimum ? $total >= $callBackMinimum : true) && ($this->helper->isCallbackTypeAllowed($countryCode)));
 
 
1317
  }
1318
 
1319
  /**
1321
  *
1322
  * @return bool
1323
  */
1324
+ private function _initiateCallbackProcess($paymentCode)
1325
+ {
1326
+ $infoInstance = $this->getInfoInstance();
1327
+ $isCallbackTypeCall = $this->isCallbackTypeCall();
1328
+ $isPlaceOrder = $this->_isPlaceOrder();
1329
+
1330
+ $payCode = ucfirst($paymentCode);
1331
+ $callbackTid = "getNnCallbackTid" . $payCode;
1332
+ $callbackOrderNo = "getNnCallbackOrderNo" . $payCode;
1333
+ $callbackPin = "getNnCallbackPin" . $payCode;
1334
+ $callbackNewPin = "getNnNewCallbackPin" . $payCode;
1335
+ $setcallbackPin = "setNnCallbackPin" . $payCode;
1336
+
1337
+ if (!$isPlaceOrder && $isCallbackTypeCall && $this->_getIncrementId() && $this->_getMethodSession()->$callbackOrderNo()
1338
+ && ($this->_getIncrementId() != $this->_getMethodSession()->$callbackOrderNo())) {
1339
+ $this->unsetMethodSession();
1340
+ }
1341
+ //validate callback session
1342
+ $this->_validateCallbackSession();
1343
+ $methodSession = $this->_getMethodSession();
1344
+ if ($isCallbackTypeCall && $infoInstance->getCallbackPinValidationFlag()
1345
+ && $methodSession->$callbackTid()) {
1346
+ $nnCallbackPin = $infoInstance->$callbackPin();
1347
+ if (!$infoInstance->$callbackNewPin() && (!$this->helper->checkIsValid($nnCallbackPin)
1348
+ || empty($nnCallbackPin))) {
1349
+ $this->showException('PIN you have entered is incorrect or empty!');
1350
  }
1351
+ }
1352
+ if (!$isPlaceOrder && $isCallbackTypeCall && $this->_getConfigData('callback')
1353
+ != 3) {
1354
+ if ($methodSession->$callbackTid()) {
1355
+ if ($infoInstance->$callbackNewPin()) {
1356
+ $this->_regenerateCallbackPin();
 
1357
  } else {
1358
+ $methodSession->$setcallbackPin($infoInstance->$callbackPin());
 
 
 
 
 
1359
  }
1360
+ } else {
1361
+ $this->_generateCallback();
1362
  }
1363
+ } elseif (!$isPlaceOrder && $isCallbackTypeCall && $this->_getConfigData('callback')
1364
+ == 3) {
1365
+
1366
+ if (!$methodSession->$callbackTid()) {
1367
+ $this->_generateCallback();
1368
  }
1369
  }
1370
+ if ($isPlaceOrder) {
1371
+ $this->_validateCallbackProcess();
1372
+ }
1373
+ }
1374
 
1375
  /**
1376
  * validate order amount is getting changed after callback initiation
1377
  *
1378
  * throw Mage Exception
1379
  */
1380
+ private function _validateCallbackSession()
1381
+ {
1382
  $payCode = ucfirst($this->_code);
1383
  $callbackTid = "hasNnCallbackTid" . $payCode;
1384
  $getNnDisableTime = "getNnDisableTime" . $payCode;
1385
  $methodSession = $this->_getMethodSession();
1386
  if ($methodSession->$callbackTid()) {
1387
  if ($methodSession->$getNnDisableTime() && time() > $methodSession->$getNnDisableTime()) {
1388
+ $this->unsetMethodSession();
1389
+ } elseif ($methodSession->getOrderAmount() != $this->helper->getFormatedAmount($this->_getAmount())) {
1390
+ $this->unsetMethodSession();
1391
+ if (!$this->_isPlaceOrder() && $this->_getConfigData('callback')
1392
+ != 3) {
1393
  $this->showException('You have changed the order amount after getting PIN number, please try again with a new call');
1394
+ } else if (!$this->_isPlaceOrder() && $this->_getConfigData('callback')
1395
+ == 3) {
1396
  $this->showException('You have changed the order amount after getting e-mail, please try again with a new call');
1397
  }
1398
  }
1404
  *
1405
  * @return mixed
1406
  */
1407
+ private function _getIncrementId()
1408
+ {
1409
+ $storeId = $this->_getHelper()->getMagentoStoreId();
1410
+ $orders = Mage::getModel('sales/order')->getCollection()
1411
+ ->addAttributeToFilter('store_id', $storeId)
1412
+ ->setOrder('entity_id', 'DESC');
1413
+ $lastIncrementId = $orders->getFirstItem()->getIncrementId();
1414
+ if ($lastIncrementId) {
1415
+ $incrementId = ++$lastIncrementId;
1416
+ } else {
1417
+ $incrementId = $storeId . Mage::getModel('eav/entity_increment_numeric')->getNextId();
1418
+ }
1419
+ return $incrementId;
1420
  }
1421
 
1422
  /**
1423
  * Make callback request and validate response
1424
  *
1425
  */
1426
+ private function _generateCallback()
1427
+ {
1428
  $payCode = ucfirst($this->_code);
1429
  $callbackTid = "setNnCallbackTid" . $payCode;
1430
  $callbackOrderNo = "setNnCallbackOrderNo" . $payCode;
1431
 
1432
  $request = $this->buildRequest(Novalnet_Payment_Model_Config::POST_CALLBACK);
1433
+ $response = $this->postRequest($request);
1434
+ $this->logNovalnetTransactionData($request, $response, $response->getTid());
1435
  if ($response->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
1436
  $this->_getMethodSession()
1437
  ->$callbackTid(trim($response->getTid()))
1440
  ->setOrderAmount($request->getAmount())
1441
  ->setNnCallbackSuccessState(true)
1442
  ->$callbackOrderNo(trim($response->getOrderNo()))
1443
+ ->setPaymentResData($response)
1444
+ ->setPaymentReqData($request);
1445
  if ($this->_getConfigData('callback') == 3) {
1446
+ $text = $this->helper->__('Please reply to the e-mail');
1447
+ } else {
1448
+ $text = $this->helper->__('You will shortly receive a PIN by phone / SMS. Please enter the PIN in the appropriate text box');
1449
  }
1450
  } else {
1451
+ $text = $this->helper->htmlEscape($response->getStatusDesc());
1452
  }
1453
  $this->showException($text, false);
1454
  }
1457
  * Regenerate new pin for callback process
1458
  *
1459
  */
1460
+ private function _regenerateCallbackPin()
1461
+ {
1462
  $callbackTid = "getNnCallbackTid" . ucfirst($this->_code);
1463
  $methodSession = $this->_getMethodSession();
1464
  $response = $this->doNovalnetStatusCall($methodSession->$callbackTid(), NULL, Novalnet_Payment_Model_Config::TRANSMIT_PIN_AGAIN);
1465
  if ($response->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
1466
+ $text = $this->helper->__('You will shortly receive a PIN by phone / SMS. Please enter the PIN in the appropriate text box');
1467
  } else {
1468
+ $text = $this->helper->htmlEscape($response->getStatusMessage()); //status_message
1469
  }
1470
  $this->showException($text, false);
1471
  }
1474
  * validate callback response
1475
  *
1476
  */
1477
+ private function _validateCallbackProcess()
1478
+ {
1479
  $payCode = ucfirst($this->_code);
1480
  $callbackTid = "getNnCallbackTid" . $payCode;
1481
  $callbackPin = "getNnCallbackPin" . $payCode;
1482
  $setNnDisableTime = "setNnDisableTime" . $payCode;
 
1483
  $methodSession = $this->_getMethodSession();
1484
+
1485
  if ($methodSession->getNnCallbackSuccessState()) {
1486
  if ($this->_getConfigData('callback') == 3) {
1487
  $type = Novalnet_Payment_Model_Config::REPLY_EMAIL_STATUS;
1488
  $extraOption = '';
1489
+ } else {
1490
  $type = Novalnet_Payment_Model_Config::PIN_STATUS;
1491
  $extraOption = '<pin>' . $methodSession->$callbackPin() . '</pin>';
1492
  }
1501
  if ($result->getStatus() == Novalnet_Payment_Model_Config::METHOD_DISABLE_CODE) {
1502
  $methodSession->$setNnDisableTime(time() + (30 * 60));
1503
  }
1504
+ $error = ($result->getStatusDesc() || $result->getStatusMessage())
1505
+ ? $this->helper->htmlEscape($result->getStatusMessage() . $result->getStatusDesc())
1506
+ : $this->helper->htmlEscape($result->pinStatus['status_message']);
1507
  $this->showException($error, false);
1508
  }
1509
  }
1513
  * Log novalnet transaction data
1514
  *
1515
  */
1516
+ public function logNovalnetTransactionData($request, $response, $txnId,
1517
+ $customerId = NULL, $storeId = NULL
1518
+ ) {
1519
+ $this->dataHelper->doRemoveSensitiveData($request, $this->_code);
1520
+ $shopUrl = ($response->getMemburl()) ? $response->getMemburl() : $this->helper->getCurrentSiteUrl();
1521
+ $customerId = ($customerId) ? $customerId : $this->helper->getCustomerId();
1522
+ $storeId = ($storeId) ? $storeId : $this->helper->getMagentoStoreId();
1523
+ $modNnTransOverview = $this->helper->getModelTransactionOverview();
1524
+ $modNnTransOverview->setTransactionId($txnId)
1525
  ->setOrderId($this->_getOrderId())
1526
  ->setRequestData(serialize($request->getData()))
1527
  ->setResponseData(serialize($response->getData()))
1529
  ->setStatus($response->getStatus())
1530
  ->setStoreId($storeId)
1531
  ->setShopUrl($shopUrl)
1532
+ ->setCreatedDate($this->helper->getCurrentDateTime())
1533
  ->save();
1534
  }
1535
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1536
  /**
1537
  * validate basic params to load Cc & SEPA Iframe
1538
  *
1539
  * @return bool
1540
  */
1541
+ public function validateNovalnetIframeParams()
1542
+ {
1543
+ $helper = $this->helper;
1544
+ $amount = $helper->getFormatedAmount($this->_getAmount());
1545
+ $manualCheckAmt = (int) $this->_getConfigData('manual_checking_amount');
1546
+ if (!$helper->checkIsNumeric($this->_vendorId) || !$this->_authcode || !$helper->checkIsNumeric($this->_productId)) {
1547
  return false;
1548
+ } elseif ($manualCheckAmt && (!$helper->checkIsNumeric($manualCheckAmt) || ($amount
1549
+ > $manualCheckAmt) && !$helper->checkIsNumeric($this->_getConfigData('second_product_id')))) {
1550
  return false;
1551
  }
1552
+ $this->_manualCheckValidate();
1553
  return true;
1554
  }
1555
 
1556
  /**
1557
+ * Get current info-instance
1558
  *
1559
  * @return Mage_Payment_Model_Method_Abstract
1560
  */
1561
+ private function _getInfoInstance()
1562
+ {
1563
  if (!isset($this->infoInstance)) {
1564
  $this->infoInstance = $this->getInfoInstance();
1565
  }
1571
  *
1572
  * @return Mage_Payment_Model_Method_Abstract
1573
  */
1574
+ private function _getInfoObject()
1575
+ {
1576
  $info = $this->_getInfoInstance();
1577
  if ($this->_isPlaceOrder()) {
1578
  return $info->getOrder();
1586
  *
1587
  * @return bool
1588
  */
1589
+ private function _isPlaceOrder()
1590
+ {
1591
  $info = $this->_getInfoInstance();
1592
  if ($info instanceof Mage_Sales_Model_Quote_Payment) {
1593
  return false;
1601
  *
1602
  * @return string
1603
  */
1604
+ private function _getAmount()
1605
+ {
1606
  $info = $this->_getInfoInstance();
1607
  if ($this->_isPlaceOrder()) {
1608
  return (double) $info->getOrder()->getBaseGrandTotal();
1616
  *
1617
  * @return string
1618
  */
1619
+ private function _getOrderId()
1620
+ {
1621
  $info = $this->_getInfoInstance();
1622
  if ($this->_isPlaceOrder()) {
1623
  return $info->getOrder()->getIncrementId();
1626
  }
1627
  }
1628
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1629
  /**
1630
  * Retrieve model helper
1631
  *
1632
+ * @return Novalnet_Paymenthelper_Data
1633
  */
1634
+ protected function _getHelper()
1635
+ {
1636
  return Mage::helper('novalnet_payment');
1637
  }
1638
 
1639
  /**
1640
  * Retrieve Assign data helper
1641
  *
1642
+ * @return Novalnet_Paymenthelper_AssignData
1643
  */
1644
+ protected function _getDataHelper()
1645
+ {
1646
  return Mage::helper('novalnet_payment/AssignData');
1647
  }
1648
 
1649
+ /**
1650
+ * Show exception
1651
  *
1652
+ * @param $string
1653
+ * @param $lang
1654
  * @return Mage::throwException
1655
  */
1656
+ public function showException($string, $lang = true)
1657
+ {
1658
+ if ($lang) {
1659
+ $string = $this->helper->__($string);
1660
+ }
1661
 
1662
+ return Mage::throwException($string);
1663
+ }
1664
 
1665
+ /**
1666
  * Assign helper utilities needed for the payment process
1667
  *
1668
  */
1669
+ public function assignUtilities()
1670
+ {
1671
+ if (!$this->helper) {
1672
+ $this->helper = $this->_getHelper();
1673
+ }
1674
+ if (!$this->dataHelper) {
1675
+ $this->dataHelper = $this->_getDataHelper();
1676
+ }
1677
+ }
1678
+
1679
+ /**
1680
+ * Get redirect URL
1681
+ *
1682
+ * @return Mage_Paymenthelper_Data
1683
+ */
1684
+ public function getOrderPlaceRedirectUrl()
1685
+ {
1686
+ $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
1687
+ if ((in_array($this->_code, $redirectPayment)) || ($this->_code == Novalnet_Payment_Model_Config::NN_CC
1688
+ && !$this->helper->checkIsAdmin() && $this->_getConfigData('active_cc3d')
1689
+ == 1)) {
1690
+ $actionUrl = $this->_getHelper()->getUrl(Novalnet_Payment_Model_Config::GATEWAY_REDIRECT_URL);
1691
+ } else {
1692
+ $actionUrl = $this->_getHelper()->getUrl(Novalnet_Payment_Model_Config::GATEWAY_DIRECT_URL);
1693
+ }
1694
+ return $actionUrl;
1695
+ }
1696
+
1697
  }
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetCc.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,7 +23,8 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Payment_Method_NovalnetCc extends Novalnet_Payment_Model_Payment_Method_Abstract {
 
28
 
29
  protected $_code = Novalnet_Payment_Model_Config::NN_CC;
30
  protected $_canCapture = Novalnet_Payment_Model_Config::NN_CC_CAN_CAPTURE;
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Payment_Method_NovalnetCc extends Novalnet_Payment_Model_Payment_Method_Abstract
27
+ {
28
 
29
  protected $_code = Novalnet_Payment_Model_Config::NN_CC;
30
  protected $_canCapture = Novalnet_Payment_Model_Config::NN_CC_CAN_CAPTURE;
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetElvaustria.php DELETED
@@ -1,35 +0,0 @@
1
- <?php
2
-
3
- /**
4
- * Magento
5
- *
6
- * NOTICE OF LICENSE
7
- *
8
- * This source file is subject to the Open Software License (OSL 3.0)
9
- * that is bundled with this package in the file LICENSE.txt.
10
- * It is also available through the world-wide-web at this URL:
11
- * http://opensource.org/licenses/osl-3.0.php
12
- * If you did not receive a copy of the license and are unable to
13
- * obtain it through the world-wide-web, please send an email
14
- * to license@magentocommerce.com so we can send you a copy immediately.
15
- *
16
- * Part of the Paymentmodule of Novalnet AG
17
- * https://www.novalnet.de
18
- * If you have found this script usefull a small
19
- * recommendation as well as a comment on merchant form
20
- * would be greatly appreciated.
21
- *
22
- * @category Novalnet
23
- * @package Novalnet_Payment
24
- * @copyright Novalnet AG
25
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
- */
27
- class Novalnet_Payment_Model_Payment_Method_NovalnetElvaustria extends Novalnet_Payment_Model_Payment_Method_Abstract {
28
-
29
- protected $_code = Novalnet_Payment_Model_Config::NN_ELVAT;
30
- protected $_canCapture = Novalnet_Payment_Model_Config::NN_ELVAT_CAN_CAPTURE;
31
- protected $_canUseForMultishipping = Novalnet_Payment_Model_Config::NN_ELVAT_CAN_USE_MULTISHIPPING;
32
- protected $_formBlockType = Novalnet_Payment_Model_Config::NN_ELVAT_FORM_BLOCK;
33
- protected $_infoBlockType = Novalnet_Payment_Model_Config::NN_ELVAT_INFO_BLOCK;
34
-
35
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetIdeal.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,7 +23,8 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Payment_Method_NovalnetIdeal extends Novalnet_Payment_Model_Payment_Method_Abstract {
 
28
 
29
  protected $_code = Novalnet_Payment_Model_Config::NN_IDEAL;
30
  protected $_canCapture = Novalnet_Payment_Model_Config::NN_IDEAL_CAN_CAPTURE;
@@ -34,12 +34,4 @@ class Novalnet_Payment_Model_Payment_Method_NovalnetIdeal extends Novalnet_Payme
34
  protected $_formBlockType = Novalnet_Payment_Model_Config::NN_IDEAL_FORM_BLOCK;
35
  protected $_infoBlockType = Novalnet_Payment_Model_Config::NN_IDEAL_INFO_BLOCK;
36
 
37
- /**
38
- * Get redirect URL
39
- *
40
- * @return Mage_Payment_Helper_Data
41
- */
42
- public function getOrderPlaceRedirectUrl() {
43
- return $this->_getHelper()->getUrl(Novalnet_Payment_Model_Config::GATEWAY_REDIRECT_URL);
44
- }
45
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Payment_Method_NovalnetIdeal extends Novalnet_Payment_Model_Payment_Method_Abstract
27
+ {
28
 
29
  protected $_code = Novalnet_Payment_Model_Config::NN_IDEAL;
30
  protected $_canCapture = Novalnet_Payment_Model_Config::NN_IDEAL_CAN_CAPTURE;
34
  protected $_formBlockType = Novalnet_Payment_Model_Config::NN_IDEAL_FORM_BLOCK;
35
  protected $_infoBlockType = Novalnet_Payment_Model_Config::NN_IDEAL_INFO_BLOCK;
36
 
 
 
 
 
 
 
 
 
37
  }
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetInvoice.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,7 +23,8 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Payment_Method_NovalnetInvoice extends Novalnet_Payment_Model_Payment_Method_Abstract {
 
28
 
29
  protected $_code = Novalnet_Payment_Model_Config::NN_INVOICE;
30
  protected $_canCapture = Novalnet_Payment_Model_Config::NN_INVOICE_CAN_CAPTURE;
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Payment_Method_NovalnetInvoice extends Novalnet_Payment_Model_Payment_Method_Abstract
27
+ {
28
 
29
  protected $_code = Novalnet_Payment_Model_Config::NN_INVOICE;
30
  protected $_canCapture = Novalnet_Payment_Model_Config::NN_INVOICE_CAN_CAPTURE;
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetPaypal.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,7 +23,8 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Payment_Method_NovalnetPaypal extends Novalnet_Payment_Model_Payment_Method_Abstract {
 
28
 
29
  protected $_code = Novalnet_Payment_Model_Config::NN_PAYPAL;
30
  protected $_canCapture = Novalnet_Payment_Model_Config::NN_PAYPAL_CAN_CAPTURE;
@@ -34,12 +34,4 @@ class Novalnet_Payment_Model_Payment_Method_NovalnetPaypal extends Novalnet_Paym
34
  protected $_formBlockType = Novalnet_Payment_Model_Config::NN_PAYPAL_FORM_BLOCK;
35
  protected $_infoBlockType = Novalnet_Payment_Model_Config::NN_PAYPAL_INFO_BLOCK;
36
 
37
- /**
38
- * Get redirect URL
39
- *
40
- * @return Mage_Payment_Helper_Data
41
- */
42
- public function getOrderPlaceRedirectUrl() {
43
- return $this->_getHelper()->getUrl(Novalnet_Payment_Model_Config::GATEWAY_REDIRECT_URL);
44
- }
45
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Payment_Method_NovalnetPaypal extends Novalnet_Payment_Model_Payment_Method_Abstract
27
+ {
28
 
29
  protected $_code = Novalnet_Payment_Model_Config::NN_PAYPAL;
30
  protected $_canCapture = Novalnet_Payment_Model_Config::NN_PAYPAL_CAN_CAPTURE;
34
  protected $_formBlockType = Novalnet_Payment_Model_Config::NN_PAYPAL_FORM_BLOCK;
35
  protected $_infoBlockType = Novalnet_Payment_Model_Config::NN_PAYPAL_INFO_BLOCK;
36
 
 
 
 
 
 
 
 
 
37
  }
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetPhonepayment.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,7 +23,8 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Payment_Method_NovalnetPhonepayment extends Novalnet_Payment_Model_Payment_Method_Abstract {
 
28
 
29
  protected $_code = Novalnet_Payment_Model_Config::NN_TELEPHONE;
30
  protected $_canCapture = Novalnet_Payment_Model_Config::NN_TELEPHONE_CAN_CAPTURE;
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Payment_Method_NovalnetPhonepayment extends Novalnet_Payment_Model_Payment_Method_Abstract
27
+ {
28
 
29
  protected $_code = Novalnet_Payment_Model_Config::NN_TELEPHONE;
30
  protected $_canCapture = Novalnet_Payment_Model_Config::NN_TELEPHONE_CAN_CAPTURE;
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetPrepayment.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,7 +23,8 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Payment_Method_NovalnetPrepayment extends Novalnet_Payment_Model_Payment_Method_Abstract {
 
28
 
29
  protected $_code = Novalnet_Payment_Model_Config::NN_PREPAYMENT;
30
  protected $_canCapture = Novalnet_Payment_Model_Config::NN_PREPAYMENT_CAN_CAPTURE;
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Payment_Method_NovalnetPrepayment extends Novalnet_Payment_Model_Payment_Method_Abstract
27
+ {
28
 
29
  protected $_code = Novalnet_Payment_Model_Config::NN_PREPAYMENT;
30
  protected $_canCapture = Novalnet_Payment_Model_Config::NN_PREPAYMENT_CAN_CAPTURE;
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetSafetypay.php DELETED
@@ -1,45 +0,0 @@
1
- <?php
2
-
3
- /**
4
- * Magento
5
- *
6
- * NOTICE OF LICENSE
7
- *
8
- * This source file is subject to the Open Software License (OSL 3.0)
9
- * that is bundled with this package in the file LICENSE.txt.
10
- * It is also available through the world-wide-web at this URL:
11
- * http://opensource.org/licenses/osl-3.0.php
12
- * If you did not receive a copy of the license and are unable to
13
- * obtain it through the world-wide-web, please send an email
14
- * to license@magentocommerce.com so we can send you a copy immediately.
15
- *
16
- * Part of the Paymentmodule of Novalnet AG
17
- * https://www.novalnet.de
18
- * If you have found this script usefull a small
19
- * recommendation as well as a comment on merchant form
20
- * would be greatly appreciated.
21
- *
22
- * @category Novalnet
23
- * @package Novalnet_Payment
24
- * @copyright Novalnet AG
25
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
- */
27
- class Novalnet_Payment_Model_Payment_Method_NovalnetSafetypay extends Novalnet_Payment_Model_Payment_Method_Abstract {
28
-
29
- protected $_code = Novalnet_Payment_Model_Config::NN_SAFETYPAY;
30
- protected $_canCapture = Novalnet_Payment_Model_Config::NN_SAFETYPAY_CAN_CAPTURE;
31
- protected $_canRefund = Novalnet_Payment_Model_Config::NN_SAFETYPAY_CAN_REFUND;
32
- protected $_canUseInternal = Novalnet_Payment_Model_Config::NN_SAFETYPAY_CAN_USE_INTERNAL;
33
- protected $_canUseForMultishipping = Novalnet_Payment_Model_Config::NN_SAFETYPAY_CAN_USE_MULTISHIPPING;
34
- protected $_formBlockType = Novalnet_Payment_Model_Config::NN_SAFETYPAY_FORM_BLOCK;
35
- protected $_infoBlockType = Novalnet_Payment_Model_Config::NN_SAFETYPAY_INFO_BLOCK;
36
-
37
- /**
38
- * Get redirect URL
39
- *
40
- * @return Mage_Payment_Helper_Data
41
- */
42
- public function getOrderPlaceRedirectUrl() {
43
- return $this->_getHelper()->getUrl(Novalnet_Payment_Model_Config::GATEWAY_REDIRECT_URL);
44
- }
45
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetSecure.php DELETED
@@ -1,45 +0,0 @@
1
- <?php
2
-
3
- /**
4
- * Magento
5
- *
6
- * NOTICE OF LICENSE
7
- *
8
- * This source file is subject to the Open Software License (OSL 3.0)
9
- * that is bundled with this package in the file LICENSE.txt.
10
- * It is also available through the world-wide-web at this URL:
11
- * http://opensource.org/licenses/osl-3.0.php
12
- * If you did not receive a copy of the license and are unable to
13
- * obtain it through the world-wide-web, please send an email
14
- * to license@magentocommerce.com so we can send you a copy immediately.
15
- *
16
- * Part of the Paymentmodule of Novalnet AG
17
- * https://www.novalnet.de
18
- * If you have found this script usefull a small
19
- * recommendation as well as a comment on merchant form
20
- * would be greatly appreciated.
21
- *
22
- * @category Novalnet
23
- * @package Novalnet_Payment
24
- * @copyright Novalnet AG
25
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
- */
27
- class Novalnet_Payment_Model_Payment_Method_NovalnetSecure extends Novalnet_Payment_Model_Payment_Method_Abstract {
28
-
29
- protected $_code = Novalnet_Payment_Model_Config::NN_CC3D;
30
- protected $_canAuthorize = Novalnet_Payment_Model_Config::NN_CC3D_CAN_AUTHORIZE;
31
- protected $_canCapture = Novalnet_Payment_Model_Config::NN_CC3D_CAN_CAPTURE;
32
- protected $_canUseInternal = Novalnet_Payment_Model_Config::NN_CC3D_CAN_USE_INTERNAL;
33
- protected $_canUseForMultishipping = Novalnet_Payment_Model_Config::NN_CC3D_CAN_USE_MULTISHIPPING;
34
- protected $_formBlockType = Novalnet_Payment_Model_Config::NN_CC3D_FORM_BLOCK;
35
- protected $_infoBlockType = Novalnet_Payment_Model_Config::NN_CC3D_INFO_BLOCK;
36
-
37
- /**
38
- * Get redirect URL
39
- *
40
- * @return Mage_Payment_Helper_Data
41
- */
42
- public function getOrderPlaceRedirectUrl() {
43
- return $this->_getHelper()->getUrl(Novalnet_Payment_Model_Config::GATEWAY_REDIRECT_URL);
44
- }
45
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetSepa.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,7 +23,8 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Payment_Method_NovalnetSepa extends Novalnet_Payment_Model_Payment_Method_Abstract {
 
28
 
29
  protected $_code = Novalnet_Payment_Model_Config::NN_SEPA;
30
  protected $_canCapture = Novalnet_Payment_Model_Config::NN_SEPA_CAN_CAPTURE;
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Payment_Method_NovalnetSepa extends Novalnet_Payment_Model_Payment_Method_Abstract
27
+ {
28
 
29
  protected $_code = Novalnet_Payment_Model_Config::NN_SEPA;
30
  protected $_canCapture = Novalnet_Payment_Model_Config::NN_SEPA_CAN_CAPTURE;
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetSofortueberweisung.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,7 +23,8 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Payment_Method_NovalnetSofortueberweisung extends Novalnet_Payment_Model_Payment_Method_Abstract {
 
28
 
29
  protected $_code = Novalnet_Payment_Model_Config::NN_SOFORT;
30
  protected $_canCapture = Novalnet_Payment_Model_Config::NN_SOFORT_CAN_CAPTURE;
@@ -34,12 +34,4 @@ class Novalnet_Payment_Model_Payment_Method_NovalnetSofortueberweisung extends N
34
  protected $_formBlockType = Novalnet_Payment_Model_Config::NN_SOFORT_FORM_BLOCK;
35
  protected $_infoBlockType = Novalnet_Payment_Model_Config::NN_SOFORT_INFO_BLOCK;
36
 
37
- /**
38
- * Get redirect URL
39
- *
40
- * @return Mage_Payment_Helper_Data
41
- */
42
- public function getOrderPlaceRedirectUrl() {
43
- return $this->_getHelper()->getUrl(Novalnet_Payment_Model_Config::GATEWAY_REDIRECT_URL);
44
- }
45
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Payment_Method_NovalnetSofortueberweisung extends Novalnet_Payment_Model_Payment_Method_Abstract
27
+ {
28
 
29
  protected $_code = Novalnet_Payment_Model_Config::NN_SOFORT;
30
  protected $_canCapture = Novalnet_Payment_Model_Config::NN_SOFORT_CAN_CAPTURE;
34
  protected $_formBlockType = Novalnet_Payment_Model_Config::NN_SOFORT_FORM_BLOCK;
35
  protected $_infoBlockType = Novalnet_Payment_Model_Config::NN_SOFORT_INFO_BLOCK;
36
 
 
 
 
 
 
 
 
 
37
  }
app/code/community/Novalnet/Payment/Model/Resource/Callback.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Resource_Callback extends Mage_Core_Model_Mysql4_Abstract {
 
28
 
29
  /**
30
  *
31
  */
32
- public function _construct() {
 
33
  $this->_init('novalnet_payment/callback', 'id');
34
  }
35
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Resource_Callback extends Mage_Core_Model_Mysql4_Abstract
27
+ {
28
 
29
  /**
30
  *
31
  */
32
+ public function _construct()
33
+ {
34
  $this->_init('novalnet_payment/callback', 'id');
35
  }
36
 
app/code/community/Novalnet/Payment/Model/Resource/Callback/Collection.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Resource_Callback_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract {
 
28
 
29
  /**
30
  *
31
  */
32
- public function _construct() {
 
33
  $this->_init('novalnet_payment/callback');
34
  }
35
 
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Resource_Callback_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
27
+ {
28
 
29
  /**
30
  *
31
  */
32
+ public function _construct()
33
+ {
34
  $this->_init('novalnet_payment/callback');
35
  }
36
 
app/code/community/Novalnet/Payment/Model/Resource/Transactionoverview.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,13 +23,15 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Resource_Transactionoverview extends Mage_Core_Model_Mysql4_Abstract {
 
28
 
29
  /**
30
  *
31
  */
32
- public function _construct() {
 
33
  $this->_init('novalnet_payment/order_log', 'nn_log_id');
34
  }
35
 
36
- }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Resource_Transactionoverview extends Mage_Core_Model_Mysql4_Abstract
27
+ {
28
 
29
  /**
30
  *
31
  */
32
+ public function _construct()
33
+ {
34
  $this->_init('novalnet_payment/order_log', 'nn_log_id');
35
  }
36
 
37
+ }
app/code/community/Novalnet/Payment/Model/Resource/Transactionoverview/Collection.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Resource_Transactionoverview_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract {
 
28
 
29
  /**
30
  *
31
  */
32
- public function _construct() {
 
33
  $this->_init('novalnet_payment/transactionoverview');
34
  }
35
 
@@ -37,8 +38,9 @@ class Novalnet_Payment_Model_Resource_Transactionoverview_Collection extends Mag
37
  * @param Mage_Sales_Model_Order $order
38
  * @return void
39
  */
40
- public function getByOrder(Mage_Sales_Model_Order $order) {
41
- $this->addFieldToFilter('order_id', $order->getIncrementId());
 
42
  }
43
 
44
- }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Resource_Transactionoverview_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
27
+ {
28
 
29
  /**
30
  *
31
  */
32
+ public function _construct()
33
+ {
34
  $this->_init('novalnet_payment/transactionoverview');
35
  }
36
 
38
  * @param Mage_Sales_Model_Order $order
39
  * @return void
40
  */
41
+ public function getByOrder(Mage_Sales_Model_Order $order)
42
+ {
43
+ $this->addFieldToFilter('order_id', $order->getIncrementId());
44
  }
45
 
46
+ }
app/code/community/Novalnet/Payment/Model/Resource/Transactionstatus.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,13 +23,15 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Resource_Transactionstatus extends Mage_Core_Model_Mysql4_Abstract {
 
28
 
29
  /**
30
  *
31
  */
32
- public function _construct() {
 
33
  $this->_init('novalnet_payment/transaction_status', 'nn_txn_id');
34
  }
35
 
36
- }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Resource_Transactionstatus extends Mage_Core_Model_Mysql4_Abstract
27
+ {
28
 
29
  /**
30
  *
31
  */
32
+ public function _construct()
33
+ {
34
  $this->_init('novalnet_payment/transaction_status', 'nn_txn_id');
35
  }
36
 
37
+ }
app/code/community/Novalnet/Payment/Model/Resource/Transactionstatus/Collection.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Resource_Transactionstatus_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract {
 
28
 
29
  /**
30
  *
31
  */
32
- public function _construct() {
 
33
  $this->_init('novalnet_payment/transactionstatus');
34
  }
35
 
@@ -37,8 +38,9 @@ class Novalnet_Payment_Model_Resource_Transactionstatus_Collection extends Mage_
37
  * @param Mage_Sales_Model_Order $order
38
  * @return void
39
  */
40
- public function getByOrder(Mage_Sales_Model_Order $order) {
41
- $this->addFieldToFilter('order_id', $order->getIncrementId());
 
42
  }
43
 
44
- }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Resource_Transactionstatus_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
27
+ {
28
 
29
  /**
30
  *
31
  */
32
+ public function _construct()
33
+ {
34
  $this->_init('novalnet_payment/transactionstatus');
35
  }
36
 
38
  * @param Mage_Sales_Model_Order $order
39
  * @return void
40
  */
41
+ public function getByOrder(Mage_Sales_Model_Order $order)
42
+ {
43
+ $this->addFieldToFilter('order_id', $order->getIncrementId());
44
  }
45
 
46
+ }
app/code/community/Novalnet/Payment/Model/System/Config/Activemethods.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,34 +23,35 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_System_Config_Activemethods {
 
28
 
29
- public function toOptionArray() {
 
30
  $methods = array();
31
  $activePayment = false;
32
  $inactivePayment = false;
33
-
34
- if (strlen($code = Mage::app()->getRequest()->getParam('store'))) { // store level
35
- $scopeId = Mage::getModel('core/store')->load($code)->getId();
36
- }
37
- elseif (strlen($code = Mage::app()->getRequest()->getParam('website'))) { // website level
38
- $website_id = Mage::getModel('core/website')->load($code)->getId();
39
- $scopeId = Mage::app()->getWebsite($website_id)->getDefaultStore()->getId();
40
- }
41
- else { // default level
42
- $scopeId = 0;
43
- }
44
 
45
  $payments = Mage::getSingleton('payment/config')->getActiveMethods($scopeId);
46
- foreach ($payments as $paymentCode => $paymentModel) {
47
-
 
48
  if (preg_match("/novalnet/i", $paymentCode)) {
49
 
50
  $paymentActive = Mage::getStoreConfig('payment/' . $paymentCode . '/active', $scopeId);
51
  if ($paymentActive == true) {
52
- $paymentTitle = Mage::getStoreConfig('payment/' . $paymentCode . '/title', $scopeId);
53
  $methods[$paymentCode] = array(
54
- 'label' => $paymentTitle,
55
  'value' => $paymentCode,
56
  );
57
  $activePayment = true;
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_System_Config_Activemethods
27
+ {
28
 
29
+ public function toOptionArray()
30
+ {
31
  $methods = array();
32
  $activePayment = false;
33
  $inactivePayment = false;
34
+
35
+ if (strlen($code = Mage::app()->getRequest()->getParam('store'))) { // store level
36
+ $scopeId = Mage::getModel('core/store')->load($code)->getId();
37
+ } elseif (strlen($code = Mage::app()->getRequest()->getParam('website'))) { // website level
38
+ $websiteId = Mage::getModel('core/website')->load($code)->getId();
39
+ $scopeId = Mage::app()->getWebsite($websiteId)->getDefaultStore()->getId();
40
+ } else { // default level
41
+ $scopeId = 0;
42
+ }
 
 
43
 
44
  $payments = Mage::getSingleton('payment/config')->getActiveMethods($scopeId);
45
+ $novalnetPaymentMethods = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('novalnetPaymentMethods');
46
+ foreach ($payments as $paymentCode => $paymentModel) {
47
+
48
  if (preg_match("/novalnet/i", $paymentCode)) {
49
 
50
  $paymentActive = Mage::getStoreConfig('payment/' . $paymentCode . '/active', $scopeId);
51
  if ($paymentActive == true) {
52
+ $paymentMethod = Mage::helper('novalnet_payment')->__($novalnetPaymentMethods[$paymentCode]);
53
  $methods[$paymentCode] = array(
54
+ 'label' => $paymentMethod,
55
  'value' => $paymentCode,
56
  );
57
  $activePayment = true;
app/code/community/Novalnet/Payment/Model/Transactionoverview.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Transactionoverview extends Mage_Core_Model_Abstract {
 
28
 
29
  /**
30
  *
31
  */
32
- public function _construct() {
 
33
  parent::_construct();
34
  $this->_init('novalnet_payment/transactionoverview');
35
  }
@@ -41,30 +42,16 @@ class Novalnet_Payment_Model_Transactionoverview extends Mage_Core_Model_Abstrac
41
  * @param string $value
42
  * @return Novalnet_Payment_Model_Source_Transactionoverview
43
  */
44
- public function loadByAttribute($attribute, $value) {
 
45
  $this->load($value, $attribute);
46
  return $this;
47
  }
48
 
49
- /**
50
- * @param Mage_Sales_Model_Order_Payment $payment
51
- * @return Novalnet_Payment_Model_Transactionoverview
52
- */
53
- public function loadByPayment(Mage_Sales_Model_Order_Payment $payment) {
54
- if ($payment->getOrder()->getIncrementId()) {
55
- $this->load($payment->getOrder()->getIncrementId(), 'order_id');
56
- }
57
- return $this;
58
- }
59
-
60
- public function loadByOrderLogId(Novalnet_Payment_Model_Transactionoverview $orderLog) {
61
  $this->load($orderLog->getNnLogId(), 'nn_log_id');
62
  return $this;
63
  }
64
 
65
- public function loadLogByOrderId($orderId) {
66
- $this->load($orderId, 'order_id');
67
- return $this;
68
- }
69
-
70
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Transactionoverview extends Mage_Core_Model_Abstract
27
+ {
28
 
29
  /**
30
  *
31
  */
32
+ public function _construct()
33
+ {
34
  parent::_construct();
35
  $this->_init('novalnet_payment/transactionoverview');
36
  }
42
  * @param string $value
43
  * @return Novalnet_Payment_Model_Source_Transactionoverview
44
  */
45
+ public function loadByAttribute($attribute, $value)
46
+ {
47
  $this->load($value, $attribute);
48
  return $this;
49
  }
50
 
51
+ public function loadByOrderLogId(Novalnet_Payment_Model_Transactionoverview $orderLog)
52
+ {
 
 
 
 
 
 
 
 
 
 
53
  $this->load($orderLog->getNnLogId(), 'nn_log_id');
54
  return $this;
55
  }
56
 
 
 
 
 
 
57
  }
app/code/community/Novalnet/Payment/Model/Transactionstatus.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Model_Transactionstatus extends Mage_Core_Model_Abstract {
 
28
 
29
  /**
30
  *
31
  */
32
- public function _construct() {
 
33
  parent::_construct();
34
  $this->_init('novalnet_payment/transactionstatus');
35
  }
@@ -41,30 +42,16 @@ class Novalnet_Payment_Model_Transactionstatus extends Mage_Core_Model_Abstract
41
  * @param string $value
42
  * @return Novalnet_Payment_Model_Source_Transactionstatus
43
  */
44
- public function loadByAttribute($attribute, $value) {
 
45
  $this->load($value, $attribute);
46
  return $this;
47
  }
48
 
49
- /**
50
- * @param Mage_Sales_Model_Order_Payment $payment
51
- * @return Novalnet_Payment_Model_Transactionstatus
52
- */
53
- public function loadByPayment(Mage_Sales_Model_Order_Payment $payment) {
54
- if ($payment->getOrder()->getIncrementId()) {
55
- $this->load($payment->getOrder()->getIncrementId(), 'order_id');
56
- }
57
- return $this;
58
- }
59
-
60
- public function loadByTransactionStatusId(Novalnet_Payment_Model_Transactionstatus $transactionStatus) {
61
  $this->load($transactionStatus->getNnTxnId(), 'nn_txn_id');
62
  return $this;
63
  }
64
-
65
- public function loadLogByOrderId($orderId) {
66
- $this->load($orderId, 'order_id');
67
- return $this;
68
- }
69
 
70
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Transactionstatus extends Mage_Core_Model_Abstract
27
+ {
28
 
29
  /**
30
  *
31
  */
32
+ public function _construct()
33
+ {
34
  parent::_construct();
35
  $this->_init('novalnet_payment/transactionstatus');
36
  }
42
  * @param string $value
43
  * @return Novalnet_Payment_Model_Source_Transactionstatus
44
  */
45
+ public function loadByAttribute($attribute, $value)
46
+ {
47
  $this->load($value, $attribute);
48
  return $this;
49
  }
50
 
51
+ public function loadByTransactionStatusId(Novalnet_Payment_Model_Transactionstatus $transactionStatus)
52
+ {
 
 
 
 
 
 
 
 
 
 
53
  $this->load($transactionStatus->getNnTxnId(), 'nn_txn_id');
54
  return $this;
55
  }
 
 
 
 
 
56
 
57
  }
app/code/community/Novalnet/Payment/controllers/Adminhtml/Configuration/Wizard/PageController.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,9 +23,11 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Adminhtml_Configuration_Wizard_PageController extends Mage_Adminhtml_Controller_Action {
 
28
 
29
- protected function _initAction() {
 
30
  $this->loadLayout();
31
  $this->setUsedModuleName('novalnet_payment');
32
  $this->_setActiveMenu('novalnet/configuration');
@@ -37,26 +38,31 @@ class Novalnet_Payment_Adminhtml_Configuration_Wizard_PageController extends Mag
37
  return $this;
38
  }
39
 
40
- public function indexAction() {
 
41
  $this->initConfig('index');
42
 
43
  $this->_initAction();
44
  $this->renderLayout();
45
  }
46
 
47
- protected function initConfig($actionName) {
 
48
  return $this->helperWizard()->initConfig($actionName, $this->getRequest());
49
  }
50
 
51
- public function helperWizard() {
 
52
  return Mage::helper('novalnet_payment');
53
  }
54
 
55
- public function generalGlobalAction() {
 
56
  $this->_editAction('generalGlobal');
57
  }
58
 
59
- protected function _editAction($actionName) {
 
60
  $this->initConfig($actionName);
61
 
62
  $configPage = Mage::registry('novalnet_wizard_config_page');
@@ -70,12 +76,14 @@ class Novalnet_Payment_Adminhtml_Configuration_Wizard_PageController extends Mag
70
  $this->renderLayout();
71
  }
72
 
73
- public function _redirectByPageConfig() {
 
74
  $url = $this->helperWizard()->getNextPageUrlAsString();
75
  $this->_redirect($url, array('_current' => true));
76
  }
77
 
78
- public function saveAction() {
 
79
  $pageCode = $this->getRequest()->getParam('page_code');
80
 
81
  $config = $this->initConfig($pageCode);
@@ -109,4 +117,4 @@ class Novalnet_Payment_Adminhtml_Configuration_Wizard_PageController extends Mag
109
  $this->_redirectByPageConfig();
110
  }
111
 
112
- }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Adminhtml_Configuration_Wizard_PageController extends Mage_Adminhtml_Controller_Action
27
+ {
28
 
29
+ protected function _initAction()
30
+ {
31
  $this->loadLayout();
32
  $this->setUsedModuleName('novalnet_payment');
33
  $this->_setActiveMenu('novalnet/configuration');
38
  return $this;
39
  }
40
 
41
+ public function indexAction()
42
+ {
43
  $this->initConfig('index');
44
 
45
  $this->_initAction();
46
  $this->renderLayout();
47
  }
48
 
49
+ protected function initConfig($actionName)
50
+ {
51
  return $this->helperWizard()->initConfig($actionName, $this->getRequest());
52
  }
53
 
54
+ public function helperWizard()
55
+ {
56
  return Mage::helper('novalnet_payment');
57
  }
58
 
59
+ public function generalGlobalAction()
60
+ {
61
  $this->_editAction('generalGlobal');
62
  }
63
 
64
+ protected function _editAction($actionName)
65
+ {
66
  $this->initConfig($actionName);
67
 
68
  $configPage = Mage::registry('novalnet_wizard_config_page');
76
  $this->renderLayout();
77
  }
78
 
79
+ public function _redirectByPageConfig()
80
+ {
81
  $url = $this->helperWizard()->getNextPageUrlAsString();
82
  $this->_redirect($url, array('_current' => true));
83
  }
84
 
85
+ public function saveAction()
86
+ {
87
  $pageCode = $this->getRequest()->getParam('page_code');
88
 
89
  $config = $this->initConfig($pageCode);
117
  $this->_redirectByPageConfig();
118
  }
119
 
120
+ }
app/code/community/Novalnet/Payment/controllers/Adminhtml/InformationController.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Adminhtml_InformationController extends Mage_Adminhtml_Controller_Action {
 
28
 
29
  /**
30
  *
31
  */
32
- public function indexAction() {
 
33
  $this->loadLayout();
34
  $this->setUsedModuleName('novalnet_payment');
35
  $this->_setActiveMenu('novalnet/information');
@@ -38,4 +39,4 @@ class Novalnet_Payment_Adminhtml_InformationController extends Mage_Adminhtml_Co
38
  $this->renderLayout();
39
  }
40
 
41
- }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Adminhtml_InformationController extends Mage_Adminhtml_Controller_Action
27
+ {
28
 
29
  /**
30
  *
31
  */
32
+ public function indexAction()
33
+ {
34
  $this->loadLayout();
35
  $this->setUsedModuleName('novalnet_payment');
36
  $this->_setActiveMenu('novalnet/information');
39
  $this->renderLayout();
40
  }
41
 
42
+ }
app/code/community/Novalnet/Payment/controllers/Adminhtml/NovalnetCcController.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,14 +23,17 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Adminhtml_NovalnetCcController extends Mage_Adminhtml_Controller_Action {
 
28
 
29
- public function indexAction() {
 
30
  //Loading current layout
31
  $this->loadLayout();
32
 
33
  //Creating a new block
34
- $block = $this->getLayout()->createBlock('Mage_Core_Block_Template', 'CcForm', array('template' => 'novalnet/payment/method/form/Ccform.phtml'));
 
35
  $this->getLayout()->getBlock('content')->append($block);
36
 
37
  // TO avoid Background and to load our form in empty page
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Adminhtml_NovalnetCcController extends Mage_Adminhtml_Controller_Action
27
+ {
28
 
29
+ public function indexAction()
30
+ {
31
  //Loading current layout
32
  $this->loadLayout();
33
 
34
  //Creating a new block
35
+ $block = $this->getLayout()->createBlock('Mage_Core_Block_Template', 'CcForm', array(
36
+ 'template' => 'novalnet/payment/method/form/Ccform.phtml'));
37
  $this->getLayout()->getBlock('content')->append($block);
38
 
39
  // TO avoid Background and to load our form in empty page
app/code/community/Novalnet/Payment/controllers/Adminhtml/NovalnetSepaController.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,14 +23,17 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Adminhtml_NovalnetSepaController extends Mage_Adminhtml_Controller_Action {
 
28
 
29
- public function indexAction() {
 
30
  //Loading current layout
31
  $this->loadLayout();
32
 
33
  //Creating a new block
34
- $block = $this->getLayout()->createBlock('Mage_Core_Block_Template', 'SepaForm', array('template' => 'novalnet/payment/method/form/Sepaform.phtml'));
 
35
  $this->getLayout()->getBlock('content')->append($block);
36
 
37
  // TO avoid Background and to load our form in empty page
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Adminhtml_NovalnetSepaController extends Mage_Adminhtml_Controller_Action
27
+ {
28
 
29
+ public function indexAction()
30
+ {
31
  //Loading current layout
32
  $this->loadLayout();
33
 
34
  //Creating a new block
35
+ $block = $this->getLayout()->createBlock('Mage_Core_Block_Template', 'SepaForm', array(
36
+ 'template' => 'novalnet/payment/method/form/Sepaform.phtml'));
37
  $this->getLayout()->getBlock('content')->append($block);
38
 
39
  // TO avoid Background and to load our form in empty page
app/code/community/Novalnet/Payment/controllers/Adminhtml/Sales/OrderController.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -26,16 +25,18 @@
26
  */
27
  require_once 'Mage' . DS . 'Adminhtml' . DS . 'controllers' . DS . 'Sales' . DS . 'OrderController.php';
28
 
29
- class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sales_OrderController {
 
30
 
31
- var $module_name = 'novalnet_payment';
32
 
33
  /**
34
  * @return Mage_Adminhtml_Sales_OrderController
35
  */
36
- protected function _initAction() {
 
37
  $this->loadLayout()
38
- ->setUsedModuleName($this->module_name)
39
  ->_setActiveMenu('novalnet')
40
  ->_addBreadcrumb($this->__('Novalnet'), $this->__('Orders'));
41
 
@@ -45,7 +46,8 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
45
  /**
46
  *
47
  */
48
- public function indexAction() {
 
49
  $this->_title($this->__('Novalnet'))->_title($this->__('Orders'));
50
 
51
  $this->_initAction()
@@ -55,7 +57,8 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
55
  /**
56
  *
57
  */
58
- public function transactionStatusGridAction() {
 
59
  $this->_initOrder();
60
  $this->getResponse()->setBody(
61
  Mage::getBlockSingleton('novalnet_payment/adminhtml_sales_order_view_tab_transactionStatus')->toHtml()
@@ -65,7 +68,8 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
65
  /**
66
  *
67
  */
68
- public function transactionOverviewGridAction() {
 
69
  $this->_initOrder();
70
  $this->getResponse()->setBody(
71
  Mage::getBlockSingleton('novalnet_payment/adminhtml_sales_order_view_tab_transactionOverview')->toHtml()
@@ -75,7 +79,8 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
75
  /**
76
  *
77
  */
78
- public function gridAction() {
 
79
  $this->getResponse()->setBody(
80
  $this->getLayout()->createBlock('novalnet_payment/adminhtml_sales_order_grid')->toHtml()
81
  );
@@ -84,7 +89,8 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
84
  /**
85
  * Invoice update order
86
  */
87
- public function invoiceupdateAction() {
 
88
  $order = $this->_initOrder();
89
  if ($order) {
90
  try {
@@ -98,7 +104,8 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
98
  $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
99
  }
100
 
101
- public function holdAction() {
 
102
  $order = $this->_initOrder();
103
  if ($order) {
104
  try {
@@ -117,47 +124,60 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
117
  }
118
  }
119
 
120
- public function novalnetconfirmAction() {
121
- $order = $this->_initOrder();
 
122
  if ($order) {
123
  try {
124
- $payment = $order->getPayment();
125
- $paymentObj = $payment->getMethodInstance();
126
- $getTid = $payment->getTransactionId();
127
- $responseCodeApproved = Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED;
128
- $request = new Varien_Object();
129
- $storeId = $payment->getOrder()->getStoreId();
130
- $customerId = $payment->getOrder()->getCustomerId();
131
- $amount = Mage::helper('novalnet_payment')->getFormatedAmount($payment->getOrder()->getBaseGrandTotal());
132
- $lastTranId = Mage::helper('novalnet_payment')->makeValidNumber($payment->getLastTransId());
133
- $paymentObj->assignOrderBasicParams($request, $payment, $storeId);
134
- $request->setTid($lastTranId)
135
- ->setStatus($responseCodeApproved)
136
- ->setEditStatus(true);
137
- $loadTransStatus = Mage::helper('novalnet_payment')->loadTransactionStatus($lastTranId);
138
- $transStatus = $loadTransStatus->getTransactionStatus();
139
- if (!in_array(NULL, $request->toArray()) && !empty($transStatus) && $transStatus != $responseCodeApproved) {
140
- $buildNovalnetParam = http_build_query($request->getData());
141
- $response = Mage::helper('novalnet_payment/AssignData')->setRawCallRequest($buildNovalnetParam, Novalnet_Payment_Model_Config::PAYPORT_URL);
142
- if ($response->getStatus() == $responseCodeApproved) {
143
- $loadTransStatus->setTransactionStatus($responseCodeApproved)
144
- ->save();
145
- $payment->setTransactionId($lastTranId);
146
- $transaction = $payment->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_AUTH, null, false);
147
- $transaction->setIsClosed(true)
148
- ->save();
149
- }
150
- $paymentObj->logNovalnetTransactionData($request, $response, $payment->getLastTransId(), $customerId, $storeId);
151
- }
152
- if ($response->getStatus() != $responseCodeApproved) {
153
- $this->_getSession()->addSuccess(
154
- $this->__('There was an error in refund request. Status Code : '. $response->getStatus())
155
- );
156
- } else {
157
- $this->_getSession()->addSuccess(
158
- $this->__('The order has been updated.')
159
- );
160
- }
 
 
 
 
 
 
 
 
 
 
 
 
161
  } catch (Mage_Core_Exception $e) {
162
  $this->_getSession()->addError($e->getMessage());
163
  } catch (Exception $e) {
@@ -165,85 +185,40 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
165
  }
166
  $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
167
  }
168
- }
169
 
170
- public function sepasignedAction() {
171
- $sepa_date = $this->getRequest()->getParam('sepa_date');
172
- $order = $this->_initOrder();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
173
 
174
- if ($order && $sepa_date) {
175
- try {
176
- $payment = $order->getPayment();
177
- $paymentObj = $payment->getMethodInstance();
178
- $lastTranId = Mage::helper('novalnet_payment')->makeValidNumber($payment->getLastTransId());
179
- $lastTranId = trim($lastTranId);
180
- $storeId = $payment->getOrder()->getStoreId();
181
- $vendorId = Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('merchant_id', true, $storeId);
182
- $authcode = Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('auth_code', true, $storeId);
183
- $sepaMandateConfirm = Novalnet_Payment_Model_Config::SEPA_MANDATE_CONFIRMATION;
184
- $data = unserialize($payment->getAdditionalData());
185
- $requestData = new Varien_Object();
186
- $request = '<?xml version="1.0" encoding="UTF-8"?>';
187
- $request .= '<nnxml><info_request>';
188
- $request .= '<vendor_id>' . trim($vendorId) . '</vendor_id>';
189
- $request .= '<vendor_authcode>' . trim($authcode) . '</vendor_authcode>';
190
- $request .= '<request_type>' . $sepaMandateConfirm . '</request_type>';
191
- $request .= '<mandate_signature_date>' . $sepa_date . '</mandate_signature_date>';
192
- $request .= '<order_no>' . $payment->getOrder()->getIncrementId() . '</order_no>';
193
- $request .= '<customer_no>' . $data['NnNcNo'] . '</customer_no>';
194
- $request .= '<tid>' . $lastTranId . '</tid>';
195
- $request .= '</info_request></nnxml>';
196
-
197
- if ($vendorId && $authcode) {
198
- $response = $paymentObj->_setNovalnetRequestCall($request, Novalnet_Payment_Model_Config::INFO_REQUEST_URL, 'XML');
199
- $requestData->setData($request);
200
- } else {
201
- $this->_getSession()->addError($this->__('Basic parameter not valid'));
202
- }
203
-
204
- $responseCodeApproved = Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED;
205
- $loadTransStatus = Mage::helper('novalnet_payment')->loadTransactionStatus($lastTranId);
206
-
207
- if ($response && $response->getStatus() == $responseCodeApproved) {
208
- $data['NnSepaSigned'] = 0;
209
- $data['NnSepaDueDate'] = $sepa_date;
210
-
211
- $payment->setAdditionalData(serialize($data))
212
- ->save();
213
-
214
- //authorize type closed
215
- $loadTransStatus->setTransactionStatus($responseCodeApproved)
216
- ->save();
217
- $payment->setTransactionId($payment->getLastTransId());
218
- $transaction = $payment->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_AUTH, null, false);
219
- $transaction->setIsClosed(true)
220
- ->save();
221
-
222
- //order transaction closed
223
- $order->setIsTransactionClosed(true)
224
- ->save();
225
-
226
- $payment->setTransactionId($lastTranId."-capture")
227
- ->setParentTransactionId($lastTranId)
228
- ->capture(null)
229
- ->setIsTransactionClosed(true)
230
- ->save();
231
- //set order status to processing
232
- $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, true)
233
- ->save();
234
- $this->_getSession()->addSuccess(
235
- $this->__('The order has been updated.')
236
- );
237
- } else {
238
- $this->_getSession()->addError($response->getStatusMessage());
239
- }
240
- $paymentObj->logNovalnetTransactionData($requestData, $response, $payment->getLastTransId(), $data['NnNcNo'], $storeId);
241
- } catch (Mage_Core_Exception $e) {
242
- $this->_getSession()->addError($e->getMessage());
243
- } catch (Exception $e) {
244
- $this->_getSession()->addError($e->getMessage());
245
- }
246
- $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
247
- }
248
- }
249
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
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
 
31
+ var $moduleName = 'novalnet_payment';
32
 
33
  /**
34
  * @return Mage_Adminhtml_Sales_OrderController
35
  */
36
+ protected function _initAction()
37
+ {
38
  $this->loadLayout()
39
+ ->setUsedModuleName($this->moduleName)
40
  ->_setActiveMenu('novalnet')
41
  ->_addBreadcrumb($this->__('Novalnet'), $this->__('Orders'));
42
 
46
  /**
47
  *
48
  */
49
+ public function indexAction()
50
+ {
51
  $this->_title($this->__('Novalnet'))->_title($this->__('Orders'));
52
 
53
  $this->_initAction()
57
  /**
58
  *
59
  */
60
+ public function transactionStatusGridAction()
61
+ {
62
  $this->_initOrder();
63
  $this->getResponse()->setBody(
64
  Mage::getBlockSingleton('novalnet_payment/adminhtml_sales_order_view_tab_transactionStatus')->toHtml()
68
  /**
69
  *
70
  */
71
+ public function transactionOverviewGridAction()
72
+ {
73
  $this->_initOrder();
74
  $this->getResponse()->setBody(
75
  Mage::getBlockSingleton('novalnet_payment/adminhtml_sales_order_view_tab_transactionOverview')->toHtml()
79
  /**
80
  *
81
  */
82
+ public function gridAction()
83
+ {
84
  $this->getResponse()->setBody(
85
  $this->getLayout()->createBlock('novalnet_payment/adminhtml_sales_order_grid')->toHtml()
86
  );
89
  /**
90
  * Invoice update order
91
  */
92
+ public function invoiceupdateAction()
93
+ {
94
  $order = $this->_initOrder();
95
  if ($order) {
96
  try {
104
  $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
105
  }
106
 
107
+ public function holdAction()
108
+ {
109
  $order = $this->_initOrder();
110
  if ($order) {
111
  try {
124
  }
125
  }
126
 
127
+ public function novalnetconfirmAction()
128
+ {
129
+ $order = $this->_initOrder();
130
  if ($order) {
131
  try {
132
+ $payment = $order->getPayment();
133
+ $paymentObj = $payment->getMethodInstance();
134
+ $paymentCode = $paymentObj->getCode();
135
+ $helper = Mage::helper('novalnet_payment');
136
+ $responseCodeApproved = Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED;
137
+ $request = new Varien_Object();
138
+ $storeId = $payment->getOrder()->getStoreId();
139
+ $customerId = $payment->getOrder()->getCustomerId();
140
+ $lastTranId = $helper->makeValidNumber($payment->getLastTransId());
141
+ $request = $this->_getVendorParams($request, $payment);
142
+ $request->setTid($lastTranId)
143
+ ->setStatus($responseCodeApproved)
144
+ ->setEditStatus(true);
145
+ $loadTransStatus = $helper->loadTransactionStatus($lastTranId);
146
+ $transStatus = $loadTransStatus->getTransactionStatus();
147
+ if (!in_array(NULL, $request->toArray()) && !empty($transStatus)
148
+ && $transStatus != $responseCodeApproved) {
149
+ $payportUrl = $helper->getPayportUrl('paygate');
150
+ $buildNovalnetParam = http_build_query($request->getData());
151
+ $response = $paymentObj->setRawCallRequest($buildNovalnetParam, $payportUrl);
152
+ if ($response->getStatus() == $responseCodeApproved) {
153
+ $magentoVersion = $helper->getMagentoVersion();
154
+ $transMode = (version_compare($magentoVersion, '1.6', '<'))
155
+ ? false : true;
156
+ $loadTransStatus->setTransactionStatus($responseCodeApproved)
157
+ ->save();
158
+
159
+ if ($paymentCode == Novalnet_Payment_Model_Config::NN_INVOICE) {
160
+ if ($order->canInvoice()) {
161
+ $this->saveInvoice($order, $lastTranId);
162
+ $payment->setTransactionId($lastTranId)
163
+ ->setIsTransactionClosed($transMode);
164
+ $transaction = $payment->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE, null, false);
165
+ $transaction->setParentTxnId(null)
166
+ ->save();
167
+ }
168
+ }
169
+ }
170
+ $paymentObj->logNovalnetTransactionData($request, $response, $payment->getLastTransId(), $customerId, $storeId);
171
+ }
172
+ if ($response->getStatus() != $responseCodeApproved) {
173
+ $this->_getSession()->addSuccess(
174
+ $this->__('There was an error in refund request. Status Code : ' . $response->getStatus())
175
+ );
176
+ } else {
177
+ $this->_getSession()->addSuccess(
178
+ $this->__('The order has been updated.')
179
+ );
180
+ }
181
  } catch (Mage_Core_Exception $e) {
182
  $this->_getSession()->addError($e->getMessage());
183
  } catch (Exception $e) {
185
  }
186
  $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
187
  }
188
+ }
189
 
190
+ protected function saveInvoice($order, $txnId)
191
+ {
192
+ $invoice = $order->prepareInvoice();
193
+ $invoice->setTransactionId($txnId);
194
+ $invoice->setRequestedCaptureCase(Mage_Sales_Model_Order_Invoice::CAPTURE_ONLINE)
195
+ ->register();
196
+ $invoice->setState(Mage_Sales_Model_Order_Invoice::STATE_OPEN)
197
+ ->save();
198
+ Mage::getModel('core/resource_transaction')
199
+ ->addObject($invoice)
200
+ ->addObject($invoice->getOrder())
201
+ ->save();
202
+ }
203
+
204
+ /**
205
+ * Set the Order basic params
206
+ *
207
+ * @param string $payment
208
+ */
209
+ private function _getVendorParams($request, $payment = NULL)
210
+ {
211
+ //get the Basic Params Based on store
212
+ $getresponseData = NULL;
213
+ if ($payment) {
214
+ $getresponseData = unserialize($payment->getAdditionalData());
215
+ }
216
+ $request->setVendor($getresponseData['vendor'])
217
+ ->setAuthCode($getresponseData['auth_code'])
218
+ ->setProduct($getresponseData['product'])
219
+ ->setTariff($getresponseData['tariff'])
220
+ ->setKey($getresponseData['key']);
221
+ return $request;
222
+ }
223
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
224
  }
app/code/community/Novalnet/Payment/controllers/Adminhtml/TransactionController.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Adminhtml_TransactionController extends Mage_Adminhtml_Controller_Action {
 
28
 
29
  /**
30
  * @return Novalnet_Payment_Adminhtml_TransactionController
31
  */
32
- protected function _initAction() {
 
33
  $this->loadLayout();
34
  $this->setUsedModuleName('novalnet_payment');
35
  $this->_setActiveMenu('novalnet/transactionstatus');
@@ -46,7 +47,8 @@ class Novalnet_Payment_Adminhtml_TransactionController extends Mage_Adminhtml_Co
46
  /**
47
  *
48
  */
49
- public function indexAction() {
 
50
  $this->_initAction();
51
  $this->renderLayout();
52
  }
@@ -54,26 +56,28 @@ class Novalnet_Payment_Adminhtml_TransactionController extends Mage_Adminhtml_Co
54
  /**
55
  *
56
  */
57
- public function gridAction() {
 
58
  $this->getResponse()->setBody(
59
  $this->getLayout()->createBlock('novalnet_payment/adminhtml_transaction_grid')->toHtml()
60
  );
61
  }
62
 
63
- public function viewAction() {
 
64
  $id = $this->getRequest()->getParam('nntxn_id');
65
- $modelTransactionStatus = Mage::helper('novalnet_payment')->getModelTransactionStatus()->load($id);
66
 
67
- if (empty($id) || !$modelTransactionStatus->getNnTxnId()) {
68
  //$this->_redirect('*/*/');
69
  $this->_forward('noRoute');
70
  }
71
 
72
- $this->_title(sprintf("#%s", $modelTransactionStatus->getTransactionNo()));
73
 
74
- // @var $modelTransactionStatus Novalnet_Payment_Model_Transactionstatus
75
  $modelTransaction = Mage::helper('novalnet_payment')->getModelTransactionStatus();
76
- $modelTransaction->loadByTransactionStatusId($modelTransactionStatus);
77
 
78
  Mage::register('novalnet_payment_transactionstatus', $modelTransaction);
79
 
@@ -81,4 +85,4 @@ class Novalnet_Payment_Adminhtml_TransactionController extends Mage_Adminhtml_Co
81
  $this->renderLayout();
82
  }
83
 
84
- }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Adminhtml_TransactionController extends Mage_Adminhtml_Controller_Action
27
+ {
28
 
29
  /**
30
  * @return Novalnet_Payment_Adminhtml_TransactionController
31
  */
32
+ protected function _initAction()
33
+ {
34
  $this->loadLayout();
35
  $this->setUsedModuleName('novalnet_payment');
36
  $this->_setActiveMenu('novalnet/transactionstatus');
47
  /**
48
  *
49
  */
50
+ public function indexAction()
51
+ {
52
  $this->_initAction();
53
  $this->renderLayout();
54
  }
56
  /**
57
  *
58
  */
59
+ public function gridAction()
60
+ {
61
  $this->getResponse()->setBody(
62
  $this->getLayout()->createBlock('novalnet_payment/adminhtml_transaction_grid')->toHtml()
63
  );
64
  }
65
 
66
+ public function viewAction()
67
+ {
68
  $id = $this->getRequest()->getParam('nntxn_id');
69
+ $modelTransStatus = Mage::helper('novalnet_payment')->getModelTransactionStatus()->load($id);
70
 
71
+ if (empty($id) || !$modelTransStatus->getNnTxnId()) {
72
  //$this->_redirect('*/*/');
73
  $this->_forward('noRoute');
74
  }
75
 
76
+ $this->_title(sprintf("#%s", $modelTransStatus->getTransactionNo()));
77
 
78
+ // @var $modelTransStatus Novalnet_Payment_Model_Transactionstatus
79
  $modelTransaction = Mage::helper('novalnet_payment')->getModelTransactionStatus();
80
+ $modelTransaction->loadByTransactionStatusId($modelTransStatus);
81
 
82
  Mage::register('novalnet_payment_transactionstatus', $modelTransaction);
83
 
85
  $this->renderLayout();
86
  }
87
 
88
+ }
app/code/community/Novalnet/Payment/controllers/Adminhtml/TransactionoverviewController.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,12 +23,14 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_Adminhtml_TransactionoverviewController extends Mage_Adminhtml_Controller_Action {
 
28
 
29
  /**
30
  * @return Novalnet_NovalnetIdeal_Adminhtml_TransactionController
31
  */
32
- protected function _initAction() {
 
33
  $this->loadLayout();
34
  $this->setUsedModuleName('novalnet_payment');
35
  $this->_setActiveMenu('novalnet/transactionoverview');
@@ -44,7 +45,8 @@ class Novalnet_Payment_Adminhtml_TransactionoverviewController extends Mage_Admi
44
  /**
45
  *
46
  */
47
- public function indexAction() {
 
48
  $this->_initAction();
49
  $this->renderLayout();
50
  }
@@ -52,31 +54,33 @@ class Novalnet_Payment_Adminhtml_TransactionoverviewController extends Mage_Admi
52
  /**
53
  *
54
  */
55
- public function gridAction() {
 
56
  $this->getResponse()->setBody(
57
  $this->getLayout()->createBlock('novalnet_payment/adminhtml_transactionoverview_grid')->toHtml()
58
  );
59
  }
60
 
61
- public function viewAction() {
 
62
  $id = $this->getRequest()->getParam('nnlog_id');
63
- $modelTransactionOverview = Mage::helper('novalnet_payment')->getModelTransactionOverview()->load($id);
64
 
65
- if (empty($id) || !$modelTransactionOverview->getNnLogId()) {
66
  //$this->_redirect('*/*/');
67
  $this->_forward('noRoute');
68
  }
69
 
70
- $this->_title(sprintf("#%s", $modelTransactionOverview->getTransactionId()));
71
 
72
- // @var $modelTransactionOverview Novalnet_Payment_Model_Transactionoverview
73
  $modelTransaction = Mage::helper('novalnet_payment')->getModelTransactionOverview();
74
- $modelTransaction->loadByOrderLogId($modelTransactionOverview);
75
 
76
- Mage::register('novalnet_payment_transactionoverview', $modelTransactionOverview);
77
 
78
  $this->_initAction();
79
  $this->renderLayout();
80
  }
81
 
82
- }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Adminhtml_TransactionoverviewController extends Mage_Adminhtml_Controller_Action
27
+ {
28
 
29
  /**
30
  * @return Novalnet_NovalnetIdeal_Adminhtml_TransactionController
31
  */
32
+ protected function _initAction()
33
+ {
34
  $this->loadLayout();
35
  $this->setUsedModuleName('novalnet_payment');
36
  $this->_setActiveMenu('novalnet/transactionoverview');
45
  /**
46
  *
47
  */
48
+ public function indexAction()
49
+ {
50
  $this->_initAction();
51
  $this->renderLayout();
52
  }
54
  /**
55
  *
56
  */
57
+ public function gridAction()
58
+ {
59
  $this->getResponse()->setBody(
60
  $this->getLayout()->createBlock('novalnet_payment/adminhtml_transactionoverview_grid')->toHtml()
61
  );
62
  }
63
 
64
+ public function viewAction()
65
+ {
66
  $id = $this->getRequest()->getParam('nnlog_id');
67
+ $modelTransOverview = Mage::helper('novalnet_payment')->getModelTransactionOverview()->load($id);
68
 
69
+ if (empty($id) || !$modelTransOverview->getNnLogId()) {
70
  //$this->_redirect('*/*/');
71
  $this->_forward('noRoute');
72
  }
73
 
74
+ $this->_title(sprintf("#%s", $modelTransOverview->getTransactionId()));
75
 
76
+ // @var $modelTransOverview Novalnet_Payment_Model_Transactionoverview
77
  $modelTransaction = Mage::helper('novalnet_payment')->getModelTransactionOverview();
78
+ $modelTransaction->loadByOrderLogId($modelTransOverview);
79
 
80
+ Mage::register('novalnet_payment_transactionoverview', $modelTransOverview);
81
 
82
  $this->_initAction();
83
  $this->renderLayout();
84
  }
85
 
86
+ }
app/code/community/Novalnet/Payment/controllers/GatewayController.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,37 +23,41 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Action {
 
28
 
29
  /**
30
  * when customer select payment method
31
  */
32
- public function redirectAction() {
 
33
  try {
34
  $session = $this->_getCheckout();
35
  $order = $this->_getOrder();
36
- $items = Mage::getModel('sales/quote')->load($session->getQuoteId())->getItemsQty();
37
-
38
- //$payment = $this->_getPayment();
39
- $paymentObj = $this->_getPaymentObject();
40
- $session->getQuote()->setIsActive(true)->save();
41
-
42
- if ($session->getLastRealOrderId() && $items) {
43
- if ($order->getPayment()->getAdditionalInformation($paymentObj->getCode() . '_redirectAction') != 1) {
44
- $order->getPayment()->setAdditionalInformation($paymentObj->getCode() . '_redirectAction', 1);
45
  $state = Mage_Sales_Model_Order::STATE_HOLDED; //set State,Status to HOLD
46
  $status = Mage_Sales_Model_Order::STATE_HOLDED;
47
  $order->setState($state, $status, $this->_getNovalnetHelper()->__('Customer was redirected to Novalnet'), false)->save();
 
 
48
  }
 
 
 
 
 
 
49
  } else {
50
  $this->_redirect('checkout/cart');
51
  }
52
- $this->getResponse()->setBody(
53
- $this->getLayout()
54
- ->createBlock(Novalnet_Payment_Model_Config::NOVALNET_REDIRECT_BLOCK)
55
- ->setOrder($order)
56
- ->toHtml()
57
- );
58
  } catch (Mage_Core_Exception $e) {
59
  $this->_getCheckout()->addError($e->getMessage());
60
  } catch (Exception $e) {
@@ -66,16 +69,17 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
66
  * When Novalnet returns after successful payment
67
  * The order information at this point is in POST
68
  */
69
- public function returnAction() {
 
70
  $session = $this->_getCheckout();
71
  $response = $this->getRequest()->getParams();
72
- $this->doTransactionOrderLog($response);
 
73
  $status = $this->_checkReturnedData();
74
 
75
- //OnFailure
76
  if (!$response['order_no'] || !$status) {
 
77
  $session->getQuote()->setIsActive(false)->save();
78
- Mage::getSingleton('core/session')->addError("Payment error");
79
  $this->_redirect('checkout/onepage/failure');
80
  } else {
81
  //OnSuccess
@@ -88,47 +92,113 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
88
  * When Customer cancelled/error in the payment
89
  *
90
  */
91
- public function errorAction() {
 
92
  $order = $this->_getOrder();
93
  $session = $this->_getCheckout();
94
  $payment = $order->getPayment();
95
  $paymentObj = $payment->getMethodInstance();
96
-
97
- $order->getPayment()->getMethodInstance()->unsetFormMethodSession();
98
  $session->getQuote()->setIsActive(false)->save();
99
  $response = $this->getRequest()->getParams();
100
- $this->doTransactionOrderLog($response); // Save return error response
101
- $statusMessage = $response['status_text'];
102
- $paystatus = "<b><font color='red'>" . $this->_getNovalnetHelper()->__('Payment Failed') . "</font> - " . $statusMessage . "</b>";
103
-
104
  //Unhold an order:-
105
  if ($order->canUnhold()) {
106
  $order->unhold()->save();
107
  }
108
 
109
- if ($paymentObj->_getConfigData('save_cancelled_tid') == 1) {
110
- $payment->setLastTransId($response["tid"]);
111
- }
112
- $data = unserialize($payment->getAdditionalData());
113
- $data['NnComments'] = $paystatus;
114
- $payment->setAdditionalData(serialize($data));
115
-
116
  //Cancel the order:-
117
- $order->registerCancellation($statusMessage);
118
- if ($order->getPayment()->getAdditionalInformation($paymentObj->getCode() . '_errorAction') != 1) {
119
  $order->getPayment()->setAdditionalInformation($paymentObj->getCode() . '_errorAction', 1);
 
 
 
 
120
  Mage::getSingleton('core/session')->addError($statusMessage);
121
  }
122
- $order->save();
123
- $this->unsetNovalnetSessionData($paymentObj->getCode());
124
  $this->_redirect('checkout/onepage/failure', array('_secure' => true));
125
  }
126
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
127
  /**
128
  * Checking Post variables.
129
  *
130
  */
131
- protected function _checkReturnedData() {
 
132
  try {
133
  $status = false;
134
  if (!$this->getRequest()->isPost()) {
@@ -139,98 +209,61 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
139
  $order = $this->_getOrder();
140
  $payment = $order->getPayment();
141
  $paymentObj = $payment->getMethodInstance();
 
 
142
  $this->_getCheckout()->getQuote()->setIsActive(true)->save();
 
 
143
  //Get response
144
- $response = Mage::helper('novalnet_payment/AssignData')->replaceParamsBasedOnPayment($this->getRequest()->getParams(), $paymentObj->getCode(), 'response');
145
- $dataObj = new Varien_Object($response);
146
 
147
  //Unhold an order:-
148
  if ($order->canUnhold()) {
149
  $order->unhold()->save();
150
  }
151
-
152
- $this->unsetNovalnetSessionData($paymentObj->getCode());
153
- $order->getPayment()->getMethodInstance()->unsetFormMethodSession();
154
  $authorizeKey = $paymentObj->_getConfigData('password', true);
155
- if ($response['status'] == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED && $paymentObj->getCode() != Novalnet_Payment_Model_Config::NN_CC3D) {
156
- $response['status'] = $this->_getNovalnetHelper()->checkParams($response, $authorizeKey);
 
157
  }
158
 
159
  //success
160
- if (($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_PAYPAL && $response['status'] == Novalnet_Payment_Model_Config::PAYPAL_PENDING_CODE) || $response['status'] == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
 
161
  //set Novalnet Mode
162
- $serverResponse = ($paymentObj->getCode() != Novalnet_Payment_Model_Config::NN_CC3D) ? $this->_getNovalnetHelper()->getDecodedParam($response['test_mode'], $authorizeKey) : $response['test_mode'];
 
 
163
  $shopMode = $paymentObj->_getConfigData('live_mode');
164
- $testMode = (((isset($serverResponse) && $serverResponse == 1) || (isset($shopMode) && $shopMode == 0)) ? 1 : 0 );
 
165
  $data = unserialize($payment->getAdditionalData());
166
  $data['NnTestOrder'] = $testMode;
167
- $amount = is_numeric($response['amount']) ? $response['amount'] : $this->_getNovalnetHelper()->getDecodedParam($response['amount'], $authorizeKey);
168
- $formatedAmount = $this->_getNovalnetHelper()->getFormatedAmount($amount, 'RAW');
169
- $transMode = ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_CC3D) ? false : true;
170
 
171
  $payment->setStatus(Novalnet_Payment_Model_Payment_Method_Abstract::STATUS_SUCCESS)
172
- ->setStatusDescription($this->_getNovalnetHelper()->__('Payment was successful.'))
173
  ->setAdditionalData(serialize($data))
174
  ->setIsTransactionClosed($transMode)
175
  ->save();
176
  $order->setPayment($payment);
177
  $order->save(); //Save details in order
178
-
179
- $txnId = $response['tid'];
180
- $getAdminTransaction = $this->_getPaymentObject()->doNovalnetStatusCall($response['tid']);
181
- $magentoVersion = $this->_getNovalnetHelper()->getMagentoVersion();
182
- $captureMode = (version_compare($magentoVersion, '1.6', '<')) ? false : true;
183
- if ($getAdminTransaction->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
184
-
185
- $payment->setTransactionId($txnId) // Add capture text to make the new transaction
186
- ->setParentTransactionId(null)
187
- ->setIsTransactionClosed($captureMode)
188
- ->setLastTransId($txnId)
189
- ->capture(null)
190
- ->save();
191
- } else {
192
-
193
- $payment->setTransactionId($txnId)
194
- ->setLastTransId($txnId)
195
- ->setParentTransactionId(null)
196
- ->authorize(true, $formatedAmount)
197
- ->save();
198
- }
199
-
200
- if ($order->getPayment()->getAdditionalInformation($paymentObj->getCode() . '_successAction') != 1) {
201
- $order->getPayment()->setAdditionalInformation($paymentObj->getCode() . '_successAction', 1);
202
- $setOrderAfterStatus = $paymentObj->_getConfigData('order_status_after_payment') ? $paymentObj->_getConfigData('order_status_after_payment') : Mage_Sales_Model_Order::STATE_PROCESSING; // If after status is empty set default status
203
- $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $setOrderAfterStatus, $this->_getNovalnetHelper()->__('Customer successfully returned from Novalnet'), true
204
- )->save();
205
-
206
- //sendNewOrderEmail
207
- if (!$order->getEmailSent() && $order->getId()) {
208
- try {
209
- $order->sendNewOrderEmail()
210
- ->setEmailSent(true)
211
- ->save();
212
- } catch (Exception $e) {
213
- Mage::throwException($this->_getNovalnetHelper()->__('Cannot send new order email.'));
214
- }
215
- }
216
-
217
- $paymentObj->doNovalnetPostbackCall($dataObj); //Do Second Call
218
- $statusText = ($response['status_text']) ? $response['status_text'] : $this->_getNovalnetHelper()->__('successful');
219
- Mage::getSingleton('core/session')->addSuccess($statusText);
220
  }
221
-
222
- $order->save();
223
- // Get Admin Transaction status via API
224
- $getAdminTransaction = $this->_getPaymentObject()->doNovalnetStatusCall($response['tid']);
225
- $this->doTransactionStatusSave($response, $getAdminTransaction); // Save the Transaction status
226
  $status = true;
227
  } else {
228
- $payment->setStatus(Novalnet_Payment_Model_Payment_Method_Abstract::STATUS_DECLINED);
229
- $order->setPayment($payment);
230
-
231
- //Cancel the order:-
232
- $order->registerCancellation($this->_getNovalnetHelper()->__('Payment was not successfull'))
233
- ->save();
234
  $status = false;
235
  }
236
  $order->save();
@@ -242,56 +275,74 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
242
  }
243
  }
244
 
245
- public function doTransactionStatusSave($response, $transactionStatus) {
246
- $order = $this->_getOrder();
247
- $authorizeKey = $order->getPayment()->getMethodInstance()->_getConfigData('password', true);
248
- $amount = is_numeric($response['amount']) ? $response['amount'] : $this->_getNovalnetHelper()->getDecodedParam($response['amount'], $authorizeKey);
249
- $ncNo = (isset($response['nc_no'])) ? $response['nc_no'] : NULL;
250
- $modNovalTransactionStatus = Mage::getModel('novalnet_payment/transactionstatus');
251
- $modNovalTransactionStatus->setTransactionNo($response['tid'])
252
- ->setOrderId($response['order_no'])
253
- ->setTransactionStatus($transactionStatus->getStatus()) //Novalnet Admin transaction status
254
- ->setNcNo($ncNo) //nc number
255
- ->setCustomerId($this->_getNovalnetHelper()->getCustomerId())
256
- ->setPaymentName($this->_getPaymentObject()->getCode())
257
- ->setAmount($this->_getNovalnetHelper()->getFormatedAmount($amount, 'RAW'))
258
- ->setRemoteIp($this->_getNovalnetHelper()->getRealIpAddr())
259
- ->setStoreId($this->_getNovalnetHelper()->getMagentoStoreId())
260
- ->setShopUrl($this->_getNovalnetHelper()->getCurrentSiteUrl())
261
- ->setCreatedDate($this->_getNovalnetHelper()->getCurrentDateTime())
262
- ->save();
263
- }
 
 
 
 
 
 
 
 
264
 
265
- public function doTransactionOrderLog($response) {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
266
 
267
- $modNovalTransactionOverview = $this->_getNovalnetHelper()->getModelTransactionOverview()->loadByAttribute('order_id', $response['order_no']);
 
 
 
268
 
269
- $modNovalTransactionOverview->setTransactionId($response['tid'])
270
- ->setResponseData(serialize($response))
271
- ->setCustomerId($this->_getNovalnetHelper()->getCustomerId())
272
- ->setStatus($response['status']) //transaction status code
273
- ->setStoreId($this->_getNovalnetHelper()->getMagentoStoreId())
274
- ->setShopUrl($this->_getNovalnetHelper()->getCurrentSiteUrl())
275
- ->save();
276
- }
277
 
278
- private function unsetNovalnetSessionData($paymentCode) {
279
- if ($paymentCode == Novalnet_Payment_Model_Config::NN_CC3D) {
280
- $session = $this->_getCheckout();
281
- $session->unsNnCcNumber()
282
- ->unsNnCcCvc()
283
- ->unsNnCcOwner()
284
- ->unsNnCcExpMonth()
285
- ->unsNnCcExpYear();
286
- }
287
  }
288
 
289
- /**
290
  * Get singleton of Checkout Session Model
291
  *
292
  * @return Mage_Checkout_Model_Session
293
  */
294
- public function _getCheckout() {
 
295
  return Mage::getSingleton('checkout/session');
296
  }
297
 
@@ -300,7 +351,8 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
300
  *
301
  * @return Helper data
302
  */
303
- private function _getNovalnetHelper() {
 
304
  return Mage::helper('novalnet_payment');
305
  }
306
 
@@ -309,26 +361,9 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
309
  *
310
  * @return payment object
311
  */
312
- private function _getOrder() {
 
313
  return Mage::getModel('sales/order')->loadByIncrementId($this->_getCheckout()->getLastRealOrderId());
314
  }
315
 
316
- /**
317
- * Get Current payment object from placed order
318
- *
319
- * @return payment object
320
- */
321
- private function _getPayment() {
322
- return $this->_getOrder()->getPayment();
323
- }
324
-
325
- /**
326
- * Get Current payment method instance
327
- *
328
- * @return payment method instance
329
- */
330
- private function _getPaymentObject() {
331
- return $this->_getPayment()->getMethodInstance();
332
- }
333
-
334
  }
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Action
27
+ {
28
 
29
  /**
30
  * when customer select payment method
31
  */
32
+ public function redirectAction()
33
+ {
34
  try {
35
  $session = $this->_getCheckout();
36
  $order = $this->_getOrder();
37
+ $quoteId = $session->getQuoteId() ? $session->getQuoteId() : $session->getLastQuoteId();
38
+ $items = Mage::getModel('sales/quote')->load($quoteId)->getItemsQty();
39
+
40
+ $paymentObj = $order->getPayment()->getMethodInstance();
41
+ $session->getQuote()->setIsActive(true)->save();
42
+ if ($order->getPayment()->getAdditionalInformation($paymentObj->getCode() . '_redirectAction')
43
+ != 1) {
44
+ $order->getPayment()->setAdditionalInformation($paymentObj->getCode() . '_redirectAction', 1);
45
+ if ($session->getLastRealOrderId() && $items) {
46
  $state = Mage_Sales_Model_Order::STATE_HOLDED; //set State,Status to HOLD
47
  $status = Mage_Sales_Model_Order::STATE_HOLDED;
48
  $order->setState($state, $status, $this->_getNovalnetHelper()->__('Customer was redirected to Novalnet'), false)->save();
49
+ } else {
50
+ $this->_redirect('checkout/cart');
51
  }
52
+ $this->getResponse()->setBody(
53
+ $this->getLayout()
54
+ ->createBlock(Novalnet_Payment_Model_Config::NOVALNET_REDIRECT_BLOCK)
55
+ ->setOrder($order)
56
+ ->toHtml()
57
+ );
58
  } else {
59
  $this->_redirect('checkout/cart');
60
  }
 
 
 
 
 
 
61
  } catch (Mage_Core_Exception $e) {
62
  $this->_getCheckout()->addError($e->getMessage());
63
  } catch (Exception $e) {
69
  * When Novalnet returns after successful payment
70
  * The order information at this point is in POST
71
  */
72
+ public function returnAction()
73
+ {
74
  $session = $this->_getCheckout();
75
  $response = $this->getRequest()->getParams();
76
+ $dataObj = new Varien_Object($response);
77
+ $this->_getNovalnetHelper()->doTransactionOrderLog($dataObj, $response['order_no']); // Save return success response
78
  $status = $this->_checkReturnedData();
79
 
 
80
  if (!$response['order_no'] || !$status) {
81
+ //OnFailure
82
  $session->getQuote()->setIsActive(false)->save();
 
83
  $this->_redirect('checkout/onepage/failure');
84
  } else {
85
  //OnSuccess
92
  * When Customer cancelled/error in the payment
93
  *
94
  */
95
+ public function errorAction()
96
+ {
97
  $order = $this->_getOrder();
98
  $session = $this->_getCheckout();
99
  $payment = $order->getPayment();
100
  $paymentObj = $payment->getMethodInstance();
101
+
102
+ $paymentObj->unsetMethodSession($paymentObj->getCode());
103
  $session->getQuote()->setIsActive(false)->save();
104
  $response = $this->getRequest()->getParams();
105
+ $dataObj = new Varien_Object($response);
106
+ $this->_getNovalnetHelper()->doTransactionOrderLog($dataObj, $response['order_no']); // Save return error response
 
 
107
  //Unhold an order:-
108
  if ($order->canUnhold()) {
109
  $order->unhold()->save();
110
  }
111
 
 
 
 
 
 
 
 
112
  //Cancel the order:-
113
+ if ($order->getPayment()->getAdditionalInformation($paymentObj->getCode() . '_errorAction')
114
+ != 1) {
115
  $order->getPayment()->setAdditionalInformation($paymentObj->getCode() . '_errorAction', 1);
116
+ $dataObj = new Varien_Object($response);
117
+ $paymentObj->saveCancelledOrder($dataObj, $payment);
118
+ $statusMessage = ($dataObj->getStatusText() != NULL) ? $dataObj->getStatusText()
119
+ : $dataObj->getStatusDesc();
120
  Mage::getSingleton('core/session')->addError($statusMessage);
121
  }
122
+
 
123
  $this->_redirect('checkout/onepage/failure', array('_secure' => true));
124
  }
125
 
126
+ /**
127
+ * Recieves Server Response for Direct Paymetns.
128
+ *
129
+ * Redirects to success or failure page.
130
+ */
131
+ public function paymentAction()
132
+ {
133
+ $order = $this->_getOrder();
134
+ $payment = $order->getPayment();
135
+ $paymentObj = $payment->getMethodInstance();
136
+
137
+ if ($order->getPayment()->getAdditionalInformation($paymentObj->getCode() . '_paymentAction')
138
+ != 1) {
139
+
140
+ $order->getPayment()->setAdditionalInformation($paymentObj->getCode() . '_paymentAction', 1);
141
+ $paymentCode = $paymentObj->getCode();
142
+ $helper = $this->_getNovalnetHelper();
143
+ $methodSession = $this->_getCheckout()->getData($paymentCode);
144
+ if ($paymentCode == Novalnet_Payment_Model_Config::NN_TELEPHONE) {
145
+ $requestData = new Varien_Object();
146
+ $txnId = $methodSession->getNnPhoneTid();
147
+ $option = '<lang>' . strtoupper($helper->getDefaultLanguage()) . '</lang>';
148
+ $result = $paymentObj->doNovalnetStatusCall($txnId, NULL, Novalnet_Payment_Model_Config::NOVALTEL_STATUS, $option, $requestData);
149
+
150
+ if ($result) {
151
+ $result->setTid($txnId);
152
+ $result->setStatus($result->getNovaltelStatus());
153
+ $result->setStatusDesc($result->getNovaltelStatusMessage());
154
+
155
+ //For Manual Testing
156
+ //$result->setStatus(100);
157
+
158
+ /** @@ Update the transaction status and transaction overview * */
159
+ $paymentObj->logNovalnetTransactionData($requestData, $result, $txnId);
160
+ }
161
+
162
+ $error = $paymentObj->validateSecondCallResponse($result, $payment, $paymentCode);
163
+ } else {
164
+
165
+ if (!$paymentObj->isCallbackTypeCall()) {
166
+ $request = $methodSession->getPaymentReqData();
167
+ $response = $paymentObj->postRequest($request);
168
+ $error = $paymentObj->validateNovalnetResponse($payment, $response);
169
+ } else {
170
+ $error = $paymentObj->validateNovalnetResponse($payment, $methodSession->getPaymentResData());
171
+ }
172
+ }
173
+
174
+ if ($error !== false) {
175
+ $paymentObj->unsetMethodSession($paymentCode);
176
+ $this->_redirect('checkout/onepage/failure');
177
+ } else {
178
+ //sendNewOrderEmail
179
+ if (!$order->getEmailSent() && $order->getId() && $error == false) {
180
+ try {
181
+ $order->sendNewOrderEmail()
182
+ ->setEmailSent(true)
183
+ ->save();
184
+ } catch (Exception $e) {
185
+ Mage::throwException($this->_getNovalnetHelper()->__('Cannot send new order email.'));
186
+ }
187
+ }
188
+ $paymentObj->unsetMethodSession($paymentCode);
189
+ $this->_redirect('checkout/onepage/success');
190
+ }
191
+ } else {
192
+ $this->_redirect('checkout/cart');
193
+ }
194
+ }
195
+
196
  /**
197
  * Checking Post variables.
198
  *
199
  */
200
+ protected function _checkReturnedData()
201
+ {
202
  try {
203
  $status = false;
204
  if (!$this->getRequest()->isPost()) {
209
  $order = $this->_getOrder();
210
  $payment = $order->getPayment();
211
  $paymentObj = $payment->getMethodInstance();
212
+ $paymentCode = $paymentObj->getCode();
213
+ $helper = $this->_getNovalnetHelper();
214
  $this->_getCheckout()->getQuote()->setIsActive(true)->save();
215
+ $onHoldStatus = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('paymentOnholdStaus');
216
+ array_push($onHoldStatus, '100');
217
  //Get response
218
+ $response = $this->getRequest()->getParams();
 
219
 
220
  //Unhold an order:-
221
  if ($order->canUnhold()) {
222
  $order->unhold()->save();
223
  }
224
+
225
+ $paymentObj->unsetMethodSession($paymentCode);
 
226
  $authorizeKey = $paymentObj->_getConfigData('password', true);
227
+ if ($response['status'] == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED
228
+ && $paymentCode != Novalnet_Payment_Model_Config::NN_CC) {
229
+ $response['status'] = $helper->checkParams($response, $authorizeKey);
230
  }
231
 
232
  //success
233
+ if (($paymentCode == Novalnet_Payment_Model_Config::NN_PAYPAL && $response['status']
234
+ == Novalnet_Payment_Model_Config::PAYPAL_PENDING_CODE) || in_array($response['status'], $onHoldStatus)) {
235
  //set Novalnet Mode
236
+ $serverResponse = ($paymentCode != Novalnet_Payment_Model_Config::NN_CC)
237
+ ? $helper->getDecodedParam($response['test_mode'], $authorizeKey)
238
+ : $response['test_mode'];
239
  $shopMode = $paymentObj->_getConfigData('live_mode');
240
+ $testMode = (((isset($serverResponse) && $serverResponse == 1) || (isset($shopMode)
241
+ && $shopMode == 0)) ? 1 : 0 );
242
  $data = unserialize($payment->getAdditionalData());
243
  $data['NnTestOrder'] = $testMode;
244
+ $data['NnTid'] = $response['tid'];
245
+ $transMode = ($paymentCode == Novalnet_Payment_Model_Config::NN_CC)
246
+ ? false : true;
247
 
248
  $payment->setStatus(Novalnet_Payment_Model_Payment_Method_Abstract::STATUS_SUCCESS)
249
+ ->setStatusDescription($helper->__('Payment was successful.'))
250
  ->setAdditionalData(serialize($data))
251
  ->setIsTransactionClosed($transMode)
252
  ->save();
253
  $order->setPayment($payment);
254
  $order->save(); //Save details in order
255
+ if ($payment->getAdditionalInformation($paymentCode . '_successAction')
256
+ != 1) {
257
+ $payment->setAdditionalInformation($paymentCode . '_successAction', 1);
258
+ $this->_saveSuccessOrder($order, $response, $authorizeKey);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
259
  }
 
 
 
 
 
260
  $status = true;
261
  } else {
262
+ $dataObj = new Varien_Object($response);
263
+ $paymentObj->saveCancelledOrder($dataObj, $payment);
264
+ $statusMessage = ($dataObj->getStatusText() != NULL) ? $dataObj->getStatusText()
265
+ : $dataObj->getStatusDesc();
266
+ Mage::getSingleton('core/session')->addError($statusMessage);
 
267
  $status = false;
268
  }
269
  $order->save();
275
  }
276
  }
277
 
278
+ /**
279
+ * validate the response and save the order
280
+ *
281
+ */
282
+ private function _saveSuccessOrder($order, $response, $authorizeKey)
283
+ {
284
+ $payment = $order->getPayment();
285
+ $paymentObj = $payment->getMethodInstance();
286
+ $txnId = $response['tid'];
287
+ $helper = $this->_getNovalnetHelper();
288
+ $getAdminTransaction = $paymentObj->doNovalnetStatusCall($txnId, $payment);
289
+ $magentoVersion = $helper->getMagentoVersion();
290
+ $captureMode = (version_compare($magentoVersion, '1.6', '<')) ? false : true;
291
+
292
+ if ($order->canInvoice() && $getAdminTransaction->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
293
+ $payment->setTransactionId($txnId) // Add capture text to make the new transaction
294
+ ->setParentTransactionId(null)
295
+ ->setIsTransactionClosed($captureMode)
296
+ ->setLastTransId($txnId)
297
+ ->capture(null)
298
+ ->save();
299
+ } else {
300
+ $payment->setTransactionId($txnId)
301
+ ->setLastTransId($txnId)
302
+ ->setParentTransactionId(null)
303
+ ->save();
304
+ }
305
 
306
+ $setOrderAfterStatus = $paymentObj->_getConfigData('order_status_after_payment')
307
+ ? $paymentObj->_getConfigData('order_status_after_payment') : Mage_Sales_Model_Order::STATE_PROCESSING; // If after status is empty set default status
308
+ if ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_PAYPAL && $response['status']
309
+ == Novalnet_Payment_Model_Config::PAYPAL_PENDING_CODE) {
310
+ $setOrderAfterStatus = $paymentObj->_getConfigData('order_status')
311
+ ? $paymentObj->_getConfigData('order_status') : Mage_Sales_Model_Order::STATE_PENDING_PAYMENT;
312
+ }
313
+ $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $setOrderAfterStatus, $helper->__('Customer successfully returned from Novalnet'), true
314
+ )->save();
315
+
316
+ //sendNewOrderEmail
317
+ if (!$order->getEmailSent() && $order->getId()) {
318
+ try {
319
+ $order->sendNewOrderEmail()
320
+ ->setEmailSent(true)
321
+ ->save();
322
+ } catch (Exception $e) {
323
+ Mage::throwException($helper->__('Cannot send new order email.'));
324
+ }
325
+ }
326
 
327
+ $dataObj = new Varien_Object($response);
328
+ $paymentObj->doNovalnetPostbackCall($dataObj); //Do Second Call
329
+ $statusText = ($response['status_text']) ? $response['status_text'] : $helper->__('successful');
330
+ Mage::getSingleton('core/session')->addSuccess($statusText);
331
 
332
+ $order->save();
 
 
 
 
 
 
 
333
 
334
+ // Get Admin Transaction status via API
335
+ $amount = is_numeric($response['amount']) ? $response['amount'] : $helper->getDecodedParam($response['amount'], $authorizeKey);
336
+ $helper->doTransactionStatusSave($dataObj, $getAdminTransaction, $payment, $helper->getFormatedAmount($amount, 'RAW')); // Save the Transaction status
 
 
 
 
 
 
337
  }
338
 
339
+ /**
340
  * Get singleton of Checkout Session Model
341
  *
342
  * @return Mage_Checkout_Model_Session
343
  */
344
+ public function _getCheckout()
345
+ {
346
  return Mage::getSingleton('checkout/session');
347
  }
348
 
351
  *
352
  * @return Helper data
353
  */
354
+ private function _getNovalnetHelper()
355
+ {
356
  return Mage::helper('novalnet_payment');
357
  }
358
 
361
  *
362
  * @return payment object
363
  */
364
+ private function _getOrder()
365
+ {
366
  return Mage::getModel('sales/order')->loadByIncrementId($this->_getCheckout()->getLastRealOrderId());
367
  }
368
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
369
  }
app/code/community/Novalnet/Payment/controllers/NovalnetCcController.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,14 +23,17 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_NovalnetCcController extends Mage_Core_Controller_Front_Action {
 
28
 
29
- public function indexAction() {
 
30
  //Loading current layout
31
  $this->loadLayout();
32
 
33
  //Creating a new block
34
- $block = $this->getLayout()->createBlock('Mage_Core_Block_Template', 'CcForm', array('template' => 'novalnet/payment/method/form/Ccform.phtml'));
 
35
  $this->getLayout()->getBlock('content')->append($block);
36
 
37
  // TO avoid Background and to load our form in empty page
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_NovalnetCcController extends Mage_Core_Controller_Front_Action
27
+ {
28
 
29
+ public function indexAction()
30
+ {
31
  //Loading current layout
32
  $this->loadLayout();
33
 
34
  //Creating a new block
35
+ $block = $this->getLayout()->createBlock('Mage_Core_Block_Template', 'CcForm', array(
36
+ 'template' => 'novalnet/payment/method/form/Ccform.phtml'));
37
  $this->getLayout()->getBlock('content')->append($block);
38
 
39
  // TO avoid Background and to load our form in empty page
app/code/community/Novalnet/Payment/controllers/NovalnetSepaController.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -24,14 +23,17 @@
24
  * @copyright Novalnet AG
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
- class Novalnet_Payment_NovalnetSepaController extends Mage_Core_Controller_Front_Action {
 
28
 
29
- public function indexAction() {
 
30
  //Loading current layout
31
  $this->loadLayout();
32
 
33
  //Creating a new block
34
- $block = $this->getLayout()->createBlock('Mage_Core_Block_Template', 'SepaForm', array('template' => 'novalnet/payment/method/form/Sepaform.phtml'));
 
35
  $this->getLayout()->getBlock('content')->append($block);
36
 
37
  // TO avoid Background and to load our form in empty page
1
  <?php
 
2
  /**
3
  * Magento
4
  *
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_NovalnetSepaController extends Mage_Core_Controller_Front_Action
27
+ {
28
 
29
+ public function indexAction()
30
+ {
31
  //Loading current layout
32
  $this->loadLayout();
33
 
34
  //Creating a new block
35
+ $block = $this->getLayout()->createBlock('Mage_Core_Block_Template', 'SepaForm', array(
36
+ 'template' => 'novalnet/payment/method/form/Sepaform.phtml'));
37
  $this->getLayout()->getBlock('content')->append($block);
38
 
39
  // TO avoid Background and to load our form in empty page
app/code/community/Novalnet/Payment/etc/adminhtml.xml CHANGED
@@ -26,34 +26,32 @@
26
  </transactionOverivew>
27
  </children>
28
  </transaction>
29
- <configuration module="novalnet_payment">
30
  <title>Configuration</title>
31
  <sort_order>40</sort_order>
32
  <children>
33
  <general module="novalnet_payment">
34
  <title>General</title>
35
- <sort_order>10</sort_order>
36
- <!--action>adminhtml/system_config/edit/section/payment_config/</action-->
37
  <action>adminhtml/system_config/edit/section/novalnet_global/</action>
38
  </general>
39
  <payment module="novalnet_payment">
40
  <title>Payment Methods</title>
41
- <sort_order>20</sort_order>
42
- <!--action>adminhtml/system_config/edit/section/payment/</action-->
43
  <action>adminhtml/system_config/edit/section/novalnet_paymethods/</action>
44
  </payment>
45
- </children>
46
  </configuration>
47
- <fraud_prevention module="novalnet_payment">
48
- <title>Risk and Control</title>
49
- <sort_order>30</sort_order>
50
- <action>adminhtml/system_config/edit/section/fraud_prevent/</action>
51
- </fraud_prevention>
52
- <configuration_wizard module="novalnet_payment">
53
- <title>Configuration-wizard</title>
54
- <sort_order>50</sort_order>
55
- <action>novalnet_payment/adminhtml_configuration_wizard_page</action>
56
- </configuration_wizard>
57
  <information module="novalnet_payment">
58
  <title>Information</title>
59
  <sort_order>60</sort_order>
@@ -62,7 +60,7 @@
62
  </children>
63
  </novalnet>
64
  </menu>
65
- <acl>
66
  <resources>
67
  <admin>
68
  <children>
@@ -72,13 +70,13 @@
72
  <children>
73
  <novalnet_global>
74
  <title>General</title>
75
- <sort_order>10</sort_order>
76
  </novalnet_global>
77
  <novalnet_paymethods>
78
  <title>Payment</title>
79
  <sort_order>20</sort_order>
80
  </novalnet_paymethods>
81
- <fraud_prevent>
82
  <title>Payment</title>
83
  <sort_order>20</sort_order>
84
  </fraud_prevent>
@@ -86,6 +84,56 @@
86
  </config>
87
  </children>
88
  </system>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
89
  </children>
90
  </admin>
91
  </resources>
26
  </transactionOverivew>
27
  </children>
28
  </transaction>
29
+ <configuration module="novalnet_payment">
30
  <title>Configuration</title>
31
  <sort_order>40</sort_order>
32
  <children>
33
  <general module="novalnet_payment">
34
  <title>General</title>
35
+ <sort_order>10</sort_order>
 
36
  <action>adminhtml/system_config/edit/section/novalnet_global/</action>
37
  </general>
38
  <payment module="novalnet_payment">
39
  <title>Payment Methods</title>
40
+ <sort_order>20</sort_order>
 
41
  <action>adminhtml/system_config/edit/section/novalnet_paymethods/</action>
42
  </payment>
43
+ </children>
44
  </configuration>
45
+ <fraud_prevention module="novalnet_payment">
46
+ <title>Risk and Control</title>
47
+ <sort_order>30</sort_order>
48
+ <action>adminhtml/system_config/edit/section/fraud_prevent/</action>
49
+ </fraud_prevention>
50
+ <configuration_wizard module="novalnet_payment">
51
+ <title>Configuration-wizard</title>
52
+ <sort_order>50</sort_order>
53
+ <action>novalnet_payment/adminhtml_configuration_wizard_page</action>
54
+ </configuration_wizard>
55
  <information module="novalnet_payment">
56
  <title>Information</title>
57
  <sort_order>60</sort_order>
60
  </children>
61
  </novalnet>
62
  </menu>
63
+ <acl>
64
  <resources>
65
  <admin>
66
  <children>
70
  <children>
71
  <novalnet_global>
72
  <title>General</title>
73
+ <sort_order>10</sort_order>
74
  </novalnet_global>
75
  <novalnet_paymethods>
76
  <title>Payment</title>
77
  <sort_order>20</sort_order>
78
  </novalnet_paymethods>
79
+ <fraud_prevent>
80
  <title>Payment</title>
81
  <sort_order>20</sort_order>
82
  </fraud_prevent>
84
  </config>
85
  </children>
86
  </system>
87
+ <novalnet>
88
+ <title>Novalnet</title>
89
+ <sort_order>100</sort_order>
90
+ <children>
91
+ <sales_order>
92
+ <title>Orders</title>
93
+ <sort_order>10</sort_order>
94
+ </sales_order>
95
+ <transaction module="novalnet_payment">
96
+ <title>Novalnet Transactions</title>
97
+ <sort_order>20</sort_order>
98
+ <children>
99
+ <transactionStatus module="novalnet_payment">
100
+ <title>Novalnet Transactions Overview</title>
101
+ <sort_order>10</sort_order>
102
+ </transactionStatus>
103
+ <transactionOverivew module="novalnet_payment">
104
+ <title>Novalnet Transactions Log</title>
105
+ <sort_order>20</sort_order>
106
+ </transactionOverivew>
107
+ </children>
108
+ </transaction>
109
+ <configuration module="novalnet_payment">
110
+ <title>Configuration</title>
111
+ <sort_order>40</sort_order>
112
+ <children>
113
+ <general module="novalnet_payment">
114
+ <title>General</title>
115
+ <sort_order>10</sort_order>
116
+ </general>
117
+ <payment module="novalnet_payment">
118
+ <title>Payment Methods</title>
119
+ <sort_order>20</sort_order>
120
+ </payment>
121
+ </children>
122
+ </configuration>
123
+ <fraud_prevention module="novalnet_payment">
124
+ <title>Risk and Control</title>
125
+ <sort_order>30</sort_order>
126
+ </fraud_prevention>
127
+ <configuration_wizard module="novalnet_payment">
128
+ <title>Configuration-wizard</title>
129
+ <sort_order>50</sort_order>
130
+ </configuration_wizard>
131
+ <information module="novalnet_payment">
132
+ <title>Information</title>
133
+ <sort_order>60</sort_order>
134
+ </information>
135
+ </children>
136
+ </novalnet>
137
  </children>
138
  </admin>
139
  </resources>
app/code/community/Novalnet/Payment/etc/config.xml CHANGED
@@ -2,13 +2,13 @@
2
  <config>
3
  <modules>
4
  <Novalnet_Payment>
5
- <!-- declare module's version information for database updates -->
6
- <version>5.0.2</version>
7
  </Novalnet_Payment>
8
  </modules>
9
 
10
  <global>
11
- <template>
12
  <email>
13
  <novalnet_callback_email_template module="novalnet_payment">
14
  <label>Novalnet Callback Email</label>
@@ -24,15 +24,40 @@
24
  <adminhtml>
25
  <rewrite>
26
  <sales_order_view>Novalnet_Payment_Block_Adminhtml_Sales_Order_View</sales_order_view>
27
- <sales_order_invoice_view>Novalnet_Payment_Block_Adminhtml_Sales_Order_Invoice_View</sales_order_invoice_view>
28
  </rewrite>
29
  </adminhtml>
30
  </blocks>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
31
 
32
- <!-- declare model group for new module -->
33
  <models>
 
 
 
 
 
34
  <novalnet_payment>
35
- <!-- base class name for the model group -->
36
  <class>Novalnet_Payment_Model</class>
37
  <resourceModel>novalnet_resource</resourceModel>
38
  </novalnet_payment>
@@ -55,33 +80,9 @@
55
  </novalnet_resource>
56
  </models>
57
 
58
- <!-- convert novalnet field values from quote to order to make it available in orderobject -->
59
  <fieldsets>
60
  <sales_convert_quote_payment>
61
- <nn_account_number>
62
- <to_order_payment>*</to_order_payment>
63
- </nn_account_number>
64
- <nn_bank_sorting_code>
65
- <to_order_payment>*</to_order_payment>
66
- </nn_bank_sorting_code>
67
- <nn_account_holder>
68
- <to_order_payment>*</to_order_payment>
69
- </nn_account_holder>
70
- <nn_elv_country>
71
- <to_order_payment>*</to_order_payment>
72
- </nn_elv_country>
73
- <nn_account_number_at>
74
- <to_order_payment>*</to_order_payment>
75
- </nn_account_number_at>
76
- <nn_bank_sorting_code_at>
77
- <to_order_payment>*</to_order_payment>
78
- </nn_bank_sorting_code_at>
79
- <nn_account_holder_at>
80
- <to_order_payment>*</to_order_payment>
81
- </nn_account_holder_at>
82
- <nn_elv_country_at>
83
- <to_order_payment>*</to_order_payment>
84
- </nn_elv_country_at>
85
  <nn_testorder>
86
  <to_order_payment>*</to_order_payment>
87
  </nn_testorder>
@@ -93,30 +94,6 @@
93
  </id>
94
  </sales_convert_quote_payment>
95
  <sales_convert_order_payment>
96
- <nn_account_number>
97
- <to_quote_payment>*</to_quote_payment>
98
- </nn_account_number>
99
- <nn_bank_sorting_code>
100
- <to_quote_payment>*</to_quote_payment>
101
- </nn_bank_sorting_code>
102
- <nn_account_holder>
103
- <to_quote_payment>*</to_quote_payment>
104
- </nn_account_holder>
105
- <nn_elv_country>
106
- <to_quote_payment>*</to_quote_payment>
107
- </nn_elv_country>
108
- <nn_account_number_at>
109
- <to_quote_payment>*</to_quote_payment>
110
- </nn_account_number_at>
111
- <nn_bank_sorting_code_at>
112
- <to_quote_payment>*</to_quote_payment>
113
- </nn_bank_sorting_code_at>
114
- <nn_account_holder_at>
115
- <to_quote_payment>*</to_quote_payment>
116
- </nn_account_holder_at>
117
- <nn_elv_country_at>
118
- <to_quote_payment>*</to_quote_payment>
119
- </nn_elv_country_at>
120
  <nn_testorder>
121
  <to_quote_payment>*</to_quote_payment>
122
  </nn_testorder>
@@ -130,16 +107,16 @@
130
  </fieldsets>
131
 
132
  <resources>
133
- <!-- resource identifier -->
134
  <novalnet_setup>
135
- <!-- specify that this resource is a setup resource and used for upgrades -->
136
  <setup>
137
- <!-- which module to look for install/upgrade files in -->
138
  <module>Novalnet_Payment</module>
139
  </setup>
140
- <!-- specify database connection for this resource -->
141
  <connection>
142
- <!-- do not create new connection, use predefined core setup connection -->
143
  <use>core_setup</use>
144
  </connection>
145
  <novalnet_payment_write>
@@ -161,10 +138,10 @@
161
  </novalnet_payment>
162
  </helpers>
163
  <payment>
164
- <groups>
165
- <novalnet>Novalnet</novalnet>
166
- </groups>
167
- </payment>
168
  </global>
169
 
170
  <adminhtml>
@@ -212,6 +189,25 @@
212
  </novalnet>
213
  </updates>
214
  </layout>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
215
  </frontend>
216
 
217
  <admin>
@@ -234,123 +230,77 @@
234
  </admin>
235
 
236
  <default>
237
- <!-- 'payment' configuration section (tab) -->
238
  <payment>
239
- <!-- 'module' configuration group (fieldset) -->
240
- <novalnetElvgerman translate="title" module="novalnet_payment">
241
- <!-- by default this payment method is inactive -->
242
- <active>0</active>
243
- <!-- model to handle logic for this payment method -->
244
- <model>novalnet_payment/payment_method_novalnetElvgerman</model>
245
- <!-- default title for payment checkout page and order view page -->
246
- <title>Novalnet Lastschrift Deutschland</title>
247
- <payment_action>authorize</payment_action>
248
- <allowspecific>0</allowspecific>
249
- <group>novalnet</group>
250
- <elvgerman_error>1</elvgerman_error>
251
- </novalnetElvgerman>
252
- <novalnetElvaustria translate="title" module="novalnet_payment">
253
- <active>0</active>
254
- <elvastria_error>1</elvastria_error>
255
- <model>novalnet_payment/payment_method_novalnetElvaustria</model>
256
- <title>Novalnet Lastschrift Österreich</title>
257
- <payment_action>authorize</payment_action>
258
- <allowspecific>0</allowspecific>
259
- <group>novalnet</group>
260
- </novalnetElvaustria>
261
  <novalnetInvoice translate="title" module="novalnet_payment">
 
262
  <active>0</active>
 
263
  <model>novalnet_payment/payment_method_novalnetInvoice</model>
 
264
  <title>Novalnet Kauf auf Rechnung</title>
265
- <payment_action>authorize</payment_action>
266
  <allowspecific>0</allowspecific>
 
267
  <group>novalnet</group>
268
  </novalnetInvoice>
269
  <novalnetPrepayment translate="title" module="novalnet_payment">
270
  <active>0</active>
271
  <model>novalnet_payment/payment_method_novalnetPrepayment</model>
272
  <title>Novalnet Vorauskasse</title>
273
- <payment_action>authorize</payment_action>
274
  <allowspecific>0</allowspecific>
 
275
  <group>novalnet</group>
276
  </novalnetPrepayment>
277
  <novalnetSofortueberweisung translate="title" module="novalnet_payment">
278
  <active>0</active>
279
- <url>https://payport.novalnet.de/online_transfer_payport</url>
280
  <model>novalnet_payment/payment_method_novalnetSofortueberweisung</model>
281
- <title>Novalnet Sofortueberweisung</title>
282
  <allowspecific>0</allowspecific>
283
- <createinvoice>0</createinvoice>
284
  <group>novalnet</group>
285
  </novalnetSofortueberweisung>
286
  <novalnetPaypal translate="title" module="novalnet_payment">
287
  <active>0</active>
288
- <url>https://payport.novalnet.de/paypal_payport</url>
289
  <model>novalnet_payment/payment_method_novalnetPaypal</model>
290
  <title>Novalnet PayPal</title>
291
  <allowspecific>0</allowspecific>
292
- <createinvoice>0</createinvoice>
293
  <group>novalnet</group>
294
  </novalnetPaypal>
295
  <novalnetIdeal translate="title" module="novalnet_payment">
296
  <active>0</active>
297
- <url>https://payport.novalnet.de/online_transfer_payport</url>
298
  <model>novalnet_payment/payment_method_novalnetIdeal</model>
299
  <title>Novalnet iDEAL</title>
300
  <allowspecific>0</allowspecific>
301
- <createinvoice>0</createinvoice>
302
  <group>novalnet</group>
303
  </novalnetIdeal>
304
  <novalnetCc translate="title" module="novalnet_payment">
305
  <active>0</active>
306
- <cc_error>1</cc_error>
307
  <model>novalnet_payment/payment_method_novalnetCc</model>
308
- <payment_action>authorize</payment_action>
309
  <allowspecific>0</allowspecific>
310
  <title>Novalnet Kreditkarte</title>
311
- <gateway_timeout>90</gateway_timeout>
312
  <group>novalnet</group>
313
  </novalnetCc>
314
  <novalnetSepa translate="title" module="novalnet_payment">
315
  <active>0</active>
316
- <sepa_error>1</sepa_error>
317
  <model>novalnet_payment/payment_method_novalnetSepa</model>
318
- <payment_action>authorize</payment_action>
319
  <allowspecific>0</allowspecific>
320
  <title>Novalnet Lastschrift SEPA</title>
321
- <gateway_timeout>90</gateway_timeout>
322
  <group>novalnet</group>
323
  </novalnetSepa>
324
- <novalnetSecure translate="title" module="novalnet_payment">
325
- <cctypes>VI,MC</cctypes>
326
- <active>0</active>
327
- <novalnetSecure_error>1</novalnetSecure_error>
328
- <model>novalnet_payment/payment_method_novalnetSecure</model>
329
- <order_status>0</order_status>
330
- <url>https://payport.novalnet.de/global_pci_payport</url>
331
- <allowspecific>0</allowspecific>
332
- <title>Novalnet Kreditkarte 3D Secure</title>
333
- <group>novalnet</group>
334
- </novalnetSecure>
335
  <novalnetPhonepayment translate="title" module="novalnet_payment">
336
  <active>0</active>
337
  <Phonepaymentcountries>DE,AT</Phonepaymentcountries>
338
  <model>novalnet_payment/payment_method_novalnetPhonepayment</model>
339
- <payment_action>authorize</payment_action>
340
  <allowspecific>0</allowspecific>
341
  <title>Novalnet Telefonpayment</title>
342
- <gateway_timeout>90</gateway_timeout>
343
  <group>novalnet</group>
344
  </novalnetPhonepayment>
345
- <novalnetSafetypay translate="title" module="novalnet_payment">
346
- <active>0</active>
347
- <url>https://payport.novalnet.de/safetypay</url>
348
- <model>novalnet_payment/payment_method_novalnetSafetypay</model>
349
- <title>Novalnet SafetyPay</title>
350
- <allowspecific>0</allowspecific>
351
- <createinvoice>0</createinvoice>
352
- <group>novalnet</group>
353
- </novalnetSafetypay>
354
  </payment>
355
  </default>
356
  </config>
2
  <config>
3
  <modules>
4
  <Novalnet_Payment>
5
+ <!-- declare module's version information for database updates -->
6
+ <version>5.0.3</version>
7
  </Novalnet_Payment>
8
  </modules>
9
 
10
  <global>
11
+ <template>
12
  <email>
13
  <novalnet_callback_email_template module="novalnet_payment">
14
  <label>Novalnet Callback Email</label>
24
  <adminhtml>
25
  <rewrite>
26
  <sales_order_view>Novalnet_Payment_Block_Adminhtml_Sales_Order_View</sales_order_view>
27
+ <sales_order_invoice_view>Novalnet_Payment_Block_Adminhtml_Sales_Order_Invoice_View</sales_order_invoice_view>
28
  </rewrite>
29
  </adminhtml>
30
  </blocks>
31
+ <events>
32
+ <sales_order_invoice_pay>
33
+ <observers>
34
+ <novalnet_payment_order_observer_invoice_send_email>
35
+ <type>singleton</type>
36
+ <class>Novalnet_Payment_Model_Observer</class>
37
+ <method>sendInvoiceEmail</method>
38
+ </novalnet_payment_order_observer_invoice_send_email>
39
+ </observers>
40
+ </sales_order_invoice_pay>
41
+ <sales_order_creditmemo_refund>
42
+ <observers>
43
+ <novalnet_payment_order_observer_creditmemo_send_email>
44
+ <type>singleton</type>
45
+ <class>Novalnet_Payment_Model_Observer</class>
46
+ <method>sendCreditmemoEmail</method>
47
+ </novalnet_payment_order_observer_creditmemo_send_email>
48
+ </observers>
49
+ </sales_order_creditmemo_refund>
50
+ </events>
51
 
52
+ <!-- declare model group for new module -->
53
  <models>
54
+ <adminhtml>
55
+ <rewrite>
56
+ <sales_order_create>Novalnet_Payment_Model_Adminhtml_Sales_Order_Create</sales_order_create>
57
+ </rewrite>
58
+ </adminhtml>
59
  <novalnet_payment>
60
+ <!-- base class name for the model group -->
61
  <class>Novalnet_Payment_Model</class>
62
  <resourceModel>novalnet_resource</resourceModel>
63
  </novalnet_payment>
80
  </novalnet_resource>
81
  </models>
82
 
83
+ <!-- convert novalnet field values from quote to order to make it available in orderobject -->
84
  <fieldsets>
85
  <sales_convert_quote_payment>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
86
  <nn_testorder>
87
  <to_order_payment>*</to_order_payment>
88
  </nn_testorder>
94
  </id>
95
  </sales_convert_quote_payment>
96
  <sales_convert_order_payment>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
97
  <nn_testorder>
98
  <to_quote_payment>*</to_quote_payment>
99
  </nn_testorder>
107
  </fieldsets>
108
 
109
  <resources>
110
+ <!-- resource identifier -->
111
  <novalnet_setup>
112
+ <!-- specify that this resource is a setup resource and used for upgrades -->
113
  <setup>
114
+ <!-- which module to look for install/upgrade files in -->
115
  <module>Novalnet_Payment</module>
116
  </setup>
117
+ <!-- specify database connection for this resource -->
118
  <connection>
119
+ <!-- do not create new connection, use predefined core setup connection -->
120
  <use>core_setup</use>
121
  </connection>
122
  <novalnet_payment_write>
138
  </novalnet_payment>
139
  </helpers>
140
  <payment>
141
+ <groups>
142
+ <novalnet>Novalnet</novalnet>
143
+ </groups>
144
+ </payment>
145
  </global>
146
 
147
  <adminhtml>
189
  </novalnet>
190
  </updates>
191
  </layout>
192
+ <events>
193
+ <core_block_abstract_prepare_layout_before>
194
+ <observers>
195
+ <novalnet_payment_prepare_layout_before>
196
+ <class>Novalnet_Payment_Model_Observer</class>
197
+ <method>prepareLayoutBefore</method>
198
+ </novalnet_payment_prepare_layout_before>
199
+ </observers>
200
+ </core_block_abstract_prepare_layout_before>
201
+ <customer_logout>
202
+ <observers>
203
+ <novalnet>
204
+ <type>singleton</type>
205
+ <class>Novalnet_Payment_Model_Observer</class>
206
+ <method>customerLogin</method>
207
+ </novalnet>
208
+ </observers>
209
+ </customer_logout>
210
+ </events>
211
  </frontend>
212
 
213
  <admin>
230
  </admin>
231
 
232
  <default>
233
+ <!-- 'payment' configuration section (tab) -->
234
  <payment>
235
+ <!-- 'module' configuration group (fieldset) -->
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
236
  <novalnetInvoice translate="title" module="novalnet_payment">
237
+ <!-- by default this payment method is inactive -->
238
  <active>0</active>
239
+ <!-- model to handle logic for this payment method -->
240
  <model>novalnet_payment/payment_method_novalnetInvoice</model>
241
+ <!-- default title for payment checkout page and order view page -->
242
  <title>Novalnet Kauf auf Rechnung</title>
 
243
  <allowspecific>0</allowspecific>
244
+ <gateway_timeout>240</gateway_timeout>
245
  <group>novalnet</group>
246
  </novalnetInvoice>
247
  <novalnetPrepayment translate="title" module="novalnet_payment">
248
  <active>0</active>
249
  <model>novalnet_payment/payment_method_novalnetPrepayment</model>
250
  <title>Novalnet Vorauskasse</title>
 
251
  <allowspecific>0</allowspecific>
252
+ <gateway_timeout>240</gateway_timeout>
253
  <group>novalnet</group>
254
  </novalnetPrepayment>
255
  <novalnetSofortueberweisung translate="title" module="novalnet_payment">
256
  <active>0</active>
 
257
  <model>novalnet_payment/payment_method_novalnetSofortueberweisung</model>
258
+ <title>Novalnet Sofortuberweisung</title>
259
  <allowspecific>0</allowspecific>
260
+ <gateway_timeout>240</gateway_timeout>
261
  <group>novalnet</group>
262
  </novalnetSofortueberweisung>
263
  <novalnetPaypal translate="title" module="novalnet_payment">
264
  <active>0</active>
 
265
  <model>novalnet_payment/payment_method_novalnetPaypal</model>
266
  <title>Novalnet PayPal</title>
267
  <allowspecific>0</allowspecific>
268
+ <gateway_timeout>240</gateway_timeout>
269
  <group>novalnet</group>
270
  </novalnetPaypal>
271
  <novalnetIdeal translate="title" module="novalnet_payment">
272
  <active>0</active>
 
273
  <model>novalnet_payment/payment_method_novalnetIdeal</model>
274
  <title>Novalnet iDEAL</title>
275
  <allowspecific>0</allowspecific>
276
+ <gateway_timeout>240</gateway_timeout>
277
  <group>novalnet</group>
278
  </novalnetIdeal>
279
  <novalnetCc translate="title" module="novalnet_payment">
280
  <active>0</active>
 
281
  <model>novalnet_payment/payment_method_novalnetCc</model>
 
282
  <allowspecific>0</allowspecific>
283
  <title>Novalnet Kreditkarte</title>
284
+ <gateway_timeout>240</gateway_timeout>
285
  <group>novalnet</group>
286
  </novalnetCc>
287
  <novalnetSepa translate="title" module="novalnet_payment">
288
  <active>0</active>
 
289
  <model>novalnet_payment/payment_method_novalnetSepa</model>
 
290
  <allowspecific>0</allowspecific>
291
  <title>Novalnet Lastschrift SEPA</title>
292
+ <gateway_timeout>240</gateway_timeout>
293
  <group>novalnet</group>
294
  </novalnetSepa>
 
 
 
 
 
 
 
 
 
 
 
295
  <novalnetPhonepayment translate="title" module="novalnet_payment">
296
  <active>0</active>
297
  <Phonepaymentcountries>DE,AT</Phonepaymentcountries>
298
  <model>novalnet_payment/payment_method_novalnetPhonepayment</model>
 
299
  <allowspecific>0</allowspecific>
300
  <title>Novalnet Telefonpayment</title>
301
+ <gateway_timeout>240</gateway_timeout>
302
  <group>novalnet</group>
303
  </novalnetPhonepayment>
 
 
 
 
 
 
 
 
 
304
  </payment>
305
  </default>
306
  </config>
app/code/community/Novalnet/Payment/etc/system.xml CHANGED
@@ -9,2412 +9,1707 @@
9
  </tabs>
10
  <sections>
11
 
12
- <!--{{{ Global tab-->
13
- <novalnet_global translate="label" module="novalnet_payment">
14
- <label>General</label>
15
  <tab>novalnet</tab>
16
  <frontend_type>text</frontend_type>
17
  <sort_order>20</sort_order>
18
  <show_in_default>1</show_in_default>
19
  <show_in_website>1</show_in_website>
20
  <show_in_store>1</show_in_store>
21
- <groups>
22
- <novalnet translate="label" module="novalnet_payment">
23
- <label>Novalnet Payment</label>
24
- <frontend_type>text</frontend_type>
25
- <sort_order>10</sort_order>
26
- <show_in_default>1</show_in_default>
27
- <show_in_website>1</show_in_website>
28
- <show_in_store>1</show_in_store>
29
- <fields>
30
- <merchant_id translate="label">
31
- <label>Novalnet Merchant ID</label>
32
- <comment>Enter your Novalnet Merchant ID</comment>
33
- <frontend_type>text</frontend_type>
34
- <sort_order>10</sort_order>
35
- <show_in_default>1</show_in_default>
36
- <show_in_website>1</show_in_website>
37
- <show_in_store>1</show_in_store>
38
- </merchant_id>
39
- <auth_code translate="label">
40
- <label>Novalnet Auth Code</label>
41
- <comment>Enter your Novalnet Merchant Authorisation code</comment>
42
- <frontend_type>text</frontend_type>
43
- <sort_order>20</sort_order>
44
- <show_in_default>1</show_in_default>
45
- <show_in_website>1</show_in_website>
46
- <show_in_store>1</show_in_store>
47
- </auth_code>
48
- <product_id translate="label">
49
- <label>Novalnet Product ID</label>
50
- <comment>Enter your Novalnet Product ID</comment>
51
- <frontend_type>text</frontend_type>
52
- <sort_order>30</sort_order>
53
- <show_in_default>1</show_in_default>
54
- <show_in_website>1</show_in_website>
55
- <show_in_store>1</show_in_store>
56
- </product_id>
57
- <tariff_id translate="label">
58
- <label>Novalnet Tariff ID</label>
59
- <comment>Enter your Novalnet Tariff ID</comment>
60
- <frontend_type>text</frontend_type>
61
- <sort_order>40</sort_order>
62
- <show_in_default>1</show_in_default>
63
- <show_in_website>1</show_in_website>
64
- <show_in_store>1</show_in_store>
65
- </tariff_id>
66
- <password translate="label">
67
- <label>Novalnet Password</label>
68
- <comment>Enter your Novalnet Password</comment>
69
- <frontend_type>text</frontend_type>
70
- <sort_order>50</sort_order>
71
- <show_in_default>1</show_in_default>
72
- <show_in_website>1</show_in_website>
73
- <show_in_store>1</show_in_store>
74
- </password>
75
- <live_mode translate="label">
76
- <label>Novalnet Live Mode</label>
77
- <comment>Selected payment methods will be in Live Mode</comment>
78
- <frontend_type>multiselect</frontend_type>
79
- <source_model>novalnet_payment/system_config_activemethods</source_model>
80
- <can_be_empty>1</can_be_empty>
81
- <sort_order>60</sort_order>
82
- <show_in_default>1</show_in_default>
83
- <show_in_website>1</show_in_website>
84
- <show_in_store>1</show_in_store>
85
- </live_mode>
86
- <api_user translate="label">
87
- <label>PAYPAL API User Name</label>
88
- <comment>Please enter your PayPal API username</comment>
89
- <frontend_type>text</frontend_type>
90
- <sort_order>70</sort_order>
91
- <show_in_default>1</show_in_default>
92
- <show_in_website>1</show_in_website>
93
- <show_in_store>1</show_in_store>
94
- </api_user>
95
- <api_password translate="label">
96
- <label>PAYPAL API Password</label>
97
- <comment>Please enter your PayPal API password</comment>
98
- <frontend_type>text</frontend_type>
99
- <sort_order>80</sort_order>
100
- <show_in_default>1</show_in_default>
101
- <show_in_website>1</show_in_website>
102
- <show_in_store>1</show_in_store>
103
- </api_password>
104
- <api_sign translate="label">
105
- <label>PAYPAL API Signature</label>
106
- <comment>Please enter your PayPal API signature</comment>
107
- <frontend_type>text</frontend_type>
108
- <sort_order>90</sort_order>
109
- <show_in_default>1</show_in_default>
110
- <show_in_website>1</show_in_website>
111
- <show_in_store>1</show_in_store>
112
- </api_sign>
113
- <referrer_id translate="label">
114
- <label>Referrer ID</label>
115
- <comment>Referrer ID Desc</comment>
116
- <frontend_type>text</frontend_type>
117
- <sort_order>100</sort_order>
118
- <show_in_default>1</show_in_default>
119
- <show_in_website>1</show_in_website>
120
- <show_in_store>1</show_in_store>
121
- </referrer_id>
122
- </fields>
123
- </novalnet>
124
- </groups>
125
- </novalnet_global>
 
 
 
 
 
126
  <!--}}} Global tab-->
127
- <!-- Novalnet paymethods -->
128
  <novalnet_paymethods translate="label" module="novalnet_payment">
129
- <label>Payment Methods</label>
130
  <tab>novalnet</tab>
131
- <frontend_type>text</frontend_type>
132
  <sort_order>30</sort_order>
133
  <show_in_default>1</show_in_default>
134
  <show_in_website>1</show_in_website>
135
  <show_in_store>1</show_in_store>
136
- <groups>
137
- <!--{{{ Novalnet Credit Card-->
138
- <novalnetCc translate="label" module="novalnet_payment">
139
- <label>Novalnet Credit Card</label>
140
- <sort_order>680</sort_order>
141
- <show_in_default>1</show_in_default>
142
- <show_in_website>1</show_in_website>
143
- <show_in_store>1</show_in_store>
144
- <fields>
145
- <active translate="label">
146
- <label>Enable Novalnet Module</label>
147
- <frontend_type>select</frontend_type>
148
- <source_model>adminhtml/system_config_source_yesno</source_model>
149
- <config_path>payment/novalnetCc/active</config_path>
150
- <sort_order>1</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>
154
- </active>
155
- <title translate="label">
156
- <label>Novalnet Title</label>
157
- <frontend_type>text</frontend_type>
158
- <config_path>payment/novalnetCc/title</config_path>
159
- <sort_order>2</sort_order>
160
- <show_in_default>1</show_in_default>
161
- <show_in_website>1</show_in_website>
162
- <show_in_store>1</show_in_store>
163
- </title>
164
- <order_status translate="label">
165
- <label>Set order Status</label>
166
- <comment>Set the status of orders made with this payment module to this value</comment>
167
- <frontend_type>select</frontend_type>
168
- <config_path>payment/novalnetCc/order_status</config_path>
169
- <source_model>adminhtml/system_config_source_order_status</source_model>
170
- <sort_order>3</sort_order>
171
- <show_in_default>1</show_in_default>
172
- <show_in_website>1</show_in_website>
173
- <show_in_store>1</show_in_store>
174
- </order_status>
175
- <manual_checking_amount tranlate="label" >
176
- <label>Manual checking of order</label>
177
- <comment>Manual checking of order Desc</comment>
178
- <frontend_type>text</frontend_type>
179
- <config_path>payment/novalnetCc/manual_checking_amount</config_path>
180
- <sort_order>4</sort_order>
181
- <show_in_default>1</show_in_default>
182
- <show_in_website>1</show_in_website>
183
- <show_in_store>1</show_in_store>
184
- </manual_checking_amount>
185
- <second_product_id translate="label">
186
- <label>Second Product ID for manual check condition</label>
187
- <comment>Second Product ID in Novalnet to use the manual check condition</comment>
188
- <frontend_type>text</frontend_type>
189
- <config_path>payment/novalnetCc/second_product_id</config_path>
190
- <sort_order>5</sort_order>
191
- <show_in_default>1</show_in_default>
192
- <show_in_website>1</show_in_website>
193
- <show_in_store>1</show_in_store>
194
- </second_product_id>
195
- <second_tariff_id translate="label">
196
- <label>Second Tariff ID for manual check condition</label>
197
- <comment>Second Tariff ID in Novalnet to use the manual check condition</comment>
198
- <frontend_type>text</frontend_type>
199
- <config_path>payment/novalnetCc/second_tariff_id</config_path>
200
- <sort_order>6</sort_order>
201
- <show_in_default>1</show_in_default>
202
- <show_in_website>1</show_in_website>
203
- <show_in_store>1</show_in_store>
204
- </second_tariff_id>
205
- <cc_error translate="label">
206
- <label>Auto refill the payment data entered in payment page</label>
207
- <frontend_type>select</frontend_type>
208
- <source_model>adminhtml/system_config_source_yesno</source_model>
209
- <config_path>payment/novalnetCc/cc_error</config_path>
210
- <sort_order>7</sort_order>
211
- <show_in_default>1</show_in_default>
212
- <show_in_website>1</show_in_website>
213
- <show_in_store>1</show_in_store>
214
- </cc_error>
215
- <reference_one translate="label">
216
- <label>Transaction reference 1</label>
217
- <comment>This will appear in the transactions details / account statement</comment>
218
- <frontend_type>text</frontend_type>
219
- <config_path>payment/novalnetCc/reference_one</config_path>
220
- <sort_order>12</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
- </reference_one>
225
- <reference_two translate="label">
226
- <label>Transaction reference 2</label>
227
- <comment>This will appear in the transactions details / account statement</comment>
228
- <frontend_type>text</frontend_type>
229
- <config_path>payment/novalnetCc/reference_two</config_path>
230
- <sort_order>13</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>
234
- </reference_two>
235
- <booking_reference translate="label">
236
- <label>Information to the end customer (this will appear in the payment page)</label>
237
- <frontend_type>text</frontend_type>
238
- <config_path>payment/novalnetCc/booking_reference</config_path>
239
- <sort_order>14</sort_order>
240
- <show_in_default>1</show_in_default>
241
- <show_in_website>1</show_in_website>
242
- <show_in_store>1</show_in_store>
243
- </booking_reference>
244
- <user_group_excluded translate="label">
245
- <comment>Excluded User Group Desc</comment>
246
- <label>User Group Excluded</label>
247
- <frontend_type>text</frontend_type>
248
- <config_path>payment/novalnetCc/user_group_excluded</config_path>
249
- <sort_order>15</sort_order>
250
- <show_in_default>1</show_in_default>
251
- <show_in_website>1</show_in_website>
252
- <show_in_store>1</show_in_store>
253
- </user_group_excluded>
254
- <gateway_timeout translate="label">
255
- <comment>Gateway Timeout in seconds</comment>
256
- <label>Gateway Timeout</label>
257
- <frontend_type>text</frontend_type>
258
- <config_path>payment/novalnetCc/gateway_timeout</config_path>
259
- <sort_order>16</sort_order>
260
- <show_in_default>1</show_in_default>
261
- <show_in_website>1</show_in_website>
262
- <show_in_store>1</show_in_store>
263
- </gateway_timeout>
264
- <allowspecific translate="label">
265
- <label>Payment from applicable countries</label>
266
- <frontend_type>allowspecific</frontend_type>
267
- <config_path>payment/novalnetCc/allowspecific</config_path>
268
- <sort_order>17</sort_order>
269
- <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
270
- <show_in_default>1</show_in_default>
271
- <show_in_website>1</show_in_website>
272
- <show_in_store>1</show_in_store>
273
- </allowspecific>
274
- <specificcountry translate="label">
275
- <label>Payment from Specific countries</label>
276
- <frontend_type>multiselect</frontend_type>
277
- <config_path>payment/novalnetCc/specificcountry</config_path>
278
- <sort_order>18</sort_order>
279
- <source_model>adminhtml/system_config_source_country</source_model>
280
- <show_in_default>1</show_in_default>
281
- <show_in_website>1</show_in_website>
282
- <show_in_store>1</show_in_store>
283
- <depends><allowspecific>1</allowspecific></depends>
284
- </specificcountry>
285
- <min_order_total translate="label">
286
- <label>Novalnet Minimum Order Total</label>
287
- <frontend_type>text</frontend_type>
288
- <config_path>payment/novalnetCc/min_order_total</config_path>
289
- <sort_order>19</sort_order>
290
- <show_in_default>1</show_in_default>
291
- <show_in_website>1</show_in_website>
292
- <show_in_store>1</show_in_store>
293
- </min_order_total>
294
- <max_order_total translate="label">
295
- <label>Novalnet Maximum Order Total</label>
296
- <frontend_type>text</frontend_type>
297
- <config_path>payment/novalnetCc/max_order_total</config_path>
298
- <sort_order>20</sort_order>
299
- <show_in_default>1</show_in_default>
300
- <show_in_website>1</show_in_website>
301
- <show_in_store>1</show_in_store>
302
- </max_order_total>
303
- <orderscount translate="label">
304
- <label>Novalnet Minimum Orders Count</label>
305
- <frontend_type>text</frontend_type>
306
- <config_path>payment/novalnetCc/orderscount</config_path>
307
- <sort_order>21</sort_order>
308
- <comment>Novalnet Minimum Orders Count Desc</comment>
309
- <show_in_default>1</show_in_default>
310
- <show_in_website>1</show_in_website>
311
- <show_in_store>1</show_in_store>
312
- </orderscount>
313
- <sort_order translate="label">
314
- <label>Novalnet Sort Order</label>
315
- <comment>Sort order of display. Lowest is displayed first.</comment>
316
- <frontend_type>text</frontend_type>
317
- <config_path>payment/novalnetCc/sort_order</config_path>
318
- <sort_order>22</sort_order>
319
- <show_in_default>1</show_in_default>
320
- <show_in_website>1</show_in_website>
321
- <show_in_store>1</show_in_store>
322
- </sort_order>
323
- </fields>
324
- </novalnetCc>
325
- <!--}}} Novalnet Credit Card-->
326
- <!--{{{ Novalnet SEPA-->
327
- <novalnetSepa translate="label" module="novalnet_payment">
328
- <label>Novalnet Direct Debit SEPA</label>
329
- <sort_order>683</sort_order>
330
- <show_in_default>1</show_in_default>
331
- <show_in_website>1</show_in_website>
332
- <show_in_store>1</show_in_store>
333
- <fields>
334
- <active translate="label">
335
- <label>Enable Novalnet Module</label>
336
- <frontend_type>select</frontend_type>
337
- <source_model>adminhtml/system_config_source_yesno</source_model>
338
- <config_path>payment/novalnetSepa/active</config_path>
339
- <sort_order>1</sort_order>
340
- <show_in_default>1</show_in_default>
341
- <show_in_website>1</show_in_website>
342
- <show_in_store>1</show_in_store>
343
- </active>
344
- <title translate="label">
345
- <label>Novalnet Title</label>
346
- <frontend_type>text</frontend_type>
347
- <config_path>payment/novalnetSepa/title</config_path>
348
- <sort_order>2</sort_order>
349
- <show_in_default>1</show_in_default>
350
- <show_in_website>1</show_in_website>
351
- <show_in_store>1</show_in_store>
352
- </title>
353
- <order_status translate="label">
354
- <label>Set order Status</label>
355
- <comment>Set the status of orders made with this payment module to this value</comment>
356
- <frontend_type>select</frontend_type>
357
- <config_path>payment/novalnetSepa/order_status</config_path>
358
- <source_model>adminhtml/system_config_source_order_status</source_model>
359
- <sort_order>3</sort_order>
360
- <show_in_default>1</show_in_default>
361
- <show_in_website>1</show_in_website>
362
- <show_in_store>1</show_in_store>
363
- </order_status>
364
- <manual_checking_amount tranlate="label" >
365
- <label>Manual checking of order</label>
366
- <comment>Manual checking of order Desc</comment>
367
- <frontend_type>text</frontend_type>
368
- <config_path>payment/novalnetSepa/manual_checking_amount</config_path>
369
- <sort_order>4</sort_order>
370
- <show_in_default>1</show_in_default>
371
- <show_in_website>1</show_in_website>
372
- <show_in_store>1</show_in_store>
373
- </manual_checking_amount>
374
- <second_product_id translate="label">
375
- <label>Second Product ID for manual check condition</label>
376
- <comment>Second Product ID in Novalnet to use the manual check condition</comment>
377
- <frontend_type>text</frontend_type>
378
- <config_path>payment/novalnetSepa/second_product_id</config_path>
379
- <sort_order>5</sort_order>
380
- <show_in_default>1</show_in_default>
381
- <show_in_website>1</show_in_website>
382
- <show_in_store>1</show_in_store>
383
- </second_product_id>
384
- <second_tariff_id translate="label">
385
- <label>Second Tariff ID for manual check condition</label>
386
- <comment>Second Tariff ID in Novalnet to use the manual check condition</comment>
387
- <frontend_type>text</frontend_type>
388
- <config_path>payment/novalnetSepa/second_tariff_id</config_path>
389
- <sort_order>6</sort_order>
390
- <show_in_default>1</show_in_default>
391
- <show_in_website>1</show_in_website>
392
- <show_in_store>1</show_in_store>
393
- </second_tariff_id>
394
- <sepatypes translate="label">
395
- <label>SEPA Payment Type</label>
396
- <comment>SEPA Payment type Desc</comment>
397
- <frontend_type>select</frontend_type>
398
- <config_path>payment/novalnetSepa/sepatypes</config_path>
399
- <source_model>novalnet_payment/novalnet_source_sepatype</source_model>
400
- <sort_order>7</sort_order>
401
- <show_in_default>1</show_in_default>
402
- <show_in_website>1</show_in_website>
403
- <show_in_store>1</show_in_store>
404
- </sepatypes>
405
- <sepa_duedate translate="label">
406
- <label>SEPA Payment duration in days</label>
407
- <comment>SEPA Due Date description</comment>
408
- <frontend_type>text</frontend_type>
409
- <config_path>payment/novalnetSepa/sepa_due_date</config_path>
410
- <sort_order>8</sort_order>
411
- <show_in_default>1</show_in_default>
412
- <show_in_website>1</show_in_website>
413
- <show_in_store>1</show_in_store>
414
- <depends><sepatypes>DD_SEPA</sepatypes></depends>
415
- </sepa_duedate>
416
- <sepa_error translate="label">
417
- <label>Auto refill the payment data entered in payment page</label>
418
- <frontend_type>select</frontend_type>
419
- <source_model>adminhtml/system_config_source_yesno</source_model>
420
- <config_path>payment/novalnetSepa/sepa_error</config_path>
421
- <sort_order>9</sort_order>
422
- <show_in_default>1</show_in_default>
423
- <show_in_website>1</show_in_website>
424
- <show_in_store>1</show_in_store>
425
- </sepa_error>
426
- <reference_one translate="label">
427
- <label>Transaction reference 1</label>
428
- <comment>This will appear in the transactions details / account statement</comment>
429
- <frontend_type>text</frontend_type>
430
- <config_path>payment/novalnetSepa/reference_one</config_path>
431
- <sort_order>14</sort_order>
432
- <show_in_default>1</show_in_default>
433
- <show_in_website>1</show_in_website>
434
- <show_in_store>1</show_in_store>
435
- </reference_one>
436
- <reference_two translate="label">
437
- <label>Transaction reference 2</label>
438
- <comment>This will appear in the transactions details / account statement</comment>
439
- <frontend_type>text</frontend_type>
440
- <config_path>payment/novalnetSepa/reference_two</config_path>
441
- <sort_order>15</sort_order>
442
- <show_in_default>1</show_in_default>
443
- <show_in_website>1</show_in_website>
444
- <show_in_store>1</show_in_store>
445
- </reference_two>
446
- <booking_reference translate="label">
447
- <label>Information to the end customer (this will appear in the payment page)</label>
448
- <frontend_type>text</frontend_type>
449
- <config_path>payment/novalnetSepa/booking_reference</config_path>
450
- <sort_order>16</sort_order>
451
- <show_in_default>1</show_in_default>
452
- <show_in_website>1</show_in_website>
453
- <show_in_store>1</show_in_store>
454
- </booking_reference>
455
- <user_group_excluded translate="label">
456
- <comment>Excluded User Group Desc</comment>
457
- <label>User Group Excluded</label>
458
- <frontend_type>text</frontend_type>
459
- <config_path>payment/novalnetSepa/user_group_excluded</config_path>
460
- <sort_order>17</sort_order>
461
- <show_in_default>1</show_in_default>
462
- <show_in_website>1</show_in_website>
463
- <show_in_store>1</show_in_store>
464
- </user_group_excluded>
465
- <gateway_timeout translate="label">
466
- <comment>Gateway Timeout in seconds</comment>
467
- <label>Gateway Timeout</label>
468
- <frontend_type>text</frontend_type>
469
- <config_path>payment/novalnetSepa/gateway_timeout</config_path>
470
- <sort_order>18</sort_order>
471
- <show_in_default>1</show_in_default>
472
- <show_in_website>1</show_in_website>
473
- <show_in_store>1</show_in_store>
474
- </gateway_timeout>
475
- <allowspecific translate="label">
476
- <label>Payment from applicable countries</label>
477
- <frontend_type>allowspecific</frontend_type>
478
- <config_path>payment/novalnetSepa/allowspecific</config_path>
479
- <sort_order>19</sort_order>
480
- <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
481
- <show_in_default>1</show_in_default>
482
- <show_in_website>1</show_in_website>
483
- <show_in_store>1</show_in_store>
484
- </allowspecific>
485
- <specificcountry translate="label">
486
- <label>Payment from Specific countries</label>
487
- <frontend_type>multiselect</frontend_type>
488
- <config_path>payment/novalnetSepa/specificcountry</config_path>
489
- <sort_order>20</sort_order>
490
- <source_model>adminhtml/system_config_source_country</source_model>
491
- <show_in_default>1</show_in_default>
492
- <show_in_website>1</show_in_website>
493
- <show_in_store>1</show_in_store>
494
- <depends><allowspecific>1</allowspecific></depends>
495
- </specificcountry>
496
- <min_order_total translate="label">
497
- <label>Novalnet Minimum Order Total</label>
498
- <frontend_type>text</frontend_type>
499
- <config_path>payment/novalnetSepa/min_order_total</config_path>
500
- <sort_order>21</sort_order>
501
- <show_in_default>1</show_in_default>
502
- <show_in_website>1</show_in_website>
503
- <show_in_store>1</show_in_store>
504
- </min_order_total>
505
- <max_order_total translate="label">
506
- <label>Novalnet Maximum Order Total</label>
507
- <frontend_type>text</frontend_type>
508
- <config_path>payment/novalnetSepa/max_order_total</config_path>
509
- <sort_order>22</sort_order>
510
- <show_in_default>1</show_in_default>
511
- <show_in_website>1</show_in_website>
512
- <show_in_store>1</show_in_store>
513
- </max_order_total>
514
- <orderscount translate="label">
515
- <label>Novalnet Minimum Orders Count</label>
516
- <frontend_type>text</frontend_type>
517
- <config_path>payment/novalnetSepa/orderscount</config_path>
518
- <sort_order>23</sort_order>
519
- <comment>Novalnet Minimum Orders Count Desc</comment>
520
- <show_in_default>1</show_in_default>
521
- <show_in_website>1</show_in_website>
522
- <show_in_store>1</show_in_store>
523
- </orderscount>
524
- <sort_order translate="label">
525
- <label>Novalnet Sort Order</label>
526
- <comment>Sort order of display. Lowest is displayed first.</comment>
527
- <frontend_type>text</frontend_type>
528
- <config_path>payment/novalnetSepa/sort_order</config_path>
529
- <sort_order>24</sort_order>
530
- <show_in_default>1</show_in_default>
531
- <show_in_website>1</show_in_website>
532
- <show_in_store>1</show_in_store>
533
- </sort_order>
534
- </fields>
535
- </novalnetSepa>
536
- <!--}}} Novalnet SEPA-->
537
- <!--{{{ Novalnet Elvgerman-->
538
- <novalnetElvgerman translate="label" module="novalnet_payment">
539
- <label>Novalnet Direct Debit German</label>
540
- <sort_order>684</sort_order>
541
- <show_in_default>1</show_in_default>
542
- <show_in_website>1</show_in_website>
543
- <show_in_store>1</show_in_store>
544
- <fields>
545
- <active translate="label">
546
- <label>Enable Novalnet Module</label>
547
- <frontend_type>select</frontend_type>
548
- <config_path>payment/novalnetElvgerman/active</config_path>
549
- <source_model>adminhtml/system_config_source_yesno</source_model>
550
- <sort_order>1</sort_order>
551
- <show_in_default>1</show_in_default>
552
- <show_in_website>1</show_in_website>
553
- <show_in_store>1</show_in_store>
554
- </active>
555
- <title translate="label">
556
- <label>Novalnet Title</label>
557
- <frontend_type>text</frontend_type>
558
- <config_path>payment/novalnetElvgerman/title</config_path>
559
- <sort_order>2</sort_order>
560
- <show_in_default>1</show_in_default>
561
- <show_in_website>1</show_in_website>
562
- <show_in_store>1</show_in_store>
563
- </title>
564
- <order_status translate="label">
565
- <label>Set order Status</label>
566
- <comment>Set the status of orders made with this payment module to this value</comment>
567
- <frontend_type>select</frontend_type>
568
- <config_path>payment/novalnetElvgerman/order_status</config_path>
569
- <source_model>adminhtml/system_config_source_order_status</source_model>
570
- <sort_order>3</sort_order>
571
- <show_in_default>1</show_in_default>
572
- <show_in_website>1</show_in_website>
573
- <show_in_store>1</show_in_store>
574
- </order_status>
575
- <manual_checking_amount tranlate="label" >
576
- <label>Manual checking of order</label>
577
- <comment>Manual checking of order Desc</comment>
578
- <frontend_type>text</frontend_type>
579
- <config_path>payment/novalnetElvgerman/manual_checking_amount</config_path>
580
- <sort_order>4</sort_order>
581
- <show_in_default>1</show_in_default>
582
- <show_in_website>1</show_in_website>
583
- <show_in_store>1</show_in_store>
584
- </manual_checking_amount>
585
- <second_product_id translate="label">
586
- <label>Second Product ID for manual check condition</label>
587
- <comment>Second Product ID in Novalnet to use the manual check condition</comment>
588
- <frontend_type>text</frontend_type>
589
- <config_path>payment/novalnetElvgerman/second_product_id</config_path>
590
- <sort_order>5</sort_order>
591
- <show_in_default>1</show_in_default>
592
- <show_in_website>1</show_in_website>
593
- <show_in_store>1</show_in_store>
594
- </second_product_id>
595
- <second_tariff_id translate="label">
596
- <label>Second Tariff ID for manual check condition</label>
597
- <comment>Second Tariff ID in Novalnet to use the manual check condition</comment>
598
- <frontend_type>text</frontend_type>
599
- <config_path>payment/novalnetElvgerman/second_tariff_id</config_path>
600
- <sort_order>6</sort_order>
601
- <show_in_default>1</show_in_default>
602
- <show_in_website>1</show_in_website>
603
- <show_in_store>1</show_in_store>
604
- </second_tariff_id>
605
- <acdc_check translate="label">
606
- <label>Enable Account Check Direct Control (ACDC)</label>
607
- <comment>Activates the Account Check Direct Control at the payment process</comment>
608
- <frontend_type>select</frontend_type>
609
- <config_path>payment/novalnetElvgerman/acdc_check</config_path>
610
- <source_model>adminhtml/system_config_source_yesno</source_model>
611
- <sort_order>7</sort_order>
612
- <show_in_default>1</show_in_default>
613
- <show_in_website>1</show_in_website>
614
- <show_in_store>1</show_in_store>
615
- </acdc_check>
616
- <elvgerman_error translate="label">
617
- <label>Auto refill the payment data entered in payment page</label>
618
- <frontend_type>select</frontend_type>
619
- <source_model>adminhtml/system_config_source_yesno</source_model>
620
- <config_path>payment/novalnetElvgerman/elvgerman_error</config_path>
621
- <sort_order>8</sort_order>
622
- <show_in_default>1</show_in_default>
623
- <show_in_website>1</show_in_website>
624
- <show_in_store>1</show_in_store>
625
- </elvgerman_error>
626
- <reference_one translate="label">
627
- <label>Transaction reference 1</label>
628
- <comment>This will appear in the transactions details / account statement</comment>
629
- <frontend_type>text</frontend_type>
630
- <config_path>payment/novalnetElvgerman/reference_one</config_path>
631
- <sort_order>9</sort_order>
632
- <show_in_default>1</show_in_default>
633
- <show_in_website>1</show_in_website>
634
- <show_in_store>1</show_in_store>
635
- </reference_one>
636
- <reference_two translate="label">
637
- <label>Transaction reference 2</label>
638
- <comment>This will appear in the transactions details / account statement</comment>
639
- <frontend_type>text</frontend_type>
640
- <config_path>payment/novalnetElvgerman/reference_two</config_path>
641
- <sort_order>10</sort_order>
642
- <show_in_default>1</show_in_default>
643
- <show_in_website>1</show_in_website>
644
- <show_in_store>1</show_in_store>
645
- </reference_two>
646
- <user_group_excluded translate="label">
647
- <comment>Excluded User Group Desc</comment>
648
- <label>User Group Excluded</label>
649
- <frontend_type>text</frontend_type>
650
- <config_path>payment/novalnetElvgerman/user_group_excluded</config_path>
651
- <sort_order>11</sort_order>
652
- <show_in_default>1</show_in_default>
653
- <show_in_website>1</show_in_website>
654
- <show_in_store>1</show_in_store>
655
- </user_group_excluded>
656
- <booking_reference translate="label">
657
- <label>Information to the end customer (this will appear in the payment page)</label>
658
- <frontend_type>text</frontend_type>
659
- <config_path>payment/novalnetElvgerman/booking_reference</config_path>
660
- <sort_order>12</sort_order>
661
- <show_in_default>1</show_in_default>
662
- <show_in_website>1</show_in_website>
663
- <show_in_store>1</show_in_store>
664
- </booking_reference>
665
- <gateway_timeout translate="label">
666
- <comment>Gateway Timeout in seconds</comment>
667
- <label>Gateway Timeout</label>
668
- <frontend_type>text</frontend_type>
669
- <config_path>payment/novalnetElvgerman/gateway_timeout</config_path>
670
- <sort_order>13</sort_order>
671
- <show_in_default>1</show_in_default>
672
- <show_in_website>1</show_in_website>
673
- <show_in_store>1</show_in_store>
674
- </gateway_timeout>
675
- <allowspecific translate="label">
676
- <label>Payment from applicable countries</label>
677
- <frontend_type>allowspecific</frontend_type>
678
- <config_path>payment/novalnetElvgerman/allowspecific</config_path>
679
- <sort_order>14</sort_order>
680
- <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
681
- <show_in_default>1</show_in_default>
682
- <show_in_website>1</show_in_website>
683
- <show_in_store>1</show_in_store>
684
- </allowspecific>
685
- <specificcountry translate="label">
686
- <label>Payment from Specific countries</label>
687
- <frontend_type>multiselect</frontend_type>
688
- <config_path>payment/novalnetElvgerman/specificcountry</config_path>
689
- <sort_order>15</sort_order>
690
- <source_model>adminhtml/system_config_source_country</source_model>
691
- <show_in_default>1</show_in_default>
692
- <show_in_website>1</show_in_website>
693
- <show_in_store>1</show_in_store>
694
- <depends><allowspecific>1</allowspecific></depends>
695
- </specificcountry>
696
- <min_order_total translate="label">
697
- <label>Novalnet Minimum Order Total</label>
698
- <frontend_type>text</frontend_type>
699
- <config_path>payment/novalnetElvgerman/min_order_total</config_path>
700
- <sort_order>16</sort_order>
701
- <show_in_default>1</show_in_default>
702
- <show_in_website>1</show_in_website>
703
- <show_in_store>1</show_in_store>
704
- </min_order_total>
705
- <max_order_total translate="label">
706
- <label>Novalnet Maximum Order Total</label>
707
- <frontend_type>text</frontend_type>
708
- <config_path>payment/novalnetElvgerman/max_order_total</config_path>
709
- <sort_order>17</sort_order>
710
- <show_in_default>1</show_in_default>
711
- <show_in_website>1</show_in_website>
712
- <show_in_store>1</show_in_store>
713
- </max_order_total>
714
- <orderscount translate="label">
715
- <label>Novalnet Minimum Orders Count</label>
716
- <frontend_type>text</frontend_type>
717
- <config_path>payment/novalnetElvgerman/orderscount</config_path>
718
- <sort_order>18</sort_order>
719
- <comment>Novalnet Minimum Orders Count Desc</comment>
720
- <show_in_default>1</show_in_default>
721
- <show_in_website>1</show_in_website>
722
- <show_in_store>1</show_in_store>
723
- </orderscount>
724
- <sort_order translate="label">
725
- <label>Novalnet Sort Order</label>
726
- <comment>Sort order of display. Lowest is displayed first.</comment>
727
- <frontend_type>text</frontend_type>
728
- <config_path>payment/novalnetElvgerman/sort_order</config_path>
729
- <sort_order>19</sort_order>
730
- <show_in_default>1</show_in_default>
731
- <show_in_website>1</show_in_website>
732
- <show_in_store>1</show_in_store>
733
- </sort_order>
734
- </fields>
735
- </novalnetElvgerman>
736
- <!--}}} Novalnet Elvgerman-->
737
- <!--{{{ Novalnet Elvaustria-->
738
- <novalnetElvaustria translate="label" module="novalnet_payment">
739
- <label>Novalnet Direct Debit Austria</label>
740
- <sort_order>685</sort_order>
741
- <show_in_default>1</show_in_default>
742
- <show_in_website>1</show_in_website>
743
- <show_in_store>1</show_in_store>
744
- <fields>
745
- <active translate="label">
746
- <label>Enable Novalnet Module</label>
747
- <frontend_type>select</frontend_type>
748
- <config_path>payment/novalnetElvaustria/active</config_path>
749
- <source_model>adminhtml/system_config_source_yesno</source_model>
750
- <sort_order>1</sort_order>
751
- <show_in_default>1</show_in_default>
752
- <show_in_website>1</show_in_website>
753
- <show_in_store>1</show_in_store>
754
- </active>
755
- <title translate="label">
756
- <label>Novalnet Title</label>
757
- <frontend_type>text</frontend_type>
758
- <config_path>payment/novalnetElvaustria/title</config_path>
759
- <sort_order>2</sort_order>
760
- <show_in_default>1</show_in_default>
761
- <show_in_website>1</show_in_website>
762
- <show_in_store>1</show_in_store>
763
- </title>
764
- <order_status translate="label">
765
- <label>Set order Status</label>
766
- <comment>Set the status of orders made with this payment module to this value</comment>
767
- <frontend_type>select</frontend_type>
768
- <config_path>payment/novalnetElvaustria/order_status</config_path>
769
- <source_model>adminhtml/system_config_source_order_status</source_model>
770
- <sort_order>3</sort_order>
771
- <show_in_default>1</show_in_default>
772
- <show_in_website>1</show_in_website>
773
- <show_in_store>1</show_in_store>
774
- </order_status>
775
- <manual_checking_amount tranlate="label" >
776
- <label>Manual checking of order</label>
777
- <comment>Manual checking of order Desc</comment>
778
- <frontend_type>text</frontend_type>
779
- <config_path>payment/novalnetElvaustria/manual_checking_amount</config_path>
780
- <sort_order>4</sort_order>
781
- <show_in_default>1</show_in_default>
782
- <show_in_website>1</show_in_website>
783
- <show_in_store>1</show_in_store>
784
- </manual_checking_amount>
785
- <second_product_id translate="label">
786
- <label>Second Product ID for manual check condition</label>
787
- <comment>Second Product ID in Novalnet to use the manual check condition</comment>
788
- <frontend_type>text</frontend_type>
789
- <config_path>payment/novalnetElvaustria/second_product_id</config_path>
790
- <sort_order>5</sort_order>
791
- <show_in_default>1</show_in_default>
792
- <show_in_website>1</show_in_website>
793
- <show_in_store>1</show_in_store>
794
- </second_product_id>
795
- <second_tariff_id translate="label">
796
- <label>Second Tariff ID for manual check condition</label>
797
- <comment>Second Tariff ID in Novalnet to use the manual check condition</comment>
798
- <frontend_type>text</frontend_type>
799
- <config_path>payment/novalnetElvaustria/second_tariff_id</config_path>
800
- <sort_order>6</sort_order>
801
- <show_in_default>1</show_in_default>
802
- <show_in_website>1</show_in_website>
803
- <show_in_store>1</show_in_store>
804
- </second_tariff_id>
805
- <elvastria_error translate="label">
806
- <label>Auto refill the payment data entered in payment page</label>
807
- <frontend_type>select</frontend_type>
808
- <source_model>adminhtml/system_config_source_yesno</source_model>
809
- <config_path>payment/novalnetElvaustria/elvastria_error</config_path>
810
- <sort_order>7</sort_order>
811
- <show_in_default>1</show_in_default>
812
- <show_in_website>1</show_in_website>
813
- <show_in_store>1</show_in_store>
814
- </elvastria_error>
815
- <reference_one translate="label">
816
- <label>Transaction reference 1</label>
817
- <comment>This will appear in the transactions details / account statement</comment>
818
- <frontend_type>text</frontend_type>
819
- <config_path>payment/novalnetElvaustria/reference_one</config_path>
820
- <sort_order>8</sort_order>
821
- <show_in_default>1</show_in_default>
822
- <show_in_website>1</show_in_website>
823
- <show_in_store>1</show_in_store>
824
- </reference_one>
825
- <reference_two translate="label">
826
- <label>Transaction reference 2</label>
827
- <comment>This will appear in the transactions details / account statement</comment>
828
- <frontend_type>text</frontend_type>
829
- <config_path>payment/novalnetElvaustria/reference_two</config_path>
830
- <sort_order>9</sort_order>
831
- <show_in_default>1</show_in_default>
832
- <show_in_website>1</show_in_website>
833
- <show_in_store>1</show_in_store>
834
- </reference_two>
835
- <user_group_excluded translate="label">
836
- <comment>Excluded User Group Desc</comment>
837
- <label>User Group Excluded</label>
838
- <frontend_type>text</frontend_type>
839
- <config_path>payment/novalnetElvaustria/user_group_excluded</config_path>
840
- <sort_order>10</sort_order>
841
- <show_in_default>1</show_in_default>
842
- <show_in_website>1</show_in_website>
843
- <show_in_store>1</show_in_store>
844
- </user_group_excluded>
845
- <booking_reference translate="label">
846
- <label>Information to the end customer (this will appear in the payment page)</label>
847
- <frontend_type>text</frontend_type>
848
- <config_path>payment/novalnetElvaustria/booking_reference</config_path>
849
- <sort_order>11</sort_order>
850
- <show_in_default>1</show_in_default>
851
- <show_in_website>1</show_in_website>
852
- <show_in_store>1</show_in_store>
853
- </booking_reference>
854
- <gateway_timeout translate="label">
855
- <comment>Gateway Timeout in seconds</comment>
856
- <label>Gateway Timeout</label>
857
- <frontend_type>text</frontend_type>
858
- <config_path>payment/novalnetElvaustria/gateway_timeout</config_path>
859
- <sort_order>12</sort_order>
860
- <show_in_default>1</show_in_default>
861
- <show_in_website>1</show_in_website>
862
- <show_in_store>1</show_in_store>
863
- </gateway_timeout>
864
- <allowspecific translate="label">
865
- <label>Payment from applicable countries</label>
866
- <frontend_type>allowspecific</frontend_type>
867
- <config_path>payment/novalnetElvaustria/allowspecific</config_path>
868
- <sort_order>13</sort_order>
869
- <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
870
- <show_in_default>1</show_in_default>
871
- <show_in_website>1</show_in_website>
872
- <show_in_store>1</show_in_store>
873
- </allowspecific>
874
- <specificcountry translate="label">
875
- <label>Payment from Specific countries</label>
876
- <frontend_type>multiselect</frontend_type>
877
- <config_path>payment/novalnetElvaustria/specificcountry</config_path>
878
- <sort_order>14</sort_order>
879
- <source_model>adminhtml/system_config_source_country</source_model>
880
- <show_in_default>1</show_in_default>
881
- <show_in_website>1</show_in_website>
882
- <show_in_store>1</show_in_store>
883
- <depends><allowspecific>1</allowspecific></depends>
884
- </specificcountry>
885
- <min_order_total translate="label">
886
- <label>Novalnet Minimum Order Total</label>
887
- <frontend_type>text</frontend_type>
888
- <config_path>payment/novalnetElvaustria/min_order_total</config_path>
889
- <sort_order>15</sort_order>
890
- <show_in_default>1</show_in_default>
891
- <show_in_website>1</show_in_website>
892
- <show_in_store>1</show_in_store>
893
- </min_order_total>
894
- <max_order_total translate="label">
895
- <label>Novalnet Maximum Order Total</label>
896
- <frontend_type>text</frontend_type>
897
- <config_path>payment/novalnetElvaustria/max_order_total</config_path>
898
- <sort_order>16</sort_order>
899
- <show_in_default>1</show_in_default>
900
- <show_in_website>1</show_in_website>
901
- <show_in_store>1</show_in_store>
902
- </max_order_total>
903
- <orderscount translate="label">
904
- <label>Novalnet Minimum Orders Count</label>
905
- <frontend_type>text</frontend_type>
906
- <config_path>payment/novalnetElvaustria/orderscount</config_path>
907
- <sort_order>17</sort_order>
908
- <comment>Novalnet Minimum Orders Count Desc</comment>
909
- <show_in_default>1</show_in_default>
910
- <show_in_website>1</show_in_website>
911
- <show_in_store>1</show_in_store>
912
- </orderscount>
913
- <sort_order translate="label">
914
- <label>Novalnet Sort Order</label>
915
- <comment>Sort order of display. Lowest is displayed first.</comment>
916
- <frontend_type>text</frontend_type>
917
- <config_path>payment/novalnetElvaustria/sort_order</config_path>
918
- <sort_order>18</sort_order>
919
- <show_in_default>1</show_in_default>
920
- <show_in_website>1</show_in_website>
921
- <show_in_store>1</show_in_store>
922
- </sort_order>
923
- </fields>
924
- </novalnetElvaustria>
925
- <!--}}} Novalnet Elvaustria-->
926
- <!--{{{ Novalnet Invoice-->
927
- <novalnetInvoice translate="label" module="novalnet_payment">
928
- <label>Novalnet Invoice</label>
929
- <sort_order>687</sort_order>
930
- <show_in_default>1</show_in_default>
931
- <show_in_website>1</show_in_website>
932
- <show_in_store>1</show_in_store>
933
- <fields>
934
- <active translate="label">
935
- <label>Enable Novalnet Module</label>
936
- <frontend_type>select</frontend_type>
937
- <config_path>payment/novalnetInvoice/active</config_path>
938
- <source_model>adminhtml/system_config_source_yesno</source_model>
939
- <sort_order>1</sort_order>
940
- <show_in_default>1</show_in_default>
941
- <show_in_website>1</show_in_website>
942
- <show_in_store>1</show_in_store>
943
- </active>
944
- <title translate="label">
945
- <label>Novalnet Title</label>
946
- <frontend_type>text</frontend_type>
947
- <config_path>payment/novalnetInvoice/title</config_path>
948
- <sort_order>2</sort_order>
949
- <show_in_default>1</show_in_default>
950
- <show_in_website>1</show_in_website>
951
- <show_in_store>1</show_in_store>
952
- </title>
953
- <order_status translate="label">
954
- <label>Set order Status</label>
955
- <comment>Set the status of orders made with this payment module to this value</comment>
956
- <frontend_type>select</frontend_type>
957
- <config_path>payment/novalnetInvoice/order_status</config_path>
958
- <source_model>adminhtml/system_config_source_order_status</source_model>
959
- <sort_order>3</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>
963
- </order_status>
964
- <booking_reference translate="label">
965
- <label>Information to the end customer (this will appear in the payment page)</label>
966
- <frontend_type>text</frontend_type>
967
- <config_path>payment/novalnetInvoice/booking_reference</config_path>
968
- <sort_order>4</sort_order>
969
- <show_in_default>1</show_in_default>
970
- <show_in_website>1</show_in_website>
971
- <show_in_store>1</show_in_store>
972
- </booking_reference>
973
- <reference_one translate="label">
974
- <label>Transaction reference 1</label>
975
- <comment>This will appear in the transactions details / account statement</comment>
976
- <frontend_type>text</frontend_type>
977
- <config_path>payment/novalnetInvoice/reference_one</config_path>
978
- <sort_order>5</sort_order>
979
- <show_in_default>1</show_in_default>
980
- <show_in_website>1</show_in_website>
981
- <show_in_store>1</show_in_store>
982
- </reference_one>
983
- <reference_two translate="label">
984
- <label>Transaction reference 2</label>
985
- <comment>This will appear in the transactions details / account statement</comment>
986
- <frontend_type>text</frontend_type>
987
- <config_path>payment/novalnetInvoice/reference_two</config_path>
988
- <sort_order>6</sort_order>
989
- <show_in_default>1</show_in_default>
990
- <show_in_website>1</show_in_website>
991
- <show_in_store>1</show_in_store>
992
- </reference_two>
993
- <payment_duration translate="label">
994
- <label>Payment Duration</label>
995
- <frontend_type>text</frontend_type>
996
- <config_path>payment/novalnetInvoice/payment_duration</config_path>
997
- <sort_order>7</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>
1001
- </payment_duration>
1002
- <user_group_excluded translate="label">
1003
- <comment>Excluded User Group Desc</comment>
1004
- <label>User Group Excluded</label>
1005
- <frontend_type>text</frontend_type>
1006
- <config_path>payment/novalnetInvoice/user_group_excluded</config_path>
1007
- <sort_order>8</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>
1011
- </user_group_excluded>
1012
- <gateway_timeout translate="label">
1013
- <comment>Gateway Timeout in seconds</comment>
1014
- <label>Gateway Timeout</label>
1015
- <frontend_type>text</frontend_type>
1016
- <config_path>payment/novalnetInvoice/gateway_timeout</config_path>
1017
- <sort_order>9</sort_order>
1018
- <show_in_default>1</show_in_default>
1019
- <show_in_website>1</show_in_website>
1020
- <show_in_store>1</show_in_store>
1021
- </gateway_timeout>
1022
- <allowspecific translate="label">
1023
- <label>Payment from applicable countries</label>
1024
- <frontend_type>allowspecific</frontend_type>
1025
- <config_path>payment/novalnetInvoice/allowspecific</config_path>
1026
- <sort_order>10</sort_order>
1027
- <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1028
- <show_in_default>1</show_in_default>
1029
- <show_in_website>1</show_in_website>
1030
- <show_in_store>1</show_in_store>
1031
- </allowspecific>
1032
- <specificcountry translate="label">
1033
- <label>Payment from Specific countries</label>
1034
- <frontend_type>multiselect</frontend_type>
1035
- <config_path>payment/novalnetInvoice/specificcountry</config_path>
1036
- <sort_order>11</sort_order>
1037
- <source_model>adminhtml/system_config_source_country</source_model>
1038
- <show_in_default>1</show_in_default>
1039
- <show_in_website>1</show_in_website>
1040
- <show_in_store>1</show_in_store>
1041
- <depends><allowspecific>1</allowspecific></depends>
1042
- </specificcountry>
1043
- <min_order_total translate="label">
1044
- <label>Novalnet Minimum Order Total</label>
1045
- <frontend_type>text</frontend_type>
1046
- <config_path>payment/novalnetInvoice/min_order_total</config_path>
1047
- <sort_order>12</sort_order>
1048
- <show_in_default>1</show_in_default>
1049
- <show_in_website>1</show_in_website>
1050
- <show_in_store>1</show_in_store>
1051
- </min_order_total>
1052
- <max_order_total translate="label">
1053
- <label>Novalnet Maximum Order Total</label>
1054
- <frontend_type>text</frontend_type>
1055
- <config_path>payment/novalnetInvoice/max_order_total</config_path>
1056
- <sort_order>13</sort_order>
1057
- <show_in_default>1</show_in_default>
1058
- <show_in_website>1</show_in_website>
1059
- <show_in_store>1</show_in_store>
1060
- </max_order_total>
1061
- <orderscount translate="label">
1062
- <label>Novalnet Minimum Orders Count</label>
1063
- <frontend_type>text</frontend_type>
1064
- <config_path>payment/novalnetInvoice/orderscount</config_path>
1065
- <sort_order>14</sort_order>
1066
- <comment>Novalnet Minimum Orders Count Desc</comment>
1067
- <show_in_default>1</show_in_default>
1068
- <show_in_website>1</show_in_website>
1069
- <show_in_store>1</show_in_store>
1070
- </orderscount>
1071
- <sort_order translate="label">
1072
- <label>Novalnet Sort Order</label>
1073
- <comment>Sort order of display. Lowest is displayed first.</comment>
1074
- <frontend_type>text</frontend_type>
1075
- <config_path>payment/novalnetInvoice/sort_order</config_path>
1076
- <sort_order>15</sort_order>
1077
- <show_in_default>1</show_in_default>
1078
- <show_in_website>1</show_in_website>
1079
- <show_in_store>1</show_in_store>
1080
- </sort_order>
1081
- </fields>
1082
- </novalnetInvoice>
1083
- <!--}}} Novalnet Invoice-->
1084
- <!--{{{ Novalnet Prepayment-->
1085
- <novalnetPrepayment translate="label" module="novalnet_payment">
1086
- <label>Novalnet Prepayment</label>
1087
- <sort_order>688</sort_order>
1088
- <show_in_default>1</show_in_default>
1089
- <show_in_website>1</show_in_website>
1090
- <show_in_store>1</show_in_store>
1091
- <fields>
1092
- <active translate="label">
1093
- <label>Enable Novalnet Module</label>
1094
- <frontend_type>select</frontend_type>
1095
- <config_path>payment/novalnetPrepayment/active</config_path>
1096
- <source_model>adminhtml/system_config_source_yesno</source_model>
1097
- <sort_order>1</sort_order>
1098
- <show_in_default>1</show_in_default>
1099
- <show_in_website>1</show_in_website>
1100
- <show_in_store>1</show_in_store>
1101
- </active>
1102
- <title translate="label">
1103
- <label>Novalnet Title</label>
1104
- <frontend_type>text</frontend_type>
1105
- <config_path>payment/novalnetPrepayment/title</config_path>
1106
- <sort_order>2</sort_order>
1107
- <show_in_default>1</show_in_default>
1108
- <show_in_website>1</show_in_website>
1109
- <show_in_store>1</show_in_store>
1110
- </title>
1111
- <order_status translate="label">
1112
- <label>Set order Status</label>
1113
- <comment>Set the status of orders made with this payment module to this value</comment>
1114
- <frontend_type>select</frontend_type>
1115
- <config_path>payment/novalnetPrepayment/order_status</config_path>
1116
- <source_model>adminhtml/system_config_source_order_status</source_model>
1117
- <sort_order>3</sort_order>
1118
- <show_in_default>1</show_in_default>
1119
- <show_in_website>1</show_in_website>
1120
- <show_in_store>1</show_in_store>
1121
- </order_status>
1122
- <booking_reference translate="label">
1123
- <label>Information to the end customer (this will appear in the payment page)</label>
1124
- <frontend_type>text</frontend_type>
1125
- <config_path>payment/novalnetPrepayment/booking_reference</config_path>
1126
- <sort_order>4</sort_order>
1127
- <show_in_default>1</show_in_default>
1128
- <show_in_website>1</show_in_website>
1129
- <show_in_store>1</show_in_store>
1130
- </booking_reference>
1131
- <reference_one translate="label">
1132
- <label>Transaction reference 1</label>
1133
- <comment>This will appear in the transactions details / account statement</comment>
1134
- <frontend_type>text</frontend_type>
1135
- <config_path>payment/novalnetPrepayment/reference_one</config_path>
1136
- <sort_order>5</sort_order>
1137
- <show_in_default>1</show_in_default>
1138
- <show_in_website>1</show_in_website>
1139
- <show_in_store>1</show_in_store>
1140
- </reference_one>
1141
- <reference_two translate="label">
1142
- <label>Transaction reference 2</label>
1143
- <comment>This will appear in the transactions details / account statement</comment>
1144
- <frontend_type>text</frontend_type>
1145
- <config_path>payment/novalnetPrepayment/reference_two</config_path>
1146
- <sort_order>6</sort_order>
1147
- <show_in_default>1</show_in_default>
1148
- <show_in_website>1</show_in_website>
1149
- <show_in_store>1</show_in_store>
1150
- </reference_two>
1151
- <user_group_excluded translate="label">
1152
- <comment>Excluded User Group Desc</comment>
1153
- <label>User Group Excluded</label>
1154
- <frontend_type>text</frontend_type>
1155
- <config_path>payment/novalnetPrepayment/user_group_excluded</config_path>
1156
- <sort_order>7</sort_order>
1157
- <show_in_default>1</show_in_default>
1158
- <show_in_website>1</show_in_website>
1159
- <show_in_store>1</show_in_store>
1160
- </user_group_excluded>
1161
- <gateway_timeout translate="label">
1162
- <comment>Gateway Timeout in seconds</comment>
1163
- <label>Gateway Timeout</label>
1164
- <frontend_type>text</frontend_type>
1165
- <config_path>payment/novalnetPrepayment/gateway_timeout</config_path>
1166
- <sort_order>8</sort_order>
1167
- <show_in_default>1</show_in_default>
1168
- <show_in_website>1</show_in_website>
1169
- <show_in_store>1</show_in_store>
1170
- </gateway_timeout>
1171
- <allowspecific translate="label">
1172
- <label>Payment from applicable countries</label>
1173
- <frontend_type>allowspecific</frontend_type>
1174
- <config_path>payment/novalnetPrepayment/allowspecific</config_path>
1175
- <sort_order>9</sort_order>
1176
- <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1177
- <show_in_default>1</show_in_default>
1178
- <show_in_website>1</show_in_website>
1179
- <show_in_store>1</show_in_store>
1180
- </allowspecific>
1181
- <specificcountry translate="label">
1182
- <label>Payment from Specific countries</label>
1183
- <frontend_type>multiselect</frontend_type>
1184
- <config_path>payment/novalnetPrepayment/specificcountry</config_path>
1185
- <sort_order>10</sort_order>
1186
- <source_model>adminhtml/system_config_source_country</source_model>
1187
- <show_in_default>1</show_in_default>
1188
- <show_in_website>1</show_in_website>
1189
- <show_in_store>1</show_in_store>
1190
- <depends><allowspecific>1</allowspecific></depends>
1191
- </specificcountry>
1192
- <min_order_total translate="label">
1193
- <label>Novalnet Minimum Order Total</label>
1194
- <frontend_type>text</frontend_type>
1195
- <config_path>payment/novalnetPrepayment/min_order_total</config_path>
1196
- <sort_order>11</sort_order>
1197
- <show_in_default>1</show_in_default>
1198
- <show_in_website>1</show_in_website>
1199
- <show_in_store>1</show_in_store>
1200
- </min_order_total>
1201
- <max_order_total translate="label">
1202
- <label>Novalnet Maximum Order Total</label>
1203
- <frontend_type>text</frontend_type>
1204
- <config_path>payment/novalnetPrepayment/max_order_total</config_path>
1205
- <sort_order>12</sort_order>
1206
- <show_in_default>1</show_in_default>
1207
- <show_in_website>1</show_in_website>
1208
- <show_in_store>1</show_in_store>
1209
- </max_order_total>
1210
- <orderscount translate="label">
1211
- <label>Novalnet Minimum Orders Count</label>
1212
- <frontend_type>text</frontend_type>
1213
- <config_path>payment/novalnetPrepayment/orderscount</config_path>
1214
- <sort_order>13</sort_order>
1215
- <comment>Novalnet Minimum Orders Count Desc</comment>
1216
- <show_in_default>1</show_in_default>
1217
- <show_in_website>1</show_in_website>
1218
- <show_in_store>1</show_in_store>
1219
- </orderscount>
1220
- <sort_order translate="label">
1221
- <label>Novalnet Sort Order</label>
1222
- <comment>Sort order of display. Lowest is displayed first.</comment>
1223
- <frontend_type>text</frontend_type>
1224
- <config_path>payment/novalnetPrepayment/sort_order</config_path>
1225
- <sort_order>14</sort_order>
1226
- <show_in_default>1</show_in_default>
1227
- <show_in_website>1</show_in_website>
1228
- <show_in_store>1</show_in_store>
1229
- </sort_order>
1230
- </fields>
1231
- </novalnetPrepayment>
1232
- <!--}}} Novalnet Prepayment-->
1233
- <!--{{{ Novalnet Instant-->
1234
- <novalnetSofortueberweisung translate="label" module="novalnet_payment">
1235
- <label>Novalnet Instant Bank Transfer</label>
1236
- <sort_order>688</sort_order>
1237
- <show_in_default>1</show_in_default>
1238
- <show_in_website>1</show_in_website>
1239
- <show_in_store>1</show_in_store>
1240
- <fields>
1241
- <active translate="label">
1242
- <label>Enable Novalnet Module</label>
1243
- <frontend_type>select</frontend_type>
1244
- <config_path>payment/novalnetSofortueberweisung/active</config_path>
1245
- <source_model>adminhtml/system_config_source_yesno</source_model>
1246
- <sort_order>0</sort_order>
1247
- <show_in_default>1</show_in_default>
1248
- <show_in_website>1</show_in_website>
1249
- <show_in_store>1</show_in_store>
1250
- </active>
1251
- <title translate="label">
1252
- <label>Novalnet Title</label>
1253
- <frontend_type>text</frontend_type>
1254
- <config_path>payment/novalnetSofortueberweisung/title</config_path>
1255
- <sort_order>2</sort_order>
1256
- <show_in_default>1</show_in_default>
1257
- <show_in_website>1</show_in_website>
1258
- <show_in_store>1</show_in_store>
1259
- </title>
1260
- <order_status translate="label">
1261
- <label>Order Status Before Payment</label>
1262
- <frontend_type>select</frontend_type>
1263
- <config_path>payment/novalnetSofortueberweisung/order_status</config_path>
1264
- <source_model>adminhtml/system_config_source_order_status</source_model>
1265
- <sort_order>3</sort_order>
1266
- <show_in_default>1</show_in_default>
1267
- <show_in_website>1</show_in_website>
1268
- <show_in_store>1</show_in_store>
1269
- </order_status>
1270
- <order_status_after_payment translate="label">
1271
- <label>Order Status After Successful Payment</label>
1272
- <frontend_type>select</frontend_type>
1273
- <config_path>payment/novalnetSofortueberweisung/order_status_after_payment</config_path>
1274
- <source_model>adminhtml/system_config_source_order_status</source_model>
1275
- <sort_order>4</sort_order>
1276
- <show_in_default>1</show_in_default>
1277
- <show_in_website>1</show_in_website>
1278
- <show_in_store>1</show_in_store>
1279
- </order_status_after_payment>
1280
- <booking_reference translate="label">
1281
- <label>Information to the end customer (this will appear in the payment page)</label>
1282
- <frontend_type>text</frontend_type>
1283
- <config_path>payment/novalnetSofortueberweisung/booking_reference</config_path>
1284
- <sort_order>5</sort_order>
1285
- <show_in_default>1</show_in_default>
1286
- <show_in_website>1</show_in_website>
1287
- <show_in_store>1</show_in_store>
1288
- </booking_reference>
1289
- <reference_one translate="label">
1290
- <label>Transaction reference 1</label>
1291
- <comment>This will appear in the transactions details / account statement</comment>
1292
- <frontend_type>text</frontend_type>
1293
- <config_path>payment/novalnetSofortueberweisung/reference_one</config_path>
1294
- <sort_order>6</sort_order>
1295
- <show_in_default>1</show_in_default>
1296
- <show_in_website>1</show_in_website>
1297
- <show_in_store>1</show_in_store>
1298
- </reference_one>
1299
- <reference_two translate="label">
1300
- <label>Transaction reference 2</label>
1301
- <comment>This will appear in the transactions details / account statement</comment>
1302
- <frontend_type>text</frontend_type>
1303
- <config_path>payment/novalnetSofortueberweisung/reference_two</config_path>
1304
- <sort_order>7</sort_order>
1305
- <show_in_default>1</show_in_default>
1306
- <show_in_website>1</show_in_website>
1307
- <show_in_store>1</show_in_store>
1308
- </reference_two>
1309
- <user_group_excluded translate="label">
1310
- <comment>Excluded User Group Desc</comment>
1311
- <label>User Group Excluded</label>
1312
- <frontend_type>text</frontend_type>
1313
- <config_path>payment/novalnetSofortueberweisung/user_group_excluded</config_path>
1314
- <sort_order>8</sort_order>
1315
- <show_in_default>1</show_in_default>
1316
- <show_in_website>1</show_in_website>
1317
- <show_in_store>1</show_in_store>
1318
- </user_group_excluded>
1319
- <save_cancelled_tid translate="label">
1320
- <label>Display Novalnet Transaction ID for Cancelled Order</label>
1321
- <frontend_type>select</frontend_type>
1322
- <config_path>payment/novalnetSofortueberweisung/save_cancelled_tid</config_path>
1323
- <source_model>adminhtml/system_config_source_yesno</source_model>
1324
- <sort_order>9</sort_order>
1325
- <show_in_default>1</show_in_default>
1326
- <show_in_website>1</show_in_website>
1327
- <show_in_store>1</show_in_store>
1328
- </save_cancelled_tid>
1329
- <gateway_timeout translate="label">
1330
- <comment>Gateway Timeout in seconds</comment>
1331
- <label>Gateway Timeout</label>
1332
- <frontend_type>text</frontend_type>
1333
- <config_path>payment/novalnetSofortueberweisung/gateway_timeout</config_path>
1334
- <sort_order>10</sort_order>
1335
- <show_in_default>1</show_in_default>
1336
- <show_in_website>1</show_in_website>
1337
- <show_in_store>1</show_in_store>
1338
- </gateway_timeout>
1339
- <allowspecific translate="label">
1340
- <label>Payment from applicable countries</label>
1341
- <frontend_type>allowspecific</frontend_type>
1342
- <config_path>payment/novalnetSofortueberweisung/allowspecific</config_path>
1343
- <sort_order>11</sort_order>
1344
- <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1345
- <show_in_default>1</show_in_default>
1346
- <show_in_website>1</show_in_website>
1347
- <show_in_store>1</show_in_store>
1348
- </allowspecific>
1349
- <specificcountry translate="label">
1350
- <label>Payment from Specific countries</label>
1351
- <frontend_type>multiselect</frontend_type>
1352
- <config_path>payment/novalnetSofortueberweisung/specificcountry</config_path>
1353
- <sort_order>12</sort_order>
1354
- <source_model>adminhtml/system_config_source_country</source_model>
1355
- <show_in_default>1</show_in_default>
1356
- <show_in_website>1</show_in_website>
1357
- <show_in_store>1</show_in_store>
1358
- <depends><allowspecific>1</allowspecific></depends>
1359
- </specificcountry>
1360
- <min_order_total translate="label">
1361
- <label>Novalnet Minimum Order Total</label>
1362
- <frontend_type>text</frontend_type>
1363
- <config_path>payment/novalnetSofortueberweisung/min_order_total</config_path>
1364
- <sort_order>13</sort_order>
1365
- <show_in_default>1</show_in_default>
1366
- <show_in_website>1</show_in_website>
1367
- <show_in_store>1</show_in_store>
1368
- </min_order_total>
1369
- <max_order_total translate="label">
1370
- <label>Novalnet Maximum Order Total</label>
1371
- <frontend_type>text</frontend_type>
1372
- <config_path>payment/novalnetSofortueberweisung/max_order_total</config_path>
1373
- <sort_order>14</sort_order>
1374
- <show_in_default>1</show_in_default>
1375
- <show_in_website>1</show_in_website>
1376
- <show_in_store>1</show_in_store>
1377
- </max_order_total>
1378
- <orderscount translate="label">
1379
- <label>Novalnet Minimum Orders Count</label>
1380
- <frontend_type>text</frontend_type>
1381
- <config_path>payment/novalnetSofortueberweisung/orderscount</config_path>
1382
- <sort_order>15</sort_order>
1383
- <comment>Novalnet Minimum Orders Count Desc</comment>
1384
- <show_in_default>1</show_in_default>
1385
- <show_in_website>1</show_in_website>
1386
- <show_in_store>1</show_in_store>
1387
- </orderscount>
1388
- <sort_order translate="label">
1389
- <label>Novalnet Sort Order</label>
1390
- <comment>Sort order of display. Lowest is displayed first.</comment>
1391
- <frontend_type>text</frontend_type>
1392
- <config_path>payment/novalnetSofortueberweisung/sort_order</config_path>
1393
- <sort_order>16</sort_order>
1394
- <show_in_default>1</show_in_default>
1395
- <show_in_website>1</show_in_website>
1396
- <show_in_store>1</show_in_store>
1397
- </sort_order>
1398
- </fields>
1399
- </novalnetSofortueberweisung>
1400
- <!--}}} Novalnet Instant-->
1401
- <!--{{{ Novalnet Paypal-->
1402
- <novalnetPaypal translate="label" module="novalnet_payment">
1403
- <label>Novalnet PayPal</label>
1404
- <frontend_type>text</frontend_type>
1405
- <sort_order>689</sort_order>
1406
- <show_in_default>1</show_in_default>
1407
- <show_in_website>1</show_in_website>
1408
- <show_in_store>1</show_in_store>
1409
- <fields>
1410
- <active translate="label">
1411
- <label>Enable Novalnet Module</label>
1412
- <frontend_type>select</frontend_type>
1413
- <config_path>payment/novalnetPaypal/active</config_path>
1414
- <source_model>adminhtml/system_config_source_yesno</source_model>
1415
- <sort_order>1</sort_order>
1416
- <show_in_default>1</show_in_default>
1417
- <show_in_website>1</show_in_website>
1418
- <show_in_store>1</show_in_store>
1419
- </active>
1420
- <title translate="label">
1421
- <label>Novalnet Title</label>
1422
- <frontend_type>text</frontend_type>
1423
- <config_path>payment/novalnetPaypal/title</config_path>
1424
- <sort_order>2</sort_order>
1425
- <show_in_default>1</show_in_default>
1426
- <show_in_website>1</show_in_website>
1427
- <show_in_store>1</show_in_store>
1428
- </title>
1429
- <order_status translate="label">
1430
- <label>Order Status Before Payment</label>
1431
- <frontend_type>select</frontend_type>
1432
- <config_path>payment/novalnetPaypal/order_status</config_path>
1433
- <source_model>adminhtml/system_config_source_order_status</source_model>
1434
- <sort_order>3</sort_order>
1435
- <show_in_default>1</show_in_default>
1436
- <show_in_website>1</show_in_website>
1437
- <show_in_store>1</show_in_store>
1438
- </order_status>
1439
- <order_status_after_payment translate="label">
1440
- <label>Order Status After Successful Payment</label>
1441
- <frontend_type>select</frontend_type>
1442
- <config_path>payment/novalnetPaypal/order_status_after_payment</config_path>
1443
- <source_model>adminhtml/system_config_source_order_status</source_model>
1444
- <sort_order>4</sort_order>
1445
- <show_in_default>1</show_in_default>
1446
- <show_in_website>1</show_in_website>
1447
- <show_in_store>1</show_in_store>
1448
- </order_status_after_payment>
1449
- <booking_reference translate="label">
1450
- <label>Information to the end customer (this will appear in the payment page)</label>
1451
- <frontend_type>text</frontend_type>
1452
- <config_path>payment/novalnetPaypal/booking_reference</config_path>
1453
- <sort_order>5</sort_order>
1454
- <show_in_default>1</show_in_default>
1455
- <show_in_website>1</show_in_website>
1456
- <show_in_store>1</show_in_store>
1457
- </booking_reference>
1458
- <reference_one translate="label">
1459
- <label>Transaction reference 1</label>
1460
- <comment>This will appear in the transactions details / account statement</comment>
1461
- <frontend_type>text</frontend_type>
1462
- <config_path>payment/novalnetPaypal/reference_one</config_path>
1463
- <sort_order>6</sort_order>
1464
- <show_in_default>1</show_in_default>
1465
- <show_in_website>1</show_in_website>
1466
- <show_in_store>1</show_in_store>
1467
- </reference_one>
1468
- <reference_two translate="label">
1469
- <label>Transaction reference 2</label>
1470
- <comment>This will appear in the transactions details / account statement</comment>
1471
- <frontend_type>text</frontend_type>
1472
- <config_path>payment/novalnetPaypal/reference_two</config_path>
1473
- <sort_order>7</sort_order>
1474
- <show_in_default>1</show_in_default>
1475
- <show_in_website>1</show_in_website>
1476
- <show_in_store>1</show_in_store>
1477
- </reference_two>
1478
- <user_group_excluded translate="label">
1479
- <comment>Excluded User Group Desc</comment>
1480
- <label>User Group Excluded</label>
1481
- <frontend_type>text</frontend_type>
1482
- <config_path>payment/novalnetPaypal/user_group_excluded</config_path>
1483
- <sort_order>8</sort_order>
1484
- <show_in_default>1</show_in_default>
1485
- <show_in_website>1</show_in_website>
1486
- <show_in_store>1</show_in_store>
1487
- </user_group_excluded>
1488
- <save_cancelled_tid translate="label">
1489
- <label>Display Novalnet Transaction ID for Cancelled Order</label>
1490
- <frontend_type>select</frontend_type>
1491
- <config_path>payment/novalnetPaypal/save_cancelled_tid</config_path>
1492
- <source_model>adminhtml/system_config_source_yesno</source_model>
1493
- <sort_order>9</sort_order>
1494
- <show_in_default>1</show_in_default>
1495
- <show_in_website>1</show_in_website>
1496
- <show_in_store>1</show_in_store>
1497
- </save_cancelled_tid>
1498
- <gateway_timeout translate="label">
1499
- <comment>Gateway Timeout in seconds</comment>
1500
- <label>Gateway Timeout</label>
1501
- <frontend_type>text</frontend_type>
1502
- <config_path>payment/novalnetPaypal/gateway_timeout</config_path>
1503
- <sort_order>10</sort_order>
1504
- <show_in_default>1</show_in_default>
1505
- <show_in_website>1</show_in_website>
1506
- <show_in_store>1</show_in_store>
1507
- </gateway_timeout>
1508
- <allowspecific translate="label">
1509
- <label>Payment from applicable countries</label>
1510
- <frontend_type>allowspecific</frontend_type>
1511
- <config_path>payment/novalnetPaypal/allowspecific</config_path>
1512
- <sort_order>11</sort_order>
1513
- <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1514
- <show_in_default>1</show_in_default>
1515
- <show_in_website>1</show_in_website>
1516
- <show_in_store>1</show_in_store>
1517
- </allowspecific>
1518
- <specificcountry translate="label">
1519
- <label>Payment from Specific countries</label>
1520
- <frontend_type>multiselect</frontend_type>
1521
- <config_path>payment/novalnetPaypal/specificcountry</config_path>
1522
- <sort_order>12</sort_order>
1523
- <source_model>adminhtml/system_config_source_country</source_model>
1524
- <show_in_default>1</show_in_default>
1525
- <show_in_website>1</show_in_website>
1526
- <show_in_store>1</show_in_store>
1527
- <depends><allowspecific>1</allowspecific></depends>
1528
- </specificcountry>
1529
- <model>
1530
- </model>
1531
- <min_order_total translate="label">
1532
- <label>Novalnet Minimum Order Total</label>
1533
- <frontend_type>text</frontend_type>
1534
- <config_path>payment/novalnetPaypal/min_order_total</config_path>
1535
- <sort_order>13</sort_order>
1536
- <show_in_default>1</show_in_default>
1537
- <show_in_website>1</show_in_website>
1538
- <show_in_store>1</show_in_store>
1539
- </min_order_total>
1540
- <max_order_total translate="label">
1541
- <label>Novalnet Maximum Order Total</label>
1542
- <frontend_type>text</frontend_type>
1543
- <config_path>payment/novalnetPaypal/max_order_total</config_path>
1544
- <sort_order>14</sort_order>
1545
- <show_in_default>1</show_in_default>
1546
- <show_in_website>1</show_in_website>
1547
- <show_in_store>1</show_in_store>
1548
- </max_order_total>
1549
- <orderscount translate="label">
1550
- <label>Novalnet Minimum Orders Count</label>
1551
- <frontend_type>text</frontend_type>
1552
- <config_path>payment/novalnetPaypal/orderscount</config_path>
1553
- <sort_order>15</sort_order>
1554
- <comment>Novalnet Minimum Orders Count Desc</comment>
1555
- <show_in_default>1</show_in_default>
1556
- <show_in_website>1</show_in_website>
1557
- <show_in_store>1</show_in_store>
1558
- </orderscount>
1559
- <sort_order translate="label">
1560
- <label>Novalnet Sort Order</label>
1561
- <comment>Sort order of display. Lowest is displayed first.</comment>
1562
- <frontend_type>text</frontend_type>
1563
- <config_path>payment/novalnetPaypal/sort_order</config_path>
1564
- <sort_order>16</sort_order>
1565
- <show_in_default>1</show_in_default>
1566
- <show_in_website>1</show_in_website>
1567
- <show_in_store>1</show_in_store>
1568
- </sort_order>
1569
- </fields>
1570
- </novalnetPaypal>
1571
- <!--}}} Novalnet Paypal-->
1572
- <!--{{{ Novalnet Ideal-->
1573
- <novalnetIdeal translate="label" module="novalnet_payment">
1574
- <label>Novalnet iDEAL</label>
1575
- <frontend_type>text</frontend_type>
1576
- <sort_order>690</sort_order>
1577
- <show_in_default>1</show_in_default>
1578
- <show_in_website>1</show_in_website>
1579
- <show_in_store>1</show_in_store>
1580
- <fields>
1581
- <active translate="label">
1582
- <label>Enable Novalnet Module</label>
1583
- <frontend_type>select</frontend_type>
1584
- <config_path>payment/novalnetIdeal/active</config_path>
1585
- <source_model>adminhtml/system_config_source_yesno</source_model>
1586
- <sort_order>1</sort_order>
1587
- <show_in_default>1</show_in_default>
1588
- <show_in_website>1</show_in_website>
1589
- <show_in_store>1</show_in_store>
1590
- </active>
1591
- <title translate="label">
1592
- <label>Novalnet Title</label>
1593
- <frontend_type>text</frontend_type>
1594
- <config_path>payment/novalnetIdeal/title</config_path>
1595
- <sort_order>2</sort_order>
1596
- <show_in_default>1</show_in_default>
1597
- <show_in_website>1</show_in_website>
1598
- <show_in_store>1</show_in_store>
1599
- </title>
1600
- <order_status translate="label">
1601
- <label>Order Status Before Payment</label>
1602
- <frontend_type>select</frontend_type>
1603
- <config_path>payment/novalnetIdeal/order_status</config_path>
1604
- <source_model>adminhtml/system_config_source_order_status</source_model>
1605
- <sort_order>3</sort_order>
1606
- <show_in_default>1</show_in_default>
1607
- <show_in_website>1</show_in_website>
1608
- <show_in_store>1</show_in_store>
1609
- </order_status>
1610
- <order_status_after_payment translate="label">
1611
- <label>Order Status After Successful Payment</label>
1612
- <frontend_type>select</frontend_type>
1613
- <config_path>payment/novalnetIdeal/order_status_after_payment</config_path>
1614
- <source_model>adminhtml/system_config_source_order_status</source_model>
1615
- <sort_order>4</sort_order>
1616
- <show_in_default>1</show_in_default>
1617
- <show_in_website>1</show_in_website>
1618
- <show_in_store>1</show_in_store>
1619
- </order_status_after_payment>
1620
- <booking_reference translate="label">
1621
- <label>Information to the end customer (this will appear in the payment page)</label>
1622
- <frontend_type>text</frontend_type>
1623
- <config_path>payment/novalnetIdeal/booking_reference</config_path>
1624
- <sort_order>5</sort_order>
1625
- <show_in_default>1</show_in_default>
1626
- <show_in_website>1</show_in_website>
1627
- <show_in_store>1</show_in_store>
1628
- </booking_reference>
1629
- <reference_one translate="label">
1630
- <label>Transaction reference 1</label>
1631
- <comment>This will appear in the transactions details / account statement</comment>
1632
- <frontend_type>text</frontend_type>
1633
- <config_path>payment/novalnetIdeal/reference_one</config_path>
1634
- <sort_order>6</sort_order>
1635
- <show_in_default>1</show_in_default>
1636
- <show_in_website>1</show_in_website>
1637
- <show_in_store>1</show_in_store>
1638
- </reference_one>
1639
- <reference_two translate="label">
1640
- <label>Transaction reference 2</label>
1641
- <comment>This will appear in the transactions details / account statement</comment>
1642
- <frontend_type>text</frontend_type>
1643
- <config_path>payment/novalnetIdeal/reference_two</config_path>
1644
- <sort_order>7</sort_order>
1645
- <show_in_default>1</show_in_default>
1646
- <show_in_website>1</show_in_website>
1647
- <show_in_store>1</show_in_store>
1648
- </reference_two>
1649
- <user_group_excluded translate="label">
1650
- <comment>Excluded User Group Desc</comment>
1651
- <label>User Group Excluded</label>
1652
- <frontend_type>text</frontend_type>
1653
- <config_path>payment/novalnetIdeal/user_group_excluded</config_path>
1654
- <sort_order>8</sort_order>
1655
- <show_in_default>1</show_in_default>
1656
- <show_in_website>1</show_in_website>
1657
- <show_in_store>1</show_in_store>
1658
- </user_group_excluded>
1659
- <save_cancelled_tid translate="label">
1660
- <label>Display Novalnet Transaction ID for Cancelled Order</label>
1661
- <frontend_type>select</frontend_type>
1662
- <config_path>payment/novalnetIdeal/save_cancelled_tid</config_path>
1663
- <source_model>adminhtml/system_config_source_yesno</source_model>
1664
- <sort_order>9</sort_order>
1665
- <show_in_default>1</show_in_default>
1666
- <show_in_website>1</show_in_website>
1667
- <show_in_store>1</show_in_store>
1668
- </save_cancelled_tid>
1669
- <gateway_timeout translate="label">
1670
- <comment>Gateway Timeout in seconds</comment>
1671
- <label>Gateway Timeout</label>
1672
- <frontend_type>text</frontend_type>
1673
- <config_path>payment/novalnetIdeal/gateway_timeout</config_path>
1674
- <sort_order>10</sort_order>
1675
- <show_in_default>1</show_in_default>
1676
- <show_in_website>1</show_in_website>
1677
- <show_in_store>1</show_in_store>
1678
- </gateway_timeout>
1679
- <allowspecific translate="label">
1680
- <label>Payment from applicable countries</label>
1681
- <frontend_type>allowspecific</frontend_type>
1682
- <config_path>payment/novalnetIdeal/allowspecific</config_path>
1683
- <sort_order>11</sort_order>
1684
- <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1685
- <show_in_default>1</show_in_default>
1686
- <show_in_website>1</show_in_website>
1687
- <show_in_store>1</show_in_store>
1688
- </allowspecific>
1689
- <specificcountry translate="label">
1690
- <label>Payment from Specific countries</label>
1691
- <frontend_type>multiselect</frontend_type>
1692
- <config_path>payment/novalnetIdeal/specificcountry</config_path>
1693
- <sort_order>12</sort_order>
1694
- <source_model>adminhtml/system_config_source_country</source_model>
1695
- <show_in_default>1</show_in_default>
1696
- <show_in_website>1</show_in_website>
1697
- <show_in_store>1</show_in_store>
1698
- <depends><allowspecific>1</allowspecific></depends>
1699
- </specificcountry>
1700
- <min_order_total translate="label">
1701
- <label>Novalnet Minimum Order Total</label>
1702
- <frontend_type>text</frontend_type>
1703
- <config_path>payment/novalnetIdeal/min_order_total</config_path>
1704
- <sort_order>13</sort_order>
1705
- <show_in_default>1</show_in_default>
1706
- <show_in_website>1</show_in_website>
1707
- <show_in_store>1</show_in_store>
1708
- </min_order_total>
1709
- <max_order_total translate="label">
1710
- <label>Novalnet Maximum Order Total</label>
1711
- <frontend_type>text</frontend_type>
1712
- <config_path>payment/novalnetIdeal/max_order_total</config_path>
1713
- <sort_order>14</sort_order>
1714
- <show_in_default>1</show_in_default>
1715
- <show_in_website>1</show_in_website>
1716
- <show_in_store>1</show_in_store>
1717
- </max_order_total>
1718
- <orderscount translate="label">
1719
- <label>Novalnet Minimum Orders Count</label>
1720
- <frontend_type>text</frontend_type>
1721
- <config_path>payment/novalnetIdeal/orderscount</config_path>
1722
- <sort_order>15</sort_order>
1723
- <comment>Novalnet Minimum Orders Count Desc</comment>
1724
- <show_in_default>1</show_in_default>
1725
- <show_in_website>1</show_in_website>
1726
- <show_in_store>1</show_in_store>
1727
- </orderscount>
1728
- <sort_order translate="label">
1729
- <label>Novalnet Sort Order</label>
1730
- <comment>Sort order of display. Lowest is displayed first.</comment>
1731
- <frontend_type>text</frontend_type>
1732
- <config_path>payment/novalnetIdeal/sort_order</config_path>
1733
- <sort_order>16</sort_order>
1734
- <show_in_default>1</show_in_default>
1735
- <show_in_website>1</show_in_website>
1736
- <show_in_store>1</show_in_store>
1737
- </sort_order>
1738
- </fields>
1739
- </novalnetIdeal>
1740
- <!--}}} Novalnet Ideal-->
1741
- <!--{{{ Novalnet Phonepayment-->
1742
- <novalnetPhonepayment translate="label" module="novalnet_payment">
1743
- <label>Novalnet Phonepayment</label>
1744
- <sort_order>691</sort_order>
1745
- <show_in_default>1</show_in_default>
1746
- <show_in_website>1</show_in_website>
1747
- <show_in_store>1</show_in_store>
1748
- <fields>
1749
- <active translate="label">
1750
- <label>Enable Novalnet Module</label>
1751
- <frontend_type>select</frontend_type>
1752
- <config_path>payment/novalnetPhonepayment/active</config_path>
1753
- <source_model>adminhtml/system_config_source_yesno</source_model>
1754
- <sort_order>1</sort_order>
1755
- <show_in_default>1</show_in_default>
1756
- <show_in_website>1</show_in_website>
1757
- <show_in_store>1</show_in_store>
1758
- </active>
1759
- <title translate="label">
1760
- <label>Novalnet Title</label>
1761
- <frontend_type>text</frontend_type>
1762
- <config_path>payment/novalnetPhonepayment/title</config_path>
1763
- <sort_order>2</sort_order>
1764
- <show_in_default>1</show_in_default>
1765
- <show_in_website>1</show_in_website>
1766
- <show_in_store>1</show_in_store>
1767
- </title>
1768
- <order_status translate="label">
1769
- <label>Set order Status</label>
1770
- <frontend_type>select</frontend_type>
1771
- <config_path>payment/novalnetPhonepayment/order_status</config_path>
1772
- <source_model>adminhtml/system_config_source_order_status</source_model>
1773
- <sort_order>3</sort_order>
1774
- <show_in_default>1</show_in_default>
1775
- <show_in_website>1</show_in_website>
1776
- <show_in_store>1</show_in_store>
1777
- </order_status>
1778
- <booking_reference translate="label">
1779
- <label>Information to the end customer (this will appear in the payment page)</label>
1780
- <frontend_type>text</frontend_type>
1781
- <config_path>payment/novalnetPhonepayment/booking_reference</config_path>
1782
- <sort_order>4</sort_order>
1783
- <show_in_default>1</show_in_default>
1784
- <show_in_website>1</show_in_website>
1785
- <show_in_store>1</show_in_store>
1786
- </booking_reference>
1787
- <reference_one translate="label">
1788
- <label>Transaction reference 1</label>
1789
- <comment>This will appear in the transactions details / account statement</comment>
1790
- <frontend_type>text</frontend_type>
1791
- <config_path>payment/novalnetPhonepayment/reference_one</config_path>
1792
- <sort_order>5</sort_order>
1793
- <show_in_default>1</show_in_default>
1794
- <show_in_website>1</show_in_website>
1795
- <show_in_store>1</show_in_store>
1796
- </reference_one>
1797
- <reference_two translate="label">
1798
- <label>Transaction reference 2</label>
1799
- <comment>This will appear in the transactions details / account statement</comment>
1800
- <frontend_type>text</frontend_type>
1801
- <config_path>payment/novalnetPhonepayment/reference_two</config_path>
1802
- <sort_order>6</sort_order>
1803
- <show_in_default>1</show_in_default>
1804
- <show_in_website>1</show_in_website>
1805
- <show_in_store>1</show_in_store>
1806
- </reference_two>
1807
- <user_group_excluded translate="label">
1808
- <comment>Excluded User Group Desc</comment>
1809
- <label>User Group Excluded</label>
1810
- <frontend_type>text</frontend_type>
1811
- <config_path>payment/novalnetPhonepayment/user_group_excluded</config_path>
1812
- <sort_order>7</sort_order>
1813
- <show_in_default>1</show_in_default>
1814
- <show_in_website>1</show_in_website>
1815
- <show_in_store>1</show_in_store>
1816
- </user_group_excluded>
1817
- <gateway_timeout translate="label">
1818
- <comment>Gateway Timeout in seconds</comment>
1819
- <label>Gateway Timeout</label>
1820
- <frontend_type>text</frontend_type>
1821
- <config_path>payment/novalnetPhonepayment/gateway_timeout</config_path>
1822
- <sort_order>8</sort_order>
1823
- <show_in_default>1</show_in_default>
1824
- <show_in_website>1</show_in_website>
1825
- <show_in_store>1</show_in_store>
1826
- </gateway_timeout>
1827
- <allowspecific translate="label">
1828
- <label>Payment from applicable countries</label>
1829
- <frontend_type>allowspecific</frontend_type>
1830
- <config_path>payment/novalnetPhonepayment/allowspecific</config_path>
1831
- <sort_order>9</sort_order>
1832
- <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1833
- <show_in_default>1</show_in_default>
1834
- <show_in_website>1</show_in_website>
1835
- <show_in_store>1</show_in_store>
1836
- </allowspecific>
1837
- <specificcountry translate="label">
1838
- <label>Payment from Specific countries</label>
1839
- <frontend_type>multiselect</frontend_type>
1840
- <config_path>payment/novalnetPhonepayment/specificcountry</config_path>
1841
- <sort_order>10</sort_order>
1842
- <source_model>adminhtml/system_config_source_country</source_model>
1843
- <show_in_default>1</show_in_default>
1844
- <show_in_website>1</show_in_website>
1845
- <show_in_store>1</show_in_store>
1846
- <depends><allowspecific>1</allowspecific></depends>
1847
- </specificcountry>
1848
- <min_order_total translate="label">
1849
- <label>Novalnet Minimum Order Total</label>
1850
- <frontend_type>text</frontend_type>
1851
- <config_path>payment/novalnetPhonepayment/min_order_total</config_path>
1852
- <sort_order>11</sort_order>
1853
- <show_in_default>1</show_in_default>
1854
- <show_in_website>1</show_in_website>
1855
- <show_in_store>1</show_in_store>
1856
- </min_order_total>
1857
- <max_order_total translate="label">
1858
- <label>Novalnet Maximum Order Total</label>
1859
- <frontend_type>text</frontend_type>
1860
- <config_path>payment/novalnetPhonepayment/max_order_total</config_path>
1861
- <sort_order>12</sort_order>
1862
- <show_in_default>1</show_in_default>
1863
- <show_in_website>1</show_in_website>
1864
- <show_in_store>1</show_in_store>
1865
- </max_order_total>
1866
- <orderscount translate="label">
1867
- <label>Novalnet Minimum Orders Count</label>
1868
- <frontend_type>text</frontend_type>
1869
- <config_path>payment/novalnetPhonepayment/orderscount</config_path>
1870
- <sort_order>13</sort_order>
1871
- <comment>Novalnet Minimum Orders Count Desc</comment>
1872
- <show_in_default>1</show_in_default>
1873
- <show_in_website>1</show_in_website>
1874
- <show_in_store>1</show_in_store>
1875
- </orderscount>
1876
- <sort_order translate="label">
1877
- <label>Novalnet Sort Order</label>
1878
- <comment>Sort order of display. Lowest is displayed first.</comment>
1879
- <frontend_type>text</frontend_type>
1880
- <config_path>payment/novalnetPhonepayment/sort_order</config_path>
1881
- <sort_order>14</sort_order>
1882
- <show_in_default>1</show_in_default>
1883
- <show_in_website>1</show_in_website>
1884
- <show_in_store>1</show_in_store>
1885
- </sort_order>
1886
- </fields>
1887
- </novalnetPhonepayment>
1888
- <!--}}} Novalnet Phonepayment-->
1889
- <!--{{{ Novalnet Secure-->
1890
- <novalnetSecure translate="label" module="novalnet_payment">
1891
- <label>Novalnet Credit Card 3D-Secure</label>
1892
- <sort_order>682</sort_order>
1893
- <show_in_default>1</show_in_default>
1894
- <show_in_website>1</show_in_website>
1895
- <show_in_store>1</show_in_store>
1896
- <fields>
1897
- <active translate="label">
1898
- <label>Enable Novalnet Module</label>
1899
- <frontend_type>select</frontend_type>
1900
- <config_path>payment/novalnetSecure/active</config_path>
1901
- <source_model>adminhtml/system_config_source_yesno</source_model>
1902
- <sort_order>1</sort_order>
1903
- <show_in_default>1</show_in_default>
1904
- <show_in_website>1</show_in_website>
1905
- <show_in_store>1</show_in_store>
1906
- </active>
1907
- <title translate="label">
1908
- <label>Novalnet Title</label>
1909
- <frontend_type>text</frontend_type>
1910
- <config_path>payment/novalnetSecure/title</config_path>
1911
- <sort_order>2</sort_order>
1912
- <show_in_default>1</show_in_default>
1913
- <show_in_website>1</show_in_website>
1914
- <show_in_store>1</show_in_store>
1915
- </title>
1916
- <order_status translate="label">
1917
- <label>Order Status Before Payment</label>
1918
- <frontend_type>select</frontend_type>
1919
- <config_path>payment/novalnetSecure/order_status</config_path>
1920
- <source_model>adminhtml/system_config_source_order_status</source_model>
1921
- <sort_order>3</sort_order>
1922
- <show_in_default>1</show_in_default>
1923
- <show_in_website>1</show_in_website>
1924
- <show_in_store>1</show_in_store>
1925
- </order_status>
1926
- <order_status_after_payment translate="label">
1927
- <label>Order Status After Successful Payment</label>
1928
- <frontend_type>select</frontend_type>
1929
- <config_path>payment/novalnetSecure/order_status_after_payment</config_path>
1930
- <source_model>adminhtml/system_config_source_order_status</source_model>
1931
- <sort_order>4</sort_order>
1932
- <show_in_default>1</show_in_default>
1933
- <show_in_website>1</show_in_website>
1934
- <show_in_store>1</show_in_store>
1935
- </order_status_after_payment>
1936
- <cctypes translate="label">
1937
- <label>Credit Card Types</label>
1938
- <frontend_type>multiselect</frontend_type>
1939
- <config_path>payment/novalnetSecure/cctypes</config_path>
1940
- <source_model>novalnet_payment/novalnet_source_cctype</source_model>
1941
- <sort_order>5</sort_order>
1942
- <show_in_default>1</show_in_default>
1943
- <show_in_website>1</show_in_website>
1944
- <show_in_store>1</show_in_store>
1945
- </cctypes>
1946
- <manual_checking_amount tranlate="label" >
1947
- <label>Manual checking of order</label>
1948
- <comment>Manual checking of order Desc</comment>
1949
- <frontend_type>text</frontend_type>
1950
- <config_path>payment/novalnetSecure/manual_checking_amount</config_path>
1951
- <sort_order>6</sort_order>
1952
- <show_in_default>1</show_in_default>
1953
- <show_in_website>1</show_in_website>
1954
- <show_in_store>1</show_in_store>
1955
- </manual_checking_amount>
1956
- <second_product_id translate="label">
1957
- <label>Second Product ID for manual check condition</label>
1958
- <comment>Second Product ID in Novalnet to use the manual check condition</comment>
1959
- <frontend_type>text</frontend_type>
1960
- <config_path>payment/novalnetSecure/second_product_id</config_path>
1961
- <sort_order>7</sort_order>
1962
- <show_in_default>1</show_in_default>
1963
- <show_in_website>1</show_in_website>
1964
- <show_in_store>1</show_in_store>
1965
- </second_product_id>
1966
- <second_tariff_id translate="label">
1967
- <label>Second Tariff ID for manual check condition</label>
1968
- <comment>Second Tariff ID in Novalnet to use the manual check condition</comment>
1969
- <frontend_type>text</frontend_type>
1970
- <config_path>payment/novalnetSecure/second_tariff_id</config_path>
1971
- <sort_order>8</sort_order>
1972
- <show_in_default>1</show_in_default>
1973
- <show_in_website>1</show_in_website>
1974
- <show_in_store>1</show_in_store>
1975
- </second_tariff_id>
1976
- <novalnetSecure_error translate="label">
1977
- <label>Auto refill the payment data entered in payment page</label>
1978
- <frontend_type>select</frontend_type>
1979
- <source_model>adminhtml/system_config_source_yesno</source_model>
1980
- <config_path>payment/novalnetSecure/novalnetSecure_error</config_path>
1981
- <sort_order>9</sort_order>
1982
- <show_in_default>1</show_in_default>
1983
- <show_in_website>1</show_in_website>
1984
- <show_in_store>1</show_in_store>
1985
- </novalnetSecure_error>
1986
- <booking_reference translate="label">
1987
- <label>Information to the end customer (this will appear in the payment page)</label>
1988
- <frontend_type>text</frontend_type>
1989
- <config_path>payment/novalnetSecure/booking_reference</config_path>
1990
- <sort_order>10</sort_order>
1991
- <show_in_default>1</show_in_default>
1992
- <show_in_website>1</show_in_website>
1993
- <show_in_store>1</show_in_store>
1994
- </booking_reference>
1995
- <reference_one translate="label">
1996
- <label>Transaction reference 1</label>
1997
- <comment>This will appear in the transactions details / account statement</comment>
1998
- <frontend_type>text</frontend_type>
1999
- <config_path>payment/novalnetSecure/reference_one</config_path>
2000
- <sort_order>11</sort_order>
2001
- <show_in_default>1</show_in_default>
2002
- <show_in_website>1</show_in_website>
2003
- <show_in_store>1</show_in_store>
2004
- </reference_one>
2005
- <reference_two translate="label">
2006
- <label>Transaction reference 2</label>
2007
- <comment>This will appear in the transactions details / account statement</comment>
2008
- <frontend_type>text</frontend_type>
2009
- <config_path>payment/novalnetSecure/reference_two</config_path>
2010
- <sort_order>12</sort_order>
2011
- <show_in_default>1</show_in_default>
2012
- <show_in_website>1</show_in_website>
2013
- <show_in_store>1</show_in_store>
2014
- </reference_two>
2015
- <user_group_excluded translate="label">
2016
- <comment>Excluded User Group Desc</comment>
2017
- <label>User Group Excluded</label>
2018
- <frontend_type>text</frontend_type>
2019
- <config_path>payment/novalnetSecure/user_group_excluded</config_path>
2020
- <sort_order>13</sort_order>
2021
- <show_in_default>1</show_in_default>
2022
- <show_in_website>1</show_in_website>
2023
- <show_in_store>1</show_in_store>
2024
- </user_group_excluded>
2025
- <save_cancelled_tid translate="label">
2026
- <label>Display Novalnet Transaction ID for Cancelled Order</label>
2027
- <frontend_type>select</frontend_type>
2028
- <config_path>payment/novalnetSecure/save_cancelled_tid</config_path>
2029
- <source_model>adminhtml/system_config_source_yesno</source_model>
2030
- <sort_order>14</sort_order>
2031
- <show_in_default>1</show_in_default>
2032
- <show_in_website>1</show_in_website>
2033
- <show_in_store>1</show_in_store>
2034
- </save_cancelled_tid>
2035
- <gateway_timeout translate="label">
2036
- <comment>Gateway Timeout in seconds</comment>
2037
- <label>Gateway Timeout</label>
2038
- <frontend_type>text</frontend_type>
2039
- <config_path>payment/novalnetSecure/gateway_timeout</config_path>
2040
- <sort_order>15</sort_order>
2041
- <show_in_default>1</show_in_default>
2042
- <show_in_website>1</show_in_website>
2043
- <show_in_store>1</show_in_store>
2044
- </gateway_timeout>
2045
- <allowspecific translate="label">
2046
- <label>Payment from applicable countries</label>
2047
- <frontend_type>allowspecific</frontend_type>
2048
- <config_path>payment/novalnetSecure/allowspecific</config_path>
2049
- <sort_order>16</sort_order>
2050
- <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
2051
- <show_in_default>1</show_in_default>
2052
- <show_in_website>1</show_in_website>
2053
- <show_in_store>1</show_in_store>
2054
- </allowspecific>
2055
- <specificcountry translate="label">
2056
- <label>Payment from Specific countries</label>
2057
- <frontend_type>multiselect</frontend_type>
2058
- <config_path>payment/novalnetSecure/specificcountry</config_path>
2059
- <sort_order>17</sort_order>
2060
- <source_model>adminhtml/system_config_source_country</source_model>
2061
- <show_in_default>1</show_in_default>
2062
- <show_in_website>1</show_in_website>
2063
- <show_in_store>1</show_in_store>
2064
- <depends><allowspecific>1</allowspecific></depends>
2065
- </specificcountry>
2066
- <min_order_total translate="label">
2067
- <label>Novalnet Minimum Order Total</label>
2068
- <frontend_type>text</frontend_type>
2069
- <config_path>payment/novalnetSecure/min_order_total</config_path>
2070
- <sort_order>18</sort_order>
2071
- <show_in_default>1</show_in_default>
2072
- <show_in_website>1</show_in_website>
2073
- <show_in_store>1</show_in_store>
2074
- </min_order_total>
2075
- <max_order_total translate="label">
2076
- <label>Novalnet Maximum Order Total</label>
2077
- <frontend_type>text</frontend_type>
2078
- <config_path>payment/novalnetSecure/max_order_total</config_path>
2079
- <sort_order>19</sort_order>
2080
- <show_in_default>1</show_in_default>
2081
- <show_in_website>1</show_in_website>
2082
- <show_in_store>1</show_in_store>
2083
- </max_order_total>
2084
- <orderscount translate="label">
2085
- <label>Novalnet Minimum Orders Count</label>
2086
- <frontend_type>text</frontend_type>
2087
- <config_path>payment/novalnetSecure/orderscount</config_path>
2088
- <sort_order>20</sort_order>
2089
- <comment>Novalnet Minimum Orders Count Desc</comment>
2090
- <show_in_default>1</show_in_default>
2091
- <show_in_website>1</show_in_website>
2092
- <show_in_store>1</show_in_store>
2093
- </orderscount>
2094
- <sort_order translate="label">
2095
- <label>Novalnet Sort Order</label>
2096
- <comment>Sort order of display. Lowest is displayed first.</comment>
2097
- <frontend_type>text</frontend_type>
2098
- <config_path>payment/novalnetSecure/sort_order</config_path>
2099
- <sort_order>21</sort_order>
2100
- <show_in_default>1</show_in_default>
2101
- <show_in_website>1</show_in_website>
2102
- <show_in_store>1</show_in_store>
2103
- </sort_order>
2104
- </fields>
2105
- </novalnetSecure>
2106
- <!--}}} Novalnet Secure-->
2107
- <!--{{{ Novalnet Safetypay-->
2108
- <novalnetSafetypay translate="label" module="novalnet_payment">
2109
- <label>Novalnet Safetypay</label>
2110
- <frontend_type>text</frontend_type>
2111
- <sort_order>690</sort_order>
2112
- <show_in_default>1</show_in_default>
2113
- <show_in_website>1</show_in_website>
2114
- <show_in_store>1</show_in_store>
2115
- <fields>
2116
- <active translate="label">
2117
- <label>Enable Novalnet Module</label>
2118
- <frontend_type>select</frontend_type>
2119
- <config_path>payment/novalnetSafetypay/active</config_path>
2120
- <source_model>adminhtml/system_config_source_yesno</source_model>
2121
- <sort_order>1</sort_order>
2122
- <show_in_default>1</show_in_default>
2123
- <show_in_website>1</show_in_website>
2124
- <show_in_store>1</show_in_store>
2125
- </active>
2126
- <title translate="label">
2127
- <label>Novalnet Title</label>
2128
- <frontend_type>text</frontend_type>
2129
- <config_path>payment/novalnetSafetypay/title</config_path>
2130
- <sort_order>2</sort_order>
2131
- <show_in_default>1</show_in_default>
2132
- <show_in_website>1</show_in_website>
2133
- <show_in_store>1</show_in_store>
2134
- </title>
2135
- <order_status translate="label">
2136
- <label>Order Status Before Payment</label>
2137
- <frontend_type>select</frontend_type>
2138
- <config_path>payment/novalnetSafetypay/order_status</config_path>
2139
- <source_model>adminhtml/system_config_source_order_status</source_model>
2140
- <sort_order>3</sort_order>
2141
- <show_in_default>1</show_in_default>
2142
- <show_in_website>1</show_in_website>
2143
- <show_in_store>1</show_in_store>
2144
- </order_status>
2145
- <order_status_after_payment translate="label">
2146
- <label>Order Status After Successful Payment</label>
2147
- <frontend_type>select</frontend_type>
2148
- <config_path>payment/novalnetSafetypay/order_status_after_payment</config_path>
2149
- <source_model>adminhtml/system_config_source_order_status</source_model>
2150
- <sort_order>4</sort_order>
2151
- <show_in_default>1</show_in_default>
2152
- <show_in_website>1</show_in_website>
2153
- <show_in_store>1</show_in_store>
2154
- </order_status_after_payment>
2155
- <booking_reference translate="label">
2156
- <label>Information to the end customer (this will appear in the payment page)</label>
2157
- <frontend_type>text</frontend_type>
2158
- <config_path>payment/novalnetSafetypay/booking_reference</config_path>
2159
- <sort_order>5</sort_order>
2160
- <show_in_default>1</show_in_default>
2161
- <show_in_website>1</show_in_website>
2162
- <show_in_store>1</show_in_store>
2163
- </booking_reference>
2164
- <reference_one translate="label">
2165
- <label>Transaction reference 1</label>
2166
- <comment>This will appear in the transactions details / account statement</comment>
2167
- <frontend_type>text</frontend_type>
2168
- <config_path>payment/novalnetSafetypay/reference_one</config_path>
2169
- <sort_order>6</sort_order>
2170
- <show_in_default>1</show_in_default>
2171
- <show_in_website>1</show_in_website>
2172
- <show_in_store>1</show_in_store>
2173
- </reference_one>
2174
- <reference_two translate="label">
2175
- <label>Transaction reference 2</label>
2176
- <comment>This will appear in the transactions details / account statement</comment>
2177
- <frontend_type>text</frontend_type>
2178
- <config_path>payment/novalnetSafetypay/reference_two</config_path>
2179
- <sort_order>7</sort_order>
2180
- <show_in_default>1</show_in_default>
2181
- <show_in_website>1</show_in_website>
2182
- <show_in_store>1</show_in_store>
2183
- </reference_two>
2184
- <user_group_excluded translate="label">
2185
- <comment>Excluded User Group Desc</comment>
2186
- <label>User Group Excluded</label>
2187
- <frontend_type>text</frontend_type>
2188
- <config_path>payment/novalnetSafetypay/user_group_excluded</config_path>
2189
- <sort_order>8</sort_order>
2190
- <show_in_default>1</show_in_default>
2191
- <show_in_website>1</show_in_website>
2192
- <show_in_store>1</show_in_store>
2193
- </user_group_excluded>
2194
- <save_cancelled_tid translate="label">
2195
- <label>Display Novalnet Transaction ID for Cancelled Order</label>
2196
- <frontend_type>select</frontend_type>
2197
- <config_path>payment/novalnetSafetypay/save_cancelled_tid</config_path>
2198
- <source_model>adminhtml/system_config_source_yesno</source_model>
2199
- <sort_order>9</sort_order>
2200
- <show_in_default>1</show_in_default>
2201
- <show_in_website>1</show_in_website>
2202
- <show_in_store>1</show_in_store>
2203
- </save_cancelled_tid>
2204
- <gateway_timeout translate="label">
2205
- <comment>Gateway Timeout in seconds</comment>
2206
- <label>Gateway Timeout</label>
2207
- <frontend_type>text</frontend_type>
2208
- <config_path>payment/novalnetSafetypay/gateway_timeout</config_path>
2209
- <sort_order>10</sort_order>
2210
- <show_in_default>1</show_in_default>
2211
- <show_in_website>1</show_in_website>
2212
- <show_in_store>1</show_in_store>
2213
- </gateway_timeout>
2214
- <allowspecific translate="label">
2215
- <label>Payment from applicable countries</label>
2216
- <frontend_type>allowspecific</frontend_type>
2217
- <config_path>payment/novalnetSafetypay/allowspecific</config_path>
2218
- <sort_order>11</sort_order>
2219
- <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
2220
- <show_in_default>1</show_in_default>
2221
- <show_in_website>1</show_in_website>
2222
- <show_in_store>1</show_in_store>
2223
- </allowspecific>
2224
- <specificcountry translate="label">
2225
- <label>Payment from Specific countries</label>
2226
- <frontend_type>multiselect</frontend_type>
2227
- <config_path>payment/novalnetSafetypay/specificcountry</config_path>
2228
- <sort_order>12</sort_order>
2229
- <source_model>adminhtml/system_config_source_country</source_model>
2230
- <show_in_default>1</show_in_default>
2231
- <show_in_website>1</show_in_website>
2232
- <show_in_store>1</show_in_store>
2233
- <depends><allowspecific>1</allowspecific></depends>
2234
- </specificcountry>
2235
- <min_order_total translate="label">
2236
- <label>Novalnet Minimum Order Total</label>
2237
- <frontend_type>text</frontend_type>
2238
- <config_path>payment/novalnetSafetypay/min_order_total</config_path>
2239
- <sort_order>13</sort_order>
2240
- <show_in_default>1</show_in_default>
2241
- <show_in_website>1</show_in_website>
2242
- <show_in_store>1</show_in_store>
2243
- </min_order_total>
2244
- <max_order_total translate="label">
2245
- <label>Novalnet Maximum Order Total</label>
2246
- <frontend_type>text</frontend_type>
2247
- <config_path>payment/novalnetSafetypay/max_order_total</config_path>
2248
- <sort_order>14</sort_order>
2249
- <show_in_default>1</show_in_default>
2250
- <show_in_website>1</show_in_website>
2251
- <show_in_store>1</show_in_store>
2252
- </max_order_total>
2253
- <orderscount translate="label">
2254
- <label>Novalnet Minimum Orders Count</label>
2255
- <frontend_type>text</frontend_type>
2256
- <config_path>payment/novalnetSafetypay/orderscount</config_path>
2257
- <sort_order>15</sort_order>
2258
- <comment>Novalnet Minimum Orders Count Desc</comment>
2259
- <show_in_default>1</show_in_default>
2260
- <show_in_website>1</show_in_website>
2261
- <show_in_store>1</show_in_store>
2262
- </orderscount>
2263
- <sort_order translate="label">
2264
- <label>Novalnet Sort Order</label>
2265
- <comment>Sort order of display. Lowest is displayed first.</comment>
2266
- <frontend_type>text</frontend_type>
2267
- <config_path>payment/novalnetSafetypay/sort_order</config_path>
2268
- <sort_order>16</sort_order>
2269
- <show_in_default>1</show_in_default>
2270
- <show_in_website>1</show_in_website>
2271
- <show_in_store>1</show_in_store>
2272
- </sort_order>
2273
- </fields>
2274
- </novalnetSafetypay>
2275
- <!--}}} Novalnet Safetypay-->
2276
- </groups>
2277
- </novalnet_paymethods>
2278
- <!-- novalnet paymethods -->
2279
 
2280
- <!-- Fraud prevention -->
2281
- <fraud_prevent translate="label" module="novalnet_payment">
2282
- <label>Risk and Control</label>
2283
  <tab>novalnet</tab>
2284
- <frontend_type>text</frontend_type>
2285
  <sort_order>40</sort_order>
2286
  <show_in_default>1</show_in_default>
2287
  <show_in_website>1</show_in_website>
2288
  <show_in_store>1</show_in_store>
2289
- <groups>
2290
- <novalnetCc translate="label" module="novalnet_payment">
2291
- <label>Novalnet Credit Card</label>
2292
- <comment>Enable the payment Method and activate the Risk and Control option</comment>
2293
- <frontend_type>text</frontend_type>
2294
- <sort_order>10</sort_order>
2295
- <show_in_default>1</show_in_default>
2296
- <show_in_website>1</show_in_website>
2297
- <show_in_store>1</show_in_store>
2298
- <fields>
2299
- <callback translate="label">
2300
- <comment>PIN by Callback/SMS/E-Mail Desc</comment>
2301
- <label>Fraudprevention through PIN by Callback/SMS/E-Mail</label>
2302
- <frontend_type>select</frontend_type>
2303
- <config_path>payment/novalnetCc/callback</config_path>
2304
- <source_model>novalnet_payment/novalnet_source_callbacktypes</source_model>
2305
- <sort_order>13</sort_order>
2306
- <show_in_default>1</show_in_default>
2307
- <show_in_website>1</show_in_website>
2308
- <show_in_store>1</show_in_store>
2309
- </callback>
2310
- <callback_minimum_amount>
2311
- <label>Minimum Amount For Callback (in cents)</label>
2312
- <frontend_type>text</frontend_type>
2313
- <config_path>payment/novalnetCc/callback_minimum_amount</config_path>
2314
- <sort_order>14</sort_order>
2315
- <show_in_default>1</show_in_default>
2316
- <show_in_website>1</show_in_website>
2317
- <show_in_store>1</show_in_store>
2318
- </callback_minimum_amount>
2319
- </fields>
2320
- </novalnetCc>
2321
- <novalnetElvaustria translate="label" module="novalnet_payment">
2322
- <label>Novalnet Direct Debit Austria</label>
2323
- <comment>Enable the payment Method and activate the Risk and Control option</comment>
2324
- <frontend_type>text</frontend_type>
2325
- <sort_order>10</sort_order>
2326
- <show_in_default>1</show_in_default>
2327
- <show_in_website>1</show_in_website>
2328
- <show_in_store>1</show_in_store>
2329
- <fields>
2330
- <callback translate="label">
2331
- <comment>PIN by Callback/SMS/E-Mail Desc</comment>
2332
- <label>Fraudprevention through PIN by Callback/SMS/E-Mail</label>
2333
- <frontend_type>select</frontend_type>
2334
- <config_path>payment/novalnetElvaustria/callback</config_path>
2335
- <source_model>novalnet_payment/novalnet_source_callbacktypes</source_model>
2336
- <sort_order>13</sort_order>
2337
- <show_in_default>1</show_in_default>
2338
- <show_in_website>1</show_in_website>
2339
- <show_in_store>1</show_in_store>
2340
- </callback>
2341
- <callback_minimum_amount>
2342
- <label>Minimum Amount For Callback (in cents)</label>
2343
- <frontend_type>text</frontend_type>
2344
- <config_path>payment/novalnetElvaustria/callback_minimum_amount</config_path>
2345
- <sort_order>14</sort_order>
2346
- <show_in_default>1</show_in_default>
2347
- <show_in_website>1</show_in_website>
2348
- <show_in_store>1</show_in_store>
2349
- </callback_minimum_amount>
2350
- </fields>
2351
- </novalnetElvaustria>
2352
- <novalnetElvgerman translate="label" module="novalnet_payment">
2353
- <label>Novalnet Direct Debit German</label>
2354
- <comment>Enable the payment Method and activate the Risk and Control option</comment>
2355
- <frontend_type>text</frontend_type>
2356
- <sort_order>10</sort_order>
2357
- <show_in_default>1</show_in_default>
2358
- <show_in_website>1</show_in_website>
2359
- <show_in_store>1</show_in_store>
2360
- <fields>
2361
- <callback translate="label">
2362
- <comment>PIN by Callback/SMS/E-Mail Desc</comment>
2363
- <label>Fraudprevention through PIN by Callback/SMS/E-Mail</label>
2364
- <frontend_type>select</frontend_type>
2365
- <config_path>payment/novalnetElvgerman/callback</config_path>
2366
- <source_model>novalnet_payment/novalnet_source_callbacktypes</source_model>
2367
- <sort_order>13</sort_order>
2368
- <show_in_default>1</show_in_default>
2369
- <show_in_website>1</show_in_website>
2370
- <show_in_store>1</show_in_store>
2371
- </callback>
2372
- <callback_minimum_amount>
2373
- <label>Minimum Amount For Callback (in cents)</label>
2374
- <frontend_type>text</frontend_type>
2375
- <config_path>payment/novalnetElvgerman/callback_minimum_amount</config_path>
2376
- <sort_order>14</sort_order>
2377
- <show_in_default>1</show_in_default>
2378
- <show_in_website>1</show_in_website>
2379
- <show_in_store>1</show_in_store>
2380
- </callback_minimum_amount>
2381
-
2382
- </fields>
2383
- </novalnetElvgerman>
2384
- <novalnetInvoice translate="label" module="novalnet_payment">
2385
- <label>Novalnet Invoice</label>
2386
- <comment>Enable the payment Method and activate the Risk and Control option</comment>
2387
- <frontend_type>text</frontend_type>
2388
- <sort_order>10</sort_order>
2389
- <show_in_default>1</show_in_default>
2390
- <show_in_website>1</show_in_website>
2391
- <show_in_store>1</show_in_store>
2392
- <fields>
2393
- <callback translate="label">
2394
- <comment>PIN by Callback/SMS/E-Mail Desc</comment>
2395
- <label>Fraudprevention through PIN by Callback/SMS/E-Mail</label>
2396
- <frontend_type>select</frontend_type>
2397
- <config_path>payment/novalnetInvoice/callback</config_path>
2398
- <source_model>novalnet_payment/novalnet_source_callbacktypes</source_model>
2399
- <sort_order>13</sort_order>
2400
- <show_in_default>1</show_in_default>
2401
- <show_in_website>1</show_in_website>
2402
- <show_in_store>1</show_in_store>
2403
- </callback>
2404
- <callback_minimum_amount>
2405
- <label>Minimum Amount For Callback (in cents)</label>
2406
- <frontend_type>text</frontend_type>
2407
- <config_path>payment/novalnetInvoice/callback_minimum_amount</config_path>
2408
- <sort_order>14</sort_order>
2409
- <show_in_default>1</show_in_default>
2410
- <show_in_website>1</show_in_website>
2411
- <show_in_store>1</show_in_store>
2412
- </callback_minimum_amount>
2413
 
2414
- </fields>
2415
- </novalnetInvoice>
2416
- </groups>
2417
- </fraud_prevent>
2418
- <!-- Fraud prevention -->
2419
  </sections>
2420
  </config>
9
  </tabs>
10
  <sections>
11
 
12
+ <!--{{{ Global tab-->
13
+ <novalnet_global translate="label" module="novalnet_payment">
14
+ <label>General</label>
15
  <tab>novalnet</tab>
16
  <frontend_type>text</frontend_type>
17
  <sort_order>20</sort_order>
18
  <show_in_default>1</show_in_default>
19
  <show_in_website>1</show_in_website>
20
  <show_in_store>1</show_in_store>
21
+ <groups>
22
+ <novalnet translate="label" module="novalnet_payment">
23
+ <label>Novalnet Payment</label>
24
+ <frontend_type>text</frontend_type>
25
+ <sort_order>10</sort_order>
26
+ <show_in_default>1</show_in_default>
27
+ <show_in_website>1</show_in_website>
28
+ <show_in_store>1</show_in_store>
29
+ <fields>
30
+ <merchant_id translate="label">
31
+ <label>Novalnet Merchant ID</label>
32
+ <comment>Enter your Novalnet Merchant ID</comment>
33
+ <frontend_type>text</frontend_type>
34
+ <validate>required-entry validate-digits</validate>
35
+ <sort_order>10</sort_order>
36
+ <show_in_default>1</show_in_default>
37
+ <show_in_website>1</show_in_website>
38
+ <show_in_store>1</show_in_store>
39
+ </merchant_id>
40
+ <auth_code translate="label">
41
+ <label>Novalnet Auth Code</label>
42
+ <comment>Enter your Novalnet Merchant Authorisation code</comment>
43
+ <frontend_type>text</frontend_type>
44
+ <validate>required-entry</validate>
45
+ <sort_order>20</sort_order>
46
+ <show_in_default>1</show_in_default>
47
+ <show_in_website>1</show_in_website>
48
+ <show_in_store>1</show_in_store>
49
+ </auth_code>
50
+ <product_id translate="label">
51
+ <label>Novalnet Product ID</label>
52
+ <comment>Enter your Novalnet Product ID</comment>
53
+ <frontend_type>text</frontend_type>
54
+ <validate>required-entry validate-digits</validate>
55
+ <sort_order>30</sort_order>
56
+ <show_in_default>1</show_in_default>
57
+ <show_in_website>1</show_in_website>
58
+ <show_in_store>1</show_in_store>
59
+ </product_id>
60
+ <tariff_id translate="label">
61
+ <label>Novalnet Tariff ID</label>
62
+ <comment>Enter your Novalnet Tariff ID</comment>
63
+ <frontend_type>text</frontend_type>
64
+ <validate>required-entry validate-digits</validate>
65
+ <sort_order>40</sort_order>
66
+ <show_in_default>1</show_in_default>
67
+ <show_in_website>1</show_in_website>
68
+ <show_in_store>1</show_in_store>
69
+ </tariff_id>
70
+ <password translate="label">
71
+ <label>Novalnet Password</label>
72
+ <comment>Enter your Novalnet Password</comment>
73
+ <frontend_type>text</frontend_type>
74
+ <sort_order>50</sort_order>
75
+ <show_in_default>1</show_in_default>
76
+ <show_in_website>1</show_in_website>
77
+ <show_in_store>1</show_in_store>
78
+ </password>
79
+ <live_mode translate="label">
80
+ <label>Novalnet Live Mode</label>
81
+ <comment>Selected payment methods will be in Live Mode</comment>
82
+ <frontend_type>multiselect</frontend_type>
83
+ <source_model>novalnet_payment/system_config_activemethods</source_model>
84
+ <can_be_empty>1</can_be_empty>
85
+ <sort_order>60</sort_order>
86
+ <show_in_default>1</show_in_default>
87
+ <show_in_website>1</show_in_website>
88
+ <show_in_store>1</show_in_store>
89
+ </live_mode>
90
+ <api_user translate="label">
91
+ <label>PAYPAL API User Name</label>
92
+ <comment>Please enter your PayPal API username</comment>
93
+ <frontend_type>text</frontend_type>
94
+ <sort_order>70</sort_order>
95
+ <show_in_default>1</show_in_default>
96
+ <show_in_website>1</show_in_website>
97
+ <show_in_store>1</show_in_store>
98
+ </api_user>
99
+ <api_password translate="label">
100
+ <label>PAYPAL API Password</label>
101
+ <comment>Please enter your PayPal API password</comment>
102
+ <frontend_type>text</frontend_type>
103
+ <sort_order>80</sort_order>
104
+ <show_in_default>1</show_in_default>
105
+ <show_in_website>1</show_in_website>
106
+ <show_in_store>1</show_in_store>
107
+ </api_password>
108
+ <api_sign translate="label">
109
+ <label>PAYPAL API Signature</label>
110
+ <comment>Please enter your PayPal API signature</comment>
111
+ <frontend_type>text</frontend_type>
112
+ <sort_order>90</sort_order>
113
+ <show_in_default>1</show_in_default>
114
+ <show_in_website>1</show_in_website>
115
+ <show_in_store>1</show_in_store>
116
+ </api_sign>
117
+ <referrer_id translate="label">
118
+ <label>Referrer ID</label>
119
+ <comment>Referrer ID Desc</comment>
120
+ <validate>validate-digits</validate>
121
+ <frontend_type>text</frontend_type>
122
+ <sort_order>100</sort_order>
123
+ <show_in_default>1</show_in_default>
124
+ <show_in_website>1</show_in_website>
125
+ <show_in_store>1</show_in_store>
126
+ </referrer_id>
127
+ </fields>
128
+ </novalnet>
129
+ </groups>
130
+ </novalnet_global>
131
  <!--}}} Global tab-->
132
+ <!-- Novalnet paymethods -->
133
  <novalnet_paymethods translate="label" module="novalnet_payment">
134
+ <label>Payment Methods</label>
135
  <tab>novalnet</tab>
136
+ <frontend_type>text</frontend_type>
137
  <sort_order>30</sort_order>
138
  <show_in_default>1</show_in_default>
139
  <show_in_website>1</show_in_website>
140
  <show_in_store>1</show_in_store>
141
+ <groups>
142
+ <!--{{{ Novalnet Credit Card-->
143
+ <novalnetCc translate="label" module="novalnet_payment">
144
+ <label>Novalnet Credit Card</label>
145
+ <sort_order>680</sort_order>
146
+ <show_in_default>1</show_in_default>
147
+ <show_in_website>1</show_in_website>
148
+ <show_in_store>1</show_in_store>
149
+ <fields>
150
+ <active translate="label">
151
+ <label>Enable Novalnet Module</label>
152
+ <frontend_type>select</frontend_type>
153
+ <source_model>adminhtml/system_config_source_yesno</source_model>
154
+ <config_path>payment/novalnetCc/active</config_path>
155
+ <sort_order>1</sort_order>
156
+ <show_in_default>1</show_in_default>
157
+ <show_in_website>1</show_in_website>
158
+ <show_in_store>1</show_in_store>
159
+ </active>
160
+ <title translate="label">
161
+ <label>Novalnet Title</label>
162
+ <frontend_type>text</frontend_type>
163
+ <config_path>payment/novalnetCc/title</config_path>
164
+ <validate>required-entry</validate>
165
+ <sort_order>2</sort_order>
166
+ <show_in_default>1</show_in_default>
167
+ <show_in_website>1</show_in_website>
168
+ <show_in_store>1</show_in_store>
169
+ </title>
170
+ <active_cc3d translate="label">
171
+ <label>Enable cc3d</label>
172
+ <comment>cc3d description</comment>
173
+ <frontend_type>select</frontend_type>
174
+ <source_model>adminhtml/system_config_source_yesno</source_model>
175
+ <config_path>payment/novalnetCc/active_cc3d</config_path>
176
+ <sort_order>3</sort_order>
177
+ <show_in_default>1</show_in_default>
178
+ <show_in_website>1</show_in_website>
179
+ <show_in_store>1</show_in_store>
180
+ </active_cc3d>
181
+ <order_status translate="label">
182
+ <label>Set order Status</label>
183
+ <frontend_type>select</frontend_type>
184
+ <config_path>payment/novalnetCc/order_status</config_path>
185
+ <source_model>adminhtml/system_config_source_order_status</source_model>
186
+ <sort_order>4</sort_order>
187
+ <show_in_default>1</show_in_default>
188
+ <show_in_website>1</show_in_website>
189
+ <show_in_store>1</show_in_store>
190
+ <depends>
191
+ <active_cc3d>0</active_cc3d>
192
+ </depends>
193
+ </order_status>
194
+ <order_status_before_payment translate="label">
195
+ <label>Order Status Before Payment</label>
196
+ <frontend_type>select</frontend_type>
197
+ <config_path>payment/novalnetCc/order_status</config_path>
198
+ <source_model>adminhtml/system_config_source_order_status</source_model>
199
+ <sort_order>4</sort_order>
200
+ <show_in_default>1</show_in_default>
201
+ <show_in_website>1</show_in_website>
202
+ <show_in_store>1</show_in_store>
203
+ <depends>
204
+ <active_cc3d>1</active_cc3d>
205
+ </depends>
206
+ </order_status_before_payment>
207
+ <order_status_after_payment translate="label">
208
+ <label>Order Status After Successful Payment</label>
209
+ <frontend_type>select</frontend_type>
210
+ <config_path>payment/novalnetCc/order_status_after_payment</config_path>
211
+ <source_model>adminhtml/system_config_source_order_status</source_model>
212
+ <sort_order>5</sort_order>
213
+ <show_in_default>1</show_in_default>
214
+ <show_in_website>1</show_in_website>
215
+ <show_in_store>1</show_in_store>
216
+ <depends>
217
+ <active_cc3d>1</active_cc3d>
218
+ </depends>
219
+ </order_status_after_payment>
220
+ <enable_amex_logo translate="label">
221
+ <label>Enable AMEX logo</label>
222
+ <comment>To display AMEX logo in front end</comment>
223
+ <frontend_type>select</frontend_type>
224
+ <source_model>adminhtml/system_config_source_yesno</source_model>
225
+ <config_path>payment/novalnetCc/enable_amex_logo</config_path>
226
+ <sort_order>6</sort_order>
227
+ <show_in_default>1</show_in_default>
228
+ <show_in_website>1</show_in_website>
229
+ <show_in_store>1</show_in_store>
230
+ </enable_amex_logo>
231
+ <manual_checking_amount tranlate="label" >
232
+ <label>Manual checking of order</label>
233
+ <comment>Manual checking of order Desc</comment>
234
+ <frontend_type>text</frontend_type>
235
+ <validate>validate-digits</validate>
236
+ <config_path>payment/novalnetCc/manual_checking_amount</config_path>
237
+ <sort_order>7</sort_order>
238
+ <show_in_default>1</show_in_default>
239
+ <show_in_website>1</show_in_website>
240
+ <show_in_store>1</show_in_store>
241
+ </manual_checking_amount>
242
+ <second_product_id translate="label">
243
+ <label>Second Product ID for manual check condition</label>
244
+ <comment>Second Product ID in Novalnet to use the manual check condition</comment>
245
+ <frontend_type>text</frontend_type>
246
+ <validate>validate-digits</validate>
247
+ <config_path>payment/novalnetCc/second_product_id</config_path>
248
+ <sort_order>8</sort_order>
249
+ <show_in_default>1</show_in_default>
250
+ <show_in_website>1</show_in_website>
251
+ <show_in_store>1</show_in_store>
252
+ </second_product_id>
253
+ <second_tariff_id translate="label">
254
+ <label>Second Tariff ID for manual check condition</label>
255
+ <comment>Second Tariff ID in Novalnet to use the manual check condition</comment>
256
+ <frontend_type>text</frontend_type>
257
+ <validate>validate-digits</validate>
258
+ <config_path>payment/novalnetCc/second_tariff_id</config_path>
259
+ <sort_order>9</sort_order>
260
+ <show_in_default>1</show_in_default>
261
+ <show_in_website>1</show_in_website>
262
+ <show_in_store>1</show_in_store>
263
+ </second_tariff_id>
264
+ <cc_refill translate="label">
265
+ <label>Auto refill the payment data entered in payment page</label>
266
+ <comment>If yes, the entered payment data will be automatically refilled while error handling</comment>
267
+ <frontend_type>select</frontend_type>
268
+ <source_model>adminhtml/system_config_source_yesno</source_model>
269
+ <config_path>payment/novalnetCc/cc_refill</config_path>
270
+ <sort_order>10</sort_order>
271
+ <show_in_default>1</show_in_default>
272
+ <show_in_website>1</show_in_website>
273
+ <show_in_store>1</show_in_store>
274
+ </cc_refill>
275
+ <reference_one translate="label">
276
+ <label>Transaction reference 1</label>
277
+ <comment>This will appear in the transactions details / account statement</comment>
278
+ <frontend_type>text</frontend_type>
279
+ <config_path>payment/novalnetCc/reference_one</config_path>
280
+ <sort_order>11</sort_order>
281
+ <show_in_default>1</show_in_default>
282
+ <show_in_website>1</show_in_website>
283
+ <show_in_store>1</show_in_store>
284
+ </reference_one>
285
+ <reference_two translate="label">
286
+ <label>Transaction reference 2</label>
287
+ <comment>This will appear in the transactions details / account statement</comment>
288
+ <frontend_type>text</frontend_type>
289
+ <config_path>payment/novalnetCc/reference_two</config_path>
290
+ <sort_order>12</sort_order>
291
+ <show_in_default>1</show_in_default>
292
+ <show_in_website>1</show_in_website>
293
+ <show_in_store>1</show_in_store>
294
+ </reference_two>
295
+ <booking_reference translate="label">
296
+ <label>Information to the end customer (this will appear in the payment page)</label>
297
+ <frontend_type>text</frontend_type>
298
+ <config_path>payment/novalnetCc/booking_reference</config_path>
299
+ <sort_order>13</sort_order>
300
+ <show_in_default>1</show_in_default>
301
+ <show_in_website>1</show_in_website>
302
+ <show_in_store>1</show_in_store>
303
+ </booking_reference>
304
+ <user_group_excluded translate="label">
305
+ <comment>Excluded User Group Desc</comment>
306
+ <label>User Group Excluded</label>
307
+ <frontend_type>text</frontend_type>
308
+ <config_path>payment/novalnetCc/user_group_excluded</config_path>
309
+ <sort_order>14</sort_order>
310
+ <show_in_default>1</show_in_default>
311
+ <show_in_website>1</show_in_website>
312
+ <show_in_store>1</show_in_store>
313
+ </user_group_excluded>
314
+ <gateway_timeout translate="label">
315
+ <comment>Gateway Timeout in seconds</comment>
316
+ <label>Gateway Timeout</label>
317
+ <frontend_type>text</frontend_type>
318
+ <config_path>payment/novalnetCc/gateway_timeout</config_path>
319
+ <sort_order>15</sort_order>
320
+ <show_in_default>1</show_in_default>
321
+ <show_in_website>1</show_in_website>
322
+ <show_in_store>1</show_in_store>
323
+ </gateway_timeout>
324
+ <allowspecific translate="label">
325
+ <label>Payment from applicable countries</label>
326
+ <frontend_type>allowspecific</frontend_type>
327
+ <config_path>payment/novalnetCc/allowspecific</config_path>
328
+ <sort_order>16</sort_order>
329
+ <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
330
+ <show_in_default>1</show_in_default>
331
+ <show_in_website>1</show_in_website>
332
+ <show_in_store>1</show_in_store>
333
+ </allowspecific>
334
+ <specificcountry translate="label">
335
+ <label>Payment from Specific countries</label>
336
+ <frontend_type>multiselect</frontend_type>
337
+ <config_path>payment/novalnetCc/specificcountry</config_path>
338
+ <sort_order>17</sort_order>
339
+ <source_model>adminhtml/system_config_source_country</source_model>
340
+ <show_in_default>1</show_in_default>
341
+ <show_in_website>1</show_in_website>
342
+ <show_in_store>1</show_in_store>
343
+ <depends>
344
+ <allowspecific>1</allowspecific>
345
+ </depends>
346
+ </specificcountry>
347
+ <min_order_total translate="label">
348
+ <label>Novalnet Minimum Order Total</label>
349
+ <frontend_type>text</frontend_type>
350
+ <config_path>payment/novalnetCc/min_order_total</config_path>
351
+ <sort_order>18</sort_order>
352
+ <show_in_default>1</show_in_default>
353
+ <show_in_website>1</show_in_website>
354
+ <show_in_store>1</show_in_store>
355
+ </min_order_total>
356
+ <max_order_total translate="label">
357
+ <label>Novalnet Maximum Order Total</label>
358
+ <frontend_type>text</frontend_type>
359
+ <config_path>payment/novalnetCc/max_order_total</config_path>
360
+ <sort_order>19</sort_order>
361
+ <show_in_default>1</show_in_default>
362
+ <show_in_website>1</show_in_website>
363
+ <show_in_store>1</show_in_store>
364
+ </max_order_total>
365
+ <orderscount translate="label">
366
+ <label>Novalnet Minimum Orders Count</label>
367
+ <frontend_type>text</frontend_type>
368
+ <config_path>payment/novalnetCc/orderscount</config_path>
369
+ <sort_order>20</sort_order>
370
+ <comment>Novalnet Minimum Orders Count Desc</comment>
371
+ <show_in_default>1</show_in_default>
372
+ <show_in_website>1</show_in_website>
373
+ <show_in_store>1</show_in_store>
374
+ </orderscount>
375
+ <sort_order translate="label">
376
+ <label>Novalnet Sort Order</label>
377
+ <comment>Sort order of display. Lowest is displayed first.</comment>
378
+ <frontend_type>text</frontend_type>
379
+ <config_path>payment/novalnetCc/sort_order</config_path>
380
+ <sort_order>21</sort_order>
381
+ <show_in_default>1</show_in_default>
382
+ <show_in_website>1</show_in_website>
383
+ <show_in_store>1</show_in_store>
384
+ </sort_order>
385
+ </fields>
386
+ </novalnetCc>
387
+ <!--}}} Novalnet Credit Card-->
388
+ <!--{{{ Novalnet SEPA-->
389
+ <novalnetSepa translate="label" module="novalnet_payment">
390
+ <label>Novalnet Direct Debit SEPA</label>
391
+ <sort_order>683</sort_order>
392
+ <show_in_default>1</show_in_default>
393
+ <show_in_website>1</show_in_website>
394
+ <show_in_store>1</show_in_store>
395
+ <fields>
396
+ <active translate="label">
397
+ <label>Enable Novalnet Module</label>
398
+ <frontend_type>select</frontend_type>
399
+ <source_model>adminhtml/system_config_source_yesno</source_model>
400
+ <config_path>payment/novalnetSepa/active</config_path>
401
+ <sort_order>1</sort_order>
402
+ <show_in_default>1</show_in_default>
403
+ <show_in_website>1</show_in_website>
404
+ <show_in_store>1</show_in_store>
405
+ </active>
406
+ <title translate="label">
407
+ <label>Novalnet Title</label>
408
+ <frontend_type>text</frontend_type>
409
+ <config_path>payment/novalnetSepa/title</config_path>
410
+ <validate>required-entry</validate>
411
+ <sort_order>2</sort_order>
412
+ <show_in_default>1</show_in_default>
413
+ <show_in_website>1</show_in_website>
414
+ <show_in_store>1</show_in_store>
415
+ </title>
416
+ <order_status translate="label">
417
+ <label>Set order Status</label>
418
+ <frontend_type>select</frontend_type>
419
+ <config_path>payment/novalnetSepa/order_status</config_path>
420
+ <source_model>adminhtml/system_config_source_order_status</source_model>
421
+ <sort_order>3</sort_order>
422
+ <show_in_default>1</show_in_default>
423
+ <show_in_website>1</show_in_website>
424
+ <show_in_store>1</show_in_store>
425
+ </order_status>
426
+ <manual_checking_amount tranlate="label" >
427
+ <label>Manual checking of order</label>
428
+ <comment>Manual checking of order Desc</comment>
429
+ <frontend_type>text</frontend_type>
430
+ <validate>validate-digits</validate>
431
+ <config_path>payment/novalnetSepa/manual_checking_amount</config_path>
432
+ <sort_order>4</sort_order>
433
+ <show_in_default>1</show_in_default>
434
+ <show_in_website>1</show_in_website>
435
+ <show_in_store>1</show_in_store>
436
+ </manual_checking_amount>
437
+ <second_product_id translate="label">
438
+ <label>Second Product ID for manual check condition</label>
439
+ <comment>Second Product ID in Novalnet to use the manual check condition</comment>
440
+ <frontend_type>text</frontend_type>
441
+ <validate>validate-digits</validate>
442
+ <config_path>payment/novalnetSepa/second_product_id</config_path>
443
+ <sort_order>5</sort_order>
444
+ <show_in_default>1</show_in_default>
445
+ <show_in_website>1</show_in_website>
446
+ <show_in_store>1</show_in_store>
447
+ </second_product_id>
448
+ <second_tariff_id translate="label">
449
+ <label>Second Tariff ID for manual check condition</label>
450
+ <comment>Second Tariff ID in Novalnet to use the manual check condition</comment>
451
+ <frontend_type>text</frontend_type>
452
+ <validate>validate-digits</validate>
453
+ <config_path>payment/novalnetSepa/second_tariff_id</config_path>
454
+ <sort_order>6</sort_order>
455
+ <show_in_default>1</show_in_default>
456
+ <show_in_website>1</show_in_website>
457
+ <show_in_store>1</show_in_store>
458
+ </second_tariff_id>
459
+ <sepa_refill translate="label">
460
+ <label>Auto refill the payment data entered in payment page</label>
461
+ <comment>If yes, the entered payment data will be automatically refilled while error handling</comment>
462
+ <frontend_type>select</frontend_type>
463
+ <source_model>adminhtml/system_config_source_yesno</source_model>
464
+ <config_path>payment/novalnetSepa/sepa_refill</config_path>
465
+ <sort_order>7</sort_order>
466
+ <show_in_default>1</show_in_default>
467
+ <show_in_website>1</show_in_website>
468
+ <show_in_store>1</show_in_store>
469
+ </sepa_refill>
470
+ <sepa_duedate translate="label">
471
+ <label>SEPA Payment duration in days</label>
472
+ <comment>SEPA Due Date description</comment>
473
+ <frontend_type>text</frontend_type>
474
+ <validate>validate-digits validate-greater-than-zero</validate>
475
+ <config_path>payment/novalnetSepa/sepa_due_date</config_path>
476
+ <sort_order>8</sort_order>
477
+ <show_in_default>1</show_in_default>
478
+ <show_in_website>1</show_in_website>
479
+ <show_in_store>1</show_in_store>
480
+ </sepa_duedate>
481
+ <sepa_refill translate="label">
482
+ <label>Auto refill the payment data entered in payment page</label>
483
+ <frontend_type>select</frontend_type>
484
+ <source_model>adminhtml/system_config_source_yesno</source_model>
485
+ <config_path>payment/novalnetSepa/sepa_refill</config_path>
486
+ <sort_order>9</sort_order>
487
+ <show_in_default>1</show_in_default>
488
+ <show_in_website>1</show_in_website>
489
+ <show_in_store>1</show_in_store>
490
+ </sepa_refill>
491
+ <reference_one translate="label">
492
+ <label>Transaction reference 1</label>
493
+ <comment>This will appear in the transactions details / account statement</comment>
494
+ <frontend_type>text</frontend_type>
495
+ <config_path>payment/novalnetSepa/reference_one</config_path>
496
+ <sort_order>10</sort_order>
497
+ <show_in_default>1</show_in_default>
498
+ <show_in_website>1</show_in_website>
499
+ <show_in_store>1</show_in_store>
500
+ </reference_one>
501
+ <reference_two translate="label">
502
+ <label>Transaction reference 2</label>
503
+ <comment>This will appear in the transactions details / account statement</comment>
504
+ <frontend_type>text</frontend_type>
505
+ <config_path>payment/novalnetSepa/reference_two</config_path>
506
+ <sort_order>11</sort_order>
507
+ <show_in_default>1</show_in_default>
508
+ <show_in_website>1</show_in_website>
509
+ <show_in_store>1</show_in_store>
510
+ </reference_two>
511
+ <booking_reference translate="label">
512
+ <label>Information to the end customer (this will appear in the payment page)</label>
513
+ <frontend_type>text</frontend_type>
514
+ <config_path>payment/novalnetSepa/booking_reference</config_path>
515
+ <sort_order>12</sort_order>
516
+ <show_in_default>1</show_in_default>
517
+ <show_in_website>1</show_in_website>
518
+ <show_in_store>1</show_in_store>
519
+ </booking_reference>
520
+ <user_group_excluded translate="label">
521
+ <comment>Excluded User Group Desc</comment>
522
+ <label>User Group Excluded</label>
523
+ <frontend_type>text</frontend_type>
524
+ <config_path>payment/novalnetSepa/user_group_excluded</config_path>
525
+ <sort_order>13</sort_order>
526
+ <show_in_default>1</show_in_default>
527
+ <show_in_website>1</show_in_website>
528
+ <show_in_store>1</show_in_store>
529
+ </user_group_excluded>
530
+ <gateway_timeout translate="label">
531
+ <comment>Gateway Timeout in seconds</comment>
532
+ <label>Gateway Timeout</label>
533
+ <frontend_type>text</frontend_type>
534
+ <config_path>payment/novalnetSepa/gateway_timeout</config_path>
535
+ <sort_order>14</sort_order>
536
+ <show_in_default>1</show_in_default>
537
+ <show_in_website>1</show_in_website>
538
+ <show_in_store>1</show_in_store>
539
+ </gateway_timeout>
540
+ <allowspecific translate="label">
541
+ <label>Payment from applicable countries</label>
542
+ <frontend_type>allowspecific</frontend_type>
543
+ <config_path>payment/novalnetSepa/allowspecific</config_path>
544
+ <sort_order>15</sort_order>
545
+ <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
546
+ <show_in_default>1</show_in_default>
547
+ <show_in_website>1</show_in_website>
548
+ <show_in_store>1</show_in_store>
549
+ </allowspecific>
550
+ <specificcountry translate="label">
551
+ <label>Payment from Specific countries</label>
552
+ <frontend_type>multiselect</frontend_type>
553
+ <config_path>payment/novalnetSepa/specificcountry</config_path>
554
+ <sort_order>16</sort_order>
555
+ <source_model>adminhtml/system_config_source_country</source_model>
556
+ <show_in_default>1</show_in_default>
557
+ <show_in_website>1</show_in_website>
558
+ <show_in_store>1</show_in_store>
559
+ <depends>
560
+ <allowspecific>1</allowspecific>
561
+ </depends>
562
+ </specificcountry>
563
+ <min_order_total translate="label">
564
+ <label>Novalnet Minimum Order Total</label>
565
+ <frontend_type>text</frontend_type>
566
+ <config_path>payment/novalnetSepa/min_order_total</config_path>
567
+ <sort_order>17</sort_order>
568
+ <show_in_default>1</show_in_default>
569
+ <show_in_website>1</show_in_website>
570
+ <show_in_store>1</show_in_store>
571
+ </min_order_total>
572
+ <max_order_total translate="label">
573
+ <label>Novalnet Maximum Order Total</label>
574
+ <frontend_type>text</frontend_type>
575
+ <config_path>payment/novalnetSepa/max_order_total</config_path>
576
+ <sort_order>18</sort_order>
577
+ <show_in_default>1</show_in_default>
578
+ <show_in_website>1</show_in_website>
579
+ <show_in_store>1</show_in_store>
580
+ </max_order_total>
581
+ <orderscount translate="label">
582
+ <label>Novalnet Minimum Orders Count</label>
583
+ <frontend_type>text</frontend_type>
584
+ <config_path>payment/novalnetSepa/orderscount</config_path>
585
+ <sort_order>19</sort_order>
586
+ <comment>Novalnet Minimum Orders Count Desc</comment>
587
+ <show_in_default>1</show_in_default>
588
+ <show_in_website>1</show_in_website>
589
+ <show_in_store>1</show_in_store>
590
+ </orderscount>
591
+ <sort_order translate="label">
592
+ <label>Novalnet Sort Order</label>
593
+ <comment>Sort order of display. Lowest is displayed first.</comment>
594
+ <frontend_type>text</frontend_type>
595
+ <config_path>payment/novalnetSepa/sort_order</config_path>
596
+ <sort_order>20</sort_order>
597
+ <show_in_default>1</show_in_default>
598
+ <show_in_website>1</show_in_website>
599
+ <show_in_store>1</show_in_store>
600
+ </sort_order>
601
+ </fields>
602
+ </novalnetSepa>
603
+ <!--}}} Novalnet SEPA-->
604
+ <!--{{{ Novalnet Invoice-->
605
+ <novalnetInvoice translate="label" module="novalnet_payment">
606
+ <label>Novalnet Invoice</label>
607
+ <sort_order>684</sort_order>
608
+ <show_in_default>1</show_in_default>
609
+ <show_in_website>1</show_in_website>
610
+ <show_in_store>1</show_in_store>
611
+ <fields>
612
+ <active translate="label">
613
+ <label>Enable Novalnet Module</label>
614
+ <frontend_type>select</frontend_type>
615
+ <config_path>payment/novalnetInvoice/active</config_path>
616
+ <source_model>adminhtml/system_config_source_yesno</source_model>
617
+ <sort_order>1</sort_order>
618
+ <show_in_default>1</show_in_default>
619
+ <show_in_website>1</show_in_website>
620
+ <show_in_store>1</show_in_store>
621
+ </active>
622
+ <title translate="label">
623
+ <label>Novalnet Title</label>
624
+ <frontend_type>text</frontend_type>
625
+ <config_path>payment/novalnetInvoice/title</config_path>
626
+ <validate>required-entry</validate>
627
+ <sort_order>2</sort_order>
628
+ <show_in_default>1</show_in_default>
629
+ <show_in_website>1</show_in_website>
630
+ <show_in_store>1</show_in_store>
631
+ </title>
632
+ <order_status translate="label">
633
+ <label>Order Status Before Payment</label>
634
+ <frontend_type>select</frontend_type>
635
+ <config_path>payment/novalnetInvoice/order_status</config_path>
636
+ <source_model>adminhtml/system_config_source_order_status</source_model>
637
+ <sort_order>3</sort_order>
638
+ <show_in_default>1</show_in_default>
639
+ <show_in_website>1</show_in_website>
640
+ <show_in_store>1</show_in_store>
641
+ </order_status>
642
+ <order_status_after_payment translate="label">
643
+ <label>Order Status After Payment</label>
644
+ <frontend_type>select</frontend_type>
645
+ <config_path>payment/novalnetInvoice/order_status_after_payment</config_path>
646
+ <source_model>adminhtml/system_config_source_order_status</source_model>
647
+ <sort_order>4</sort_order>
648
+ <show_in_default>1</show_in_default>
649
+ <show_in_website>1</show_in_website>
650
+ <show_in_store>1</show_in_store>
651
+ </order_status_after_payment>
652
+ <booking_reference translate="label">
653
+ <label>Information to the end customer (this will appear in the payment page)</label>
654
+ <frontend_type>text</frontend_type>
655
+ <config_path>payment/novalnetInvoice/booking_reference</config_path>
656
+ <sort_order>5</sort_order>
657
+ <show_in_default>1</show_in_default>
658
+ <show_in_website>1</show_in_website>
659
+ <show_in_store>1</show_in_store>
660
+ </booking_reference>
661
+ <reference_one translate="label">
662
+ <label>Transaction reference 1</label>
663
+ <comment>This will appear in the transactions details / account statement</comment>
664
+ <frontend_type>text</frontend_type>
665
+ <config_path>payment/novalnetInvoice/reference_one</config_path>
666
+ <sort_order>6</sort_order>
667
+ <show_in_default>1</show_in_default>
668
+ <show_in_website>1</show_in_website>
669
+ <show_in_store>1</show_in_store>
670
+ </reference_one>
671
+ <reference_two translate="label">
672
+ <label>Transaction reference 2</label>
673
+ <comment>This will appear in the transactions details / account statement</comment>
674
+ <frontend_type>text</frontend_type>
675
+ <config_path>payment/novalnetInvoice/reference_two</config_path>
676
+ <sort_order>7</sort_order>
677
+ <show_in_default>1</show_in_default>
678
+ <show_in_website>1</show_in_website>
679
+ <show_in_store>1</show_in_store>
680
+ </reference_two>
681
+ <payment_duration translate="label">
682
+ <label>Payment period in days</label>
683
+ <comment>Invoice Due Date description</comment>
684
+ <frontend_type>text</frontend_type>
685
+ <validate>validate-digits</validate>
686
+ <config_path>payment/novalnetInvoice/payment_duration</config_path>
687
+ <sort_order>8</sort_order>
688
+ <show_in_default>1</show_in_default>
689
+ <show_in_website>1</show_in_website>
690
+ <show_in_store>1</show_in_store>
691
+ </payment_duration>
692
+ <user_group_excluded translate="label">
693
+ <comment>Excluded User Group Desc</comment>
694
+ <label>User Group Excluded</label>
695
+ <frontend_type>text</frontend_type>
696
+ <config_path>payment/novalnetInvoice/user_group_excluded</config_path>
697
+ <sort_order>9</sort_order>
698
+ <show_in_default>1</show_in_default>
699
+ <show_in_website>1</show_in_website>
700
+ <show_in_store>1</show_in_store>
701
+ </user_group_excluded>
702
+ <gateway_timeout translate="label">
703
+ <comment>Gateway Timeout in seconds</comment>
704
+ <label>Gateway Timeout</label>
705
+ <frontend_type>text</frontend_type>
706
+ <config_path>payment/novalnetInvoice/gateway_timeout</config_path>
707
+ <sort_order>10</sort_order>
708
+ <show_in_default>1</show_in_default>
709
+ <show_in_website>1</show_in_website>
710
+ <show_in_store>1</show_in_store>
711
+ </gateway_timeout>
712
+ <allowspecific translate="label">
713
+ <label>Payment from applicable countries</label>
714
+ <frontend_type>allowspecific</frontend_type>
715
+ <config_path>payment/novalnetInvoice/allowspecific</config_path>
716
+ <sort_order>11</sort_order>
717
+ <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
718
+ <show_in_default>1</show_in_default>
719
+ <show_in_website>1</show_in_website>
720
+ <show_in_store>1</show_in_store>
721
+ </allowspecific>
722
+ <specificcountry translate="label">
723
+ <label>Payment from Specific countries</label>
724
+ <frontend_type>multiselect</frontend_type>
725
+ <config_path>payment/novalnetInvoice/specificcountry</config_path>
726
+ <sort_order>12</sort_order>
727
+ <source_model>adminhtml/system_config_source_country</source_model>
728
+ <show_in_default>1</show_in_default>
729
+ <show_in_website>1</show_in_website>
730
+ <show_in_store>1</show_in_store>
731
+ <depends>
732
+ <allowspecific>1</allowspecific>
733
+ </depends>
734
+ </specificcountry>
735
+ <min_order_total translate="label">
736
+ <label>Novalnet Minimum Order Total</label>
737
+ <frontend_type>text</frontend_type>
738
+ <validate>validate-number</validate>
739
+ <config_path>payment/novalnetInvoice/min_order_total</config_path>
740
+ <sort_order>13</sort_order>
741
+ <show_in_default>1</show_in_default>
742
+ <show_in_website>1</show_in_website>
743
+ <show_in_store>1</show_in_store>
744
+ </min_order_total>
745
+ <max_order_total translate="label">
746
+ <label>Novalnet Maximum Order Total</label>
747
+ <frontend_type>text</frontend_type>
748
+ <validate>validate-number</validate>
749
+ <config_path>payment/novalnetInvoice/max_order_total</config_path>
750
+ <sort_order>14</sort_order>
751
+ <show_in_default>1</show_in_default>
752
+ <show_in_website>1</show_in_website>
753
+ <show_in_store>1</show_in_store>
754
+ </max_order_total>
755
+ <orderscount translate="label">
756
+ <label>Novalnet Minimum Orders Count</label>
757
+ <frontend_type>text</frontend_type>
758
+ <validate>validate-digits</validate>
759
+ <config_path>payment/novalnetInvoice/orderscount</config_path>
760
+ <sort_order>15</sort_order>
761
+ <comment>Novalnet Minimum Orders Count Desc</comment>
762
+ <show_in_default>1</show_in_default>
763
+ <show_in_website>1</show_in_website>
764
+ <show_in_store>1</show_in_store>
765
+ </orderscount>
766
+ <sort_order translate="label">
767
+ <label>Novalnet Sort Order</label>
768
+ <comment>Sort order of display. Lowest is displayed first.</comment>
769
+ <frontend_type>text</frontend_type>
770
+ <validate>validate-digits</validate>
771
+ <config_path>payment/novalnetInvoice/sort_order</config_path>
772
+ <sort_order>16</sort_order>
773
+ <show_in_default>1</show_in_default>
774
+ <show_in_website>1</show_in_website>
775
+ <show_in_store>1</show_in_store>
776
+ </sort_order>
777
+ </fields>
778
+ </novalnetInvoice>
779
+ <!--}}} Novalnet Invoice-->
780
+ <!--{{{ Novalnet Prepayment-->
781
+ <novalnetPrepayment translate="label" module="novalnet_payment">
782
+ <label>Novalnet Prepayment</label>
783
+ <sort_order>685</sort_order>
784
+ <show_in_default>1</show_in_default>
785
+ <show_in_website>1</show_in_website>
786
+ <show_in_store>1</show_in_store>
787
+ <fields>
788
+ <active translate="label">
789
+ <label>Enable Novalnet Module</label>
790
+ <frontend_type>select</frontend_type>
791
+ <config_path>payment/novalnetPrepayment/active</config_path>
792
+ <source_model>adminhtml/system_config_source_yesno</source_model>
793
+ <sort_order>1</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>
797
+ </active>
798
+ <title translate="label">
799
+ <label>Novalnet Title</label>
800
+ <frontend_type>text</frontend_type>
801
+ <config_path>payment/novalnetPrepayment/title</config_path>
802
+ <validate>required-entry</validate>
803
+ <sort_order>2</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>
807
+ </title>
808
+ <order_status translate="label">
809
+ <label>Order Status Before Payment</label>
810
+ <frontend_type>select</frontend_type>
811
+ <config_path>payment/novalnetPrepayment/order_status</config_path>
812
+ <source_model>adminhtml/system_config_source_order_status</source_model>
813
+ <sort_order>3</sort_order>
814
+ <show_in_default>1</show_in_default>
815
+ <show_in_website>1</show_in_website>
816
+ <show_in_store>1</show_in_store>
817
+ </order_status>
818
+ <order_status_after_payment translate="label">
819
+ <label>Order Status After Payment</label>
820
+ <frontend_type>select</frontend_type>
821
+ <config_path>payment/novalnetPrepayment/order_status_after_payment</config_path>
822
+ <source_model>adminhtml/system_config_source_order_status</source_model>
823
+ <sort_order>4</sort_order>
824
+ <show_in_default>1</show_in_default>
825
+ <show_in_website>1</show_in_website>
826
+ <show_in_store>1</show_in_store>
827
+ </order_status_after_payment>
828
+ <booking_reference translate="label">
829
+ <label>Information to the end customer (this will appear in the payment page)</label>
830
+ <frontend_type>text</frontend_type>
831
+ <config_path>payment/novalnetPrepayment/booking_reference</config_path>
832
+ <sort_order>5</sort_order>
833
+ <show_in_default>1</show_in_default>
834
+ <show_in_website>1</show_in_website>
835
+ <show_in_store>1</show_in_store>
836
+ </booking_reference>
837
+ <reference_one translate="label">
838
+ <label>Transaction reference 1</label>
839
+ <comment>This will appear in the transactions details / account statement</comment>
840
+ <frontend_type>text</frontend_type>
841
+ <config_path>payment/novalnetPrepayment/reference_one</config_path>
842
+ <sort_order>6</sort_order>
843
+ <show_in_default>1</show_in_default>
844
+ <show_in_website>1</show_in_website>
845
+ <show_in_store>1</show_in_store>
846
+ </reference_one>
847
+ <reference_two translate="label">
848
+ <label>Transaction reference 2</label>
849
+ <comment>This will appear in the transactions details / account statement</comment>
850
+ <frontend_type>text</frontend_type>
851
+ <config_path>payment/novalnetPrepayment/reference_two</config_path>
852
+ <sort_order>7</sort_order>
853
+ <show_in_default>1</show_in_default>
854
+ <show_in_website>1</show_in_website>
855
+ <show_in_store>1</show_in_store>
856
+ </reference_two>
857
+ <user_group_excluded translate="label">
858
+ <comment>Excluded User Group Desc</comment>
859
+ <label>User Group Excluded</label>
860
+ <frontend_type>text</frontend_type>
861
+ <config_path>payment/novalnetPrepayment/user_group_excluded</config_path>
862
+ <sort_order>8</sort_order>
863
+ <show_in_default>1</show_in_default>
864
+ <show_in_website>1</show_in_website>
865
+ <show_in_store>1</show_in_store>
866
+ </user_group_excluded>
867
+ <gateway_timeout translate="label">
868
+ <comment>Gateway Timeout in seconds</comment>
869
+ <label>Gateway Timeout</label>
870
+ <frontend_type>text</frontend_type>
871
+ <config_path>payment/novalnetPrepayment/gateway_timeout</config_path>
872
+ <sort_order>9</sort_order>
873
+ <show_in_default>1</show_in_default>
874
+ <show_in_website>1</show_in_website>
875
+ <show_in_store>1</show_in_store>
876
+ </gateway_timeout>
877
+ <allowspecific translate="label">
878
+ <label>Payment from applicable countries</label>
879
+ <frontend_type>allowspecific</frontend_type>
880
+ <config_path>payment/novalnetPrepayment/allowspecific</config_path>
881
+ <sort_order>10</sort_order>
882
+ <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
883
+ <show_in_default>1</show_in_default>
884
+ <show_in_website>1</show_in_website>
885
+ <show_in_store>1</show_in_store>
886
+ </allowspecific>
887
+ <specificcountry translate="label">
888
+ <label>Payment from Specific countries</label>
889
+ <frontend_type>multiselect</frontend_type>
890
+ <config_path>payment/novalnetPrepayment/specificcountry</config_path>
891
+ <sort_order>11</sort_order>
892
+ <source_model>adminhtml/system_config_source_country</source_model>
893
+ <show_in_default>1</show_in_default>
894
+ <show_in_website>1</show_in_website>
895
+ <show_in_store>1</show_in_store>
896
+ <depends>
897
+ <allowspecific>1</allowspecific>
898
+ </depends>
899
+ </specificcountry>
900
+ <min_order_total translate="label">
901
+ <label>Novalnet Minimum Order Total</label>
902
+ <frontend_type>text</frontend_type>
903
+ <validate>validate-number</validate>
904
+ <config_path>payment/novalnetPrepayment/min_order_total</config_path>
905
+ <sort_order>12</sort_order>
906
+ <show_in_default>1</show_in_default>
907
+ <show_in_website>1</show_in_website>
908
+ <show_in_store>1</show_in_store>
909
+ </min_order_total>
910
+ <max_order_total translate="label">
911
+ <label>Novalnet Maximum Order Total</label>
912
+ <frontend_type>text</frontend_type>
913
+ <validate>validate-number</validate>
914
+ <config_path>payment/novalnetPrepayment/max_order_total</config_path>
915
+ <sort_order>13</sort_order>
916
+ <show_in_default>1</show_in_default>
917
+ <show_in_website>1</show_in_website>
918
+ <show_in_store>1</show_in_store>
919
+ </max_order_total>
920
+ <orderscount translate="label">
921
+ <label>Novalnet Minimum Orders Count</label>
922
+ <frontend_type>text</frontend_type>
923
+ <validate>validate-digits</validate>
924
+ <config_path>payment/novalnetPrepayment/orderscount</config_path>
925
+ <sort_order>14</sort_order>
926
+ <comment>Novalnet Minimum Orders Count Desc</comment>
927
+ <show_in_default>1</show_in_default>
928
+ <show_in_website>1</show_in_website>
929
+ <show_in_store>1</show_in_store>
930
+ </orderscount>
931
+ <sort_order translate="label">
932
+ <label>Novalnet Sort Order</label>
933
+ <comment>Sort order of display. Lowest is displayed first.</comment>
934
+ <frontend_type>text</frontend_type>
935
+ <validate>validate-digits</validate>
936
+ <config_path>payment/novalnetPrepayment/sort_order</config_path>
937
+ <sort_order>15</sort_order>
938
+ <show_in_default>1</show_in_default>
939
+ <show_in_website>1</show_in_website>
940
+ <show_in_store>1</show_in_store>
941
+ </sort_order>
942
+ </fields>
943
+ </novalnetPrepayment>
944
+ <!--}}} Novalnet Prepayment-->
945
+ <!--{{{ Novalnet Instant-->
946
+ <novalnetSofortueberweisung translate="label" module="novalnet_payment">
947
+ <label>Novalnet Instant Bank Transfer</label>
948
+ <sort_order>688</sort_order>
949
+ <show_in_default>1</show_in_default>
950
+ <show_in_website>1</show_in_website>
951
+ <show_in_store>1</show_in_store>
952
+ <fields>
953
+ <active translate="label">
954
+ <label>Enable Novalnet Module</label>
955
+ <frontend_type>select</frontend_type>
956
+ <config_path>payment/novalnetSofortueberweisung/active</config_path>
957
+ <source_model>adminhtml/system_config_source_yesno</source_model>
958
+ <sort_order>0</sort_order>
959
+ <show_in_default>1</show_in_default>
960
+ <show_in_website>1</show_in_website>
961
+ <show_in_store>1</show_in_store>
962
+ </active>
963
+ <title translate="label">
964
+ <label>Novalnet Title</label>
965
+ <frontend_type>text</frontend_type>
966
+ <config_path>payment/novalnetSofortueberweisung/title</config_path>
967
+ <validate>required-entry</validate>
968
+ <sort_order>2</sort_order>
969
+ <show_in_default>1</show_in_default>
970
+ <show_in_website>1</show_in_website>
971
+ <show_in_store>1</show_in_store>
972
+ </title>
973
+ <order_status translate="label">
974
+ <label>Order Status Before Payment</label>
975
+ <frontend_type>select</frontend_type>
976
+ <config_path>payment/novalnetSofortueberweisung/order_status</config_path>
977
+ <source_model>adminhtml/system_config_source_order_status</source_model>
978
+ <sort_order>3</sort_order>
979
+ <show_in_default>1</show_in_default>
980
+ <show_in_website>1</show_in_website>
981
+ <show_in_store>1</show_in_store>
982
+ </order_status>
983
+ <order_status_after_payment translate="label">
984
+ <label>Order Status After Successful Payment</label>
985
+ <frontend_type>select</frontend_type>
986
+ <config_path>payment/novalnetSofortueberweisung/order_status_after_payment</config_path>
987
+ <source_model>adminhtml/system_config_source_order_status</source_model>
988
+ <sort_order>4</sort_order>
989
+ <show_in_default>1</show_in_default>
990
+ <show_in_website>1</show_in_website>
991
+ <show_in_store>1</show_in_store>
992
+ </order_status_after_payment>
993
+ <booking_reference translate="label">
994
+ <label>Information to the end customer (this will appear in the payment page)</label>
995
+ <frontend_type>text</frontend_type>
996
+ <config_path>payment/novalnetSofortueberweisung/booking_reference</config_path>
997
+ <sort_order>5</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>
1001
+ </booking_reference>
1002
+ <reference_one translate="label">
1003
+ <label>Transaction reference 1</label>
1004
+ <comment>This will appear in the transactions details / account statement</comment>
1005
+ <frontend_type>text</frontend_type>
1006
+ <config_path>payment/novalnetSofortueberweisung/reference_one</config_path>
1007
+ <sort_order>6</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>
1011
+ </reference_one>
1012
+ <reference_two translate="label">
1013
+ <label>Transaction reference 2</label>
1014
+ <comment>This will appear in the transactions details / account statement</comment>
1015
+ <frontend_type>text</frontend_type>
1016
+ <config_path>payment/novalnetSofortueberweisung/reference_two</config_path>
1017
+ <sort_order>7</sort_order>
1018
+ <show_in_default>1</show_in_default>
1019
+ <show_in_website>1</show_in_website>
1020
+ <show_in_store>1</show_in_store>
1021
+ </reference_two>
1022
+ <user_group_excluded translate="label">
1023
+ <comment>Excluded User Group Desc</comment>
1024
+ <label>User Group Excluded</label>
1025
+ <frontend_type>text</frontend_type>
1026
+ <config_path>payment/novalnetSofortueberweisung/user_group_excluded</config_path>
1027
+ <sort_order>8</sort_order>
1028
+ <show_in_default>1</show_in_default>
1029
+ <show_in_website>1</show_in_website>
1030
+ <show_in_store>1</show_in_store>
1031
+ </user_group_excluded>
1032
+ <gateway_timeout translate="label">
1033
+ <comment>Gateway Timeout in seconds</comment>
1034
+ <label>Gateway Timeout</label>
1035
+ <frontend_type>text</frontend_type>
1036
+ <config_path>payment/novalnetSofortueberweisung/gateway_timeout</config_path>
1037
+ <sort_order>10</sort_order>
1038
+ <show_in_default>1</show_in_default>
1039
+ <show_in_website>1</show_in_website>
1040
+ <show_in_store>1</show_in_store>
1041
+ </gateway_timeout>
1042
+ <allowspecific translate="label">
1043
+ <label>Payment from applicable countries</label>
1044
+ <frontend_type>allowspecific</frontend_type>
1045
+ <config_path>payment/novalnetSofortueberweisung/allowspecific</config_path>
1046
+ <sort_order>11</sort_order>
1047
+ <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1048
+ <show_in_default>1</show_in_default>
1049
+ <show_in_website>1</show_in_website>
1050
+ <show_in_store>1</show_in_store>
1051
+ </allowspecific>
1052
+ <specificcountry translate="label">
1053
+ <label>Payment from Specific countries</label>
1054
+ <frontend_type>multiselect</frontend_type>
1055
+ <config_path>payment/novalnetSofortueberweisung/specificcountry</config_path>
1056
+ <sort_order>12</sort_order>
1057
+ <source_model>adminhtml/system_config_source_country</source_model>
1058
+ <show_in_default>1</show_in_default>
1059
+ <show_in_website>1</show_in_website>
1060
+ <show_in_store>1</show_in_store>
1061
+ <depends>
1062
+ <allowspecific>1</allowspecific>
1063
+ </depends>
1064
+ </specificcountry>
1065
+ <min_order_total translate="label">
1066
+ <label>Novalnet Minimum Order Total</label>
1067
+ <frontend_type>text</frontend_type>
1068
+ <validate>validate-number</validate>
1069
+ <config_path>payment/novalnetSofortueberweisung/min_order_total</config_path>
1070
+ <sort_order>13</sort_order>
1071
+ <show_in_default>1</show_in_default>
1072
+ <show_in_website>1</show_in_website>
1073
+ <show_in_store>1</show_in_store>
1074
+ </min_order_total>
1075
+ <max_order_total translate="label">
1076
+ <label>Novalnet Maximum Order Total</label>
1077
+ <frontend_type>text</frontend_type>
1078
+ <validate>validate-number</validate>
1079
+ <config_path>payment/novalnetSofortueberweisung/max_order_total</config_path>
1080
+ <sort_order>14</sort_order>
1081
+ <show_in_default>1</show_in_default>
1082
+ <show_in_website>1</show_in_website>
1083
+ <show_in_store>1</show_in_store>
1084
+ </max_order_total>
1085
+ <orderscount translate="label">
1086
+ <label>Novalnet Minimum Orders Count</label>
1087
+ <frontend_type>text</frontend_type>
1088
+ <validate>validate-digits</validate>
1089
+ <config_path>payment/novalnetSofortueberweisung/orderscount</config_path>
1090
+ <sort_order>15</sort_order>
1091
+ <comment>Novalnet Minimum Orders Count Desc</comment>
1092
+ <show_in_default>1</show_in_default>
1093
+ <show_in_website>1</show_in_website>
1094
+ <show_in_store>1</show_in_store>
1095
+ </orderscount>
1096
+ <sort_order translate="label">
1097
+ <label>Novalnet Sort Order</label>
1098
+ <comment>Sort order of display. Lowest is displayed first.</comment>
1099
+ <frontend_type>text</frontend_type>
1100
+ <validate>validate-digits</validate>
1101
+ <config_path>payment/novalnetSofortueberweisung/sort_order</config_path>
1102
+ <sort_order>16</sort_order>
1103
+ <show_in_default>1</show_in_default>
1104
+ <show_in_website>1</show_in_website>
1105
+ <show_in_store>1</show_in_store>
1106
+ </sort_order>
1107
+ </fields>
1108
+ </novalnetSofortueberweisung>
1109
+ <!--}}} Novalnet Instant-->
1110
+ <!--{{{ Novalnet Paypal-->
1111
+ <novalnetPaypal translate="label" module="novalnet_payment">
1112
+ <label>Novalnet PayPal</label>
1113
+ <frontend_type>text</frontend_type>
1114
+ <sort_order>686</sort_order>
1115
+ <show_in_default>1</show_in_default>
1116
+ <show_in_website>1</show_in_website>
1117
+ <show_in_store>1</show_in_store>
1118
+ <fields>
1119
+ <active translate="label">
1120
+ <label>Enable Novalnet Module</label>
1121
+ <frontend_type>select</frontend_type>
1122
+ <config_path>payment/novalnetPaypal/active</config_path>
1123
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1124
+ <sort_order>1</sort_order>
1125
+ <show_in_default>1</show_in_default>
1126
+ <show_in_website>1</show_in_website>
1127
+ <show_in_store>1</show_in_store>
1128
+ </active>
1129
+ <title translate="label">
1130
+ <label>Novalnet Title</label>
1131
+ <frontend_type>text</frontend_type>
1132
+ <config_path>payment/novalnetPaypal/title</config_path>
1133
+ <validate>required-entry</validate>
1134
+ <sort_order>2</sort_order>
1135
+ <show_in_default>1</show_in_default>
1136
+ <show_in_website>1</show_in_website>
1137
+ <show_in_store>1</show_in_store>
1138
+ </title>
1139
+ <order_status translate="label">
1140
+ <label>Order Status Before Payment</label>
1141
+ <frontend_type>select</frontend_type>
1142
+ <config_path>payment/novalnetPaypal/order_status</config_path>
1143
+ <source_model>adminhtml/system_config_source_order_status</source_model>
1144
+ <sort_order>3</sort_order>
1145
+ <show_in_default>1</show_in_default>
1146
+ <show_in_website>1</show_in_website>
1147
+ <show_in_store>1</show_in_store>
1148
+ </order_status>
1149
+ <order_status_after_payment translate="label">
1150
+ <label>Order Status After Successful Payment</label>
1151
+ <frontend_type>select</frontend_type>
1152
+ <config_path>payment/novalnetPaypal/order_status_after_payment</config_path>
1153
+ <source_model>adminhtml/system_config_source_order_status</source_model>
1154
+ <sort_order>4</sort_order>
1155
+ <show_in_default>1</show_in_default>
1156
+ <show_in_website>1</show_in_website>
1157
+ <show_in_store>1</show_in_store>
1158
+ </order_status_after_payment>
1159
+ <booking_reference translate="label">
1160
+ <label>Information to the end customer (this will appear in the payment page)</label>
1161
+ <frontend_type>text</frontend_type>
1162
+ <config_path>payment/novalnetPaypal/booking_reference</config_path>
1163
+ <sort_order>5</sort_order>
1164
+ <show_in_default>1</show_in_default>
1165
+ <show_in_website>1</show_in_website>
1166
+ <show_in_store>1</show_in_store>
1167
+ </booking_reference>
1168
+ <reference_one translate="label">
1169
+ <label>Transaction reference 1</label>
1170
+ <comment>This will appear in the transactions details / account statement</comment>
1171
+ <frontend_type>text</frontend_type>
1172
+ <config_path>payment/novalnetPaypal/reference_one</config_path>
1173
+ <sort_order>6</sort_order>
1174
+ <show_in_default>1</show_in_default>
1175
+ <show_in_website>1</show_in_website>
1176
+ <show_in_store>1</show_in_store>
1177
+ </reference_one>
1178
+ <reference_two translate="label">
1179
+ <label>Transaction reference 2</label>
1180
+ <comment>This will appear in the transactions details / account statement</comment>
1181
+ <frontend_type>text</frontend_type>
1182
+ <config_path>payment/novalnetPaypal/reference_two</config_path>
1183
+ <sort_order>7</sort_order>
1184
+ <show_in_default>1</show_in_default>
1185
+ <show_in_website>1</show_in_website>
1186
+ <show_in_store>1</show_in_store>
1187
+ </reference_two>
1188
+ <user_group_excluded translate="label">
1189
+ <comment>Excluded User Group Desc</comment>
1190
+ <label>User Group Excluded</label>
1191
+ <frontend_type>text</frontend_type>
1192
+ <config_path>payment/novalnetPaypal/user_group_excluded</config_path>
1193
+ <sort_order>8</sort_order>
1194
+ <show_in_default>1</show_in_default>
1195
+ <show_in_website>1</show_in_website>
1196
+ <show_in_store>1</show_in_store>
1197
+ </user_group_excluded>
1198
+ <gateway_timeout translate="label">
1199
+ <comment>Gateway Timeout in seconds</comment>
1200
+ <label>Gateway Timeout</label>
1201
+ <frontend_type>text</frontend_type>
1202
+ <config_path>payment/novalnetPaypal/gateway_timeout</config_path>
1203
+ <sort_order>10</sort_order>
1204
+ <show_in_default>1</show_in_default>
1205
+ <show_in_website>1</show_in_website>
1206
+ <show_in_store>1</show_in_store>
1207
+ </gateway_timeout>
1208
+ <allowspecific translate="label">
1209
+ <label>Payment from applicable countries</label>
1210
+ <frontend_type>allowspecific</frontend_type>
1211
+ <config_path>payment/novalnetPaypal/allowspecific</config_path>
1212
+ <sort_order>11</sort_order>
1213
+ <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1214
+ <show_in_default>1</show_in_default>
1215
+ <show_in_website>1</show_in_website>
1216
+ <show_in_store>1</show_in_store>
1217
+ </allowspecific>
1218
+ <specificcountry translate="label">
1219
+ <label>Payment from Specific countries</label>
1220
+ <frontend_type>multiselect</frontend_type>
1221
+ <config_path>payment/novalnetPaypal/specificcountry</config_path>
1222
+ <sort_order>12</sort_order>
1223
+ <source_model>adminhtml/system_config_source_country</source_model>
1224
+ <show_in_default>1</show_in_default>
1225
+ <show_in_website>1</show_in_website>
1226
+ <show_in_store>1</show_in_store>
1227
+ <depends>
1228
+ <allowspecific>1</allowspecific>
1229
+ </depends>
1230
+ </specificcountry>
1231
+ <model>
1232
+ </model>
1233
+ <min_order_total translate="label">
1234
+ <label>Novalnet Minimum Order Total</label>
1235
+ <frontend_type>text</frontend_type>
1236
+ <validate>validate-number</validate>
1237
+ <config_path>payment/novalnetPaypal/min_order_total</config_path>
1238
+ <sort_order>13</sort_order>
1239
+ <show_in_default>1</show_in_default>
1240
+ <show_in_website>1</show_in_website>
1241
+ <show_in_store>1</show_in_store>
1242
+ </min_order_total>
1243
+ <max_order_total translate="label">
1244
+ <label>Novalnet Maximum Order Total</label>
1245
+ <frontend_type>text</frontend_type>
1246
+ <validate>validate-number</validate>
1247
+ <config_path>payment/novalnetPaypal/max_order_total</config_path>
1248
+ <sort_order>14</sort_order>
1249
+ <show_in_default>1</show_in_default>
1250
+ <show_in_website>1</show_in_website>
1251
+ <show_in_store>1</show_in_store>
1252
+ </max_order_total>
1253
+ <orderscount translate="label">
1254
+ <label>Novalnet Minimum Orders Count</label>
1255
+ <frontend_type>text</frontend_type>
1256
+ <validate>validate-digits</validate>
1257
+ <config_path>payment/novalnetPaypal/orderscount</config_path>
1258
+ <sort_order>15</sort_order>
1259
+ <comment>Novalnet Minimum Orders Count Desc</comment>
1260
+ <show_in_default>1</show_in_default>
1261
+ <show_in_website>1</show_in_website>
1262
+ <show_in_store>1</show_in_store>
1263
+ </orderscount>
1264
+ <sort_order translate="label">
1265
+ <label>Novalnet Sort Order</label>
1266
+ <comment>Sort order of display. Lowest is displayed first.</comment>
1267
+ <frontend_type>text</frontend_type>
1268
+ <validate>validate-digits</validate>
1269
+ <config_path>payment/novalnetPaypal/sort_order</config_path>
1270
+ <sort_order>16</sort_order>
1271
+ <show_in_default>1</show_in_default>
1272
+ <show_in_website>1</show_in_website>
1273
+ <show_in_store>1</show_in_store>
1274
+ </sort_order>
1275
+ </fields>
1276
+ </novalnetPaypal>
1277
+ <!--}}} Novalnet Paypal-->
1278
+ <!--{{{ Novalnet Ideal-->
1279
+ <novalnetIdeal translate="label" module="novalnet_payment">
1280
+ <label>Novalnet iDEAL</label>
1281
+ <frontend_type>text</frontend_type>
1282
+ <sort_order>687</sort_order>
1283
+ <show_in_default>1</show_in_default>
1284
+ <show_in_website>1</show_in_website>
1285
+ <show_in_store>1</show_in_store>
1286
+ <fields>
1287
+ <active translate="label">
1288
+ <label>Enable Novalnet Module</label>
1289
+ <frontend_type>select</frontend_type>
1290
+ <config_path>payment/novalnetIdeal/active</config_path>
1291
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1292
+ <sort_order>1</sort_order>
1293
+ <show_in_default>1</show_in_default>
1294
+ <show_in_website>1</show_in_website>
1295
+ <show_in_store>1</show_in_store>
1296
+ </active>
1297
+ <title translate="label">
1298
+ <label>Novalnet Title</label>
1299
+ <frontend_type>text</frontend_type>
1300
+ <config_path>payment/novalnetIdeal/title</config_path>
1301
+ <validate>required-entry</validate>
1302
+ <sort_order>2</sort_order>
1303
+ <show_in_default>1</show_in_default>
1304
+ <show_in_website>1</show_in_website>
1305
+ <show_in_store>1</show_in_store>
1306
+ </title>
1307
+ <order_status translate="label">
1308
+ <label>Order Status Before Payment</label>
1309
+ <frontend_type>select</frontend_type>
1310
+ <config_path>payment/novalnetIdeal/order_status</config_path>
1311
+ <source_model>adminhtml/system_config_source_order_status</source_model>
1312
+ <sort_order>3</sort_order>
1313
+ <show_in_default>1</show_in_default>
1314
+ <show_in_website>1</show_in_website>
1315
+ <show_in_store>1</show_in_store>
1316
+ </order_status>
1317
+ <order_status_after_payment translate="label">
1318
+ <label>Order Status After Successful Payment</label>
1319
+ <frontend_type>select</frontend_type>
1320
+ <config_path>payment/novalnetIdeal/order_status_after_payment</config_path>
1321
+ <source_model>adminhtml/system_config_source_order_status</source_model>
1322
+ <sort_order>4</sort_order>
1323
+ <show_in_default>1</show_in_default>
1324
+ <show_in_website>1</show_in_website>
1325
+ <show_in_store>1</show_in_store>
1326
+ </order_status_after_payment>
1327
+ <booking_reference translate="label">
1328
+ <label>Information to the end customer (this will appear in the payment page)</label>
1329
+ <frontend_type>text</frontend_type>
1330
+ <config_path>payment/novalnetIdeal/booking_reference</config_path>
1331
+ <sort_order>5</sort_order>
1332
+ <show_in_default>1</show_in_default>
1333
+ <show_in_website>1</show_in_website>
1334
+ <show_in_store>1</show_in_store>
1335
+ </booking_reference>
1336
+ <reference_one translate="label">
1337
+ <label>Transaction reference 1</label>
1338
+ <comment>This will appear in the transactions details / account statement</comment>
1339
+ <frontend_type>text</frontend_type>
1340
+ <config_path>payment/novalnetIdeal/reference_one</config_path>
1341
+ <sort_order>6</sort_order>
1342
+ <show_in_default>1</show_in_default>
1343
+ <show_in_website>1</show_in_website>
1344
+ <show_in_store>1</show_in_store>
1345
+ </reference_one>
1346
+ <reference_two translate="label">
1347
+ <label>Transaction reference 2</label>
1348
+ <comment>This will appear in the transactions details / account statement</comment>
1349
+ <frontend_type>text</frontend_type>
1350
+ <config_path>payment/novalnetIdeal/reference_two</config_path>
1351
+ <sort_order>7</sort_order>
1352
+ <show_in_default>1</show_in_default>
1353
+ <show_in_website>1</show_in_website>
1354
+ <show_in_store>1</show_in_store>
1355
+ </reference_two>
1356
+ <user_group_excluded translate="label">
1357
+ <comment>Excluded User Group Desc</comment>
1358
+ <label>User Group Excluded</label>
1359
+ <frontend_type>text</frontend_type>
1360
+ <config_path>payment/novalnetIdeal/user_group_excluded</config_path>
1361
+ <sort_order>8</sort_order>
1362
+ <show_in_default>1</show_in_default>
1363
+ <show_in_website>1</show_in_website>
1364
+ <show_in_store>1</show_in_store>
1365
+ </user_group_excluded>
1366
+ <gateway_timeout translate="label">
1367
+ <comment>Gateway Timeout in seconds</comment>
1368
+ <label>Gateway Timeout</label>
1369
+ <frontend_type>text</frontend_type>
1370
+ <config_path>payment/novalnetIdeal/gateway_timeout</config_path>
1371
+ <sort_order>10</sort_order>
1372
+ <show_in_default>1</show_in_default>
1373
+ <show_in_website>1</show_in_website>
1374
+ <show_in_store>1</show_in_store>
1375
+ </gateway_timeout>
1376
+ <allowspecific translate="label">
1377
+ <label>Payment from applicable countries</label>
1378
+ <frontend_type>allowspecific</frontend_type>
1379
+ <config_path>payment/novalnetIdeal/allowspecific</config_path>
1380
+ <sort_order>11</sort_order>
1381
+ <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1382
+ <show_in_default>1</show_in_default>
1383
+ <show_in_website>1</show_in_website>
1384
+ <show_in_store>1</show_in_store>
1385
+ </allowspecific>
1386
+ <specificcountry translate="label">
1387
+ <label>Payment from Specific countries</label>
1388
+ <frontend_type>multiselect</frontend_type>
1389
+ <config_path>payment/novalnetIdeal/specificcountry</config_path>
1390
+ <sort_order>12</sort_order>
1391
+ <source_model>adminhtml/system_config_source_country</source_model>
1392
+ <show_in_default>1</show_in_default>
1393
+ <show_in_website>1</show_in_website>
1394
+ <show_in_store>1</show_in_store>
1395
+ <depends>
1396
+ <allowspecific>1</allowspecific>
1397
+ </depends>
1398
+ </specificcountry>
1399
+ <min_order_total translate="label">
1400
+ <label>Novalnet Minimum Order Total</label>
1401
+ <frontend_type>text</frontend_type>
1402
+ <validate>validate-number</validate>
1403
+ <config_path>payment/novalnetIdeal/min_order_total</config_path>
1404
+ <sort_order>13</sort_order>
1405
+ <show_in_default>1</show_in_default>
1406
+ <show_in_website>1</show_in_website>
1407
+ <show_in_store>1</show_in_store>
1408
+ </min_order_total>
1409
+ <max_order_total translate="label">
1410
+ <label>Novalnet Maximum Order Total</label>
1411
+ <frontend_type>text</frontend_type>
1412
+ <validate>validate-number</validate>
1413
+ <config_path>payment/novalnetIdeal/max_order_total</config_path>
1414
+ <sort_order>14</sort_order>
1415
+ <show_in_default>1</show_in_default>
1416
+ <show_in_website>1</show_in_website>
1417
+ <show_in_store>1</show_in_store>
1418
+ </max_order_total>
1419
+ <orderscount translate="label">
1420
+ <label>Novalnet Minimum Orders Count</label>
1421
+ <frontend_type>text</frontend_type>
1422
+ <validate>validate-digits</validate>
1423
+ <config_path>payment/novalnetIdeal/orderscount</config_path>
1424
+ <sort_order>15</sort_order>
1425
+ <comment>Novalnet Minimum Orders Count Desc</comment>
1426
+ <show_in_default>1</show_in_default>
1427
+ <show_in_website>1</show_in_website>
1428
+ <show_in_store>1</show_in_store>
1429
+ </orderscount>
1430
+ <sort_order translate="label">
1431
+ <label>Novalnet Sort Order</label>
1432
+ <comment>Sort order of display. Lowest is displayed first.</comment>
1433
+ <frontend_type>text</frontend_type>
1434
+ <validate>validate-digits</validate>
1435
+ <config_path>payment/novalnetIdeal/sort_order</config_path>
1436
+ <sort_order>16</sort_order>
1437
+ <show_in_default>1</show_in_default>
1438
+ <show_in_website>1</show_in_website>
1439
+ <show_in_store>1</show_in_store>
1440
+ </sort_order>
1441
+ </fields>
1442
+ </novalnetIdeal>
1443
+ <!--}}} Novalnet Ideal-->
1444
+ <!--{{{ Novalnet Phonepayment-->
1445
+ <novalnetPhonepayment translate="label" module="novalnet_payment">
1446
+ <label>Novalnet Phonepayment</label>
1447
+ <sort_order>691</sort_order>
1448
+ <show_in_default>1</show_in_default>
1449
+ <show_in_website>1</show_in_website>
1450
+ <show_in_store>1</show_in_store>
1451
+ <fields>
1452
+ <active translate="label">
1453
+ <label>Enable Novalnet Module</label>
1454
+ <frontend_type>select</frontend_type>
1455
+ <config_path>payment/novalnetPhonepayment/active</config_path>
1456
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1457
+ <sort_order>1</sort_order>
1458
+ <show_in_default>1</show_in_default>
1459
+ <show_in_website>1</show_in_website>
1460
+ <show_in_store>1</show_in_store>
1461
+ </active>
1462
+ <title translate="label">
1463
+ <label>Novalnet Title</label>
1464
+ <frontend_type>text</frontend_type>
1465
+ <config_path>payment/novalnetPhonepayment/title</config_path>
1466
+ <validate>required-entry</validate>
1467
+ <sort_order>2</sort_order>
1468
+ <show_in_default>1</show_in_default>
1469
+ <show_in_website>1</show_in_website>
1470
+ <show_in_store>1</show_in_store>
1471
+ </title>
1472
+ <order_status translate="label">
1473
+ <label>Set order Status</label>
1474
+ <frontend_type>select</frontend_type>
1475
+ <config_path>payment/novalnetPhonepayment/order_status</config_path>
1476
+ <source_model>adminhtml/system_config_source_order_status</source_model>
1477
+ <sort_order>3</sort_order>
1478
+ <show_in_default>1</show_in_default>
1479
+ <show_in_website>1</show_in_website>
1480
+ <show_in_store>1</show_in_store>
1481
+ </order_status>
1482
+ <booking_reference translate="label">
1483
+ <label>Information to the end customer (this will appear in the payment page)</label>
1484
+ <frontend_type>text</frontend_type>
1485
+ <config_path>payment/novalnetPhonepayment/booking_reference</config_path>
1486
+ <sort_order>4</sort_order>
1487
+ <show_in_default>1</show_in_default>
1488
+ <show_in_website>1</show_in_website>
1489
+ <show_in_store>1</show_in_store>
1490
+ </booking_reference>
1491
+ <reference_one translate="label">
1492
+ <label>Transaction reference 1</label>
1493
+ <comment>This will appear in the transactions details / account statement</comment>
1494
+ <frontend_type>text</frontend_type>
1495
+ <config_path>payment/novalnetPhonepayment/reference_one</config_path>
1496
+ <sort_order>5</sort_order>
1497
+ <show_in_default>1</show_in_default>
1498
+ <show_in_website>1</show_in_website>
1499
+ <show_in_store>1</show_in_store>
1500
+ </reference_one>
1501
+ <reference_two translate="label">
1502
+ <label>Transaction reference 2</label>
1503
+ <comment>This will appear in the transactions details / account statement</comment>
1504
+ <frontend_type>text</frontend_type>
1505
+ <config_path>payment/novalnetPhonepayment/reference_two</config_path>
1506
+ <sort_order>6</sort_order>
1507
+ <show_in_default>1</show_in_default>
1508
+ <show_in_website>1</show_in_website>
1509
+ <show_in_store>1</show_in_store>
1510
+ </reference_two>
1511
+ <user_group_excluded translate="label">
1512
+ <comment>Excluded User Group Desc</comment>
1513
+ <label>User Group Excluded</label>
1514
+ <frontend_type>text</frontend_type>
1515
+ <config_path>payment/novalnetPhonepayment/user_group_excluded</config_path>
1516
+ <sort_order>7</sort_order>
1517
+ <show_in_default>1</show_in_default>
1518
+ <show_in_website>1</show_in_website>
1519
+ <show_in_store>1</show_in_store>
1520
+ </user_group_excluded>
1521
+ <gateway_timeout translate="label">
1522
+ <comment>Gateway Timeout in seconds</comment>
1523
+ <label>Gateway Timeout</label>
1524
+ <frontend_type>text</frontend_type>
1525
+ <config_path>payment/novalnetPhonepayment/gateway_timeout</config_path>
1526
+ <sort_order>8</sort_order>
1527
+ <show_in_default>1</show_in_default>
1528
+ <show_in_website>1</show_in_website>
1529
+ <show_in_store>1</show_in_store>
1530
+ </gateway_timeout>
1531
+ <allowspecific translate="label">
1532
+ <label>Payment from applicable countries</label>
1533
+ <frontend_type>allowspecific</frontend_type>
1534
+ <config_path>payment/novalnetPhonepayment/allowspecific</config_path>
1535
+ <sort_order>9</sort_order>
1536
+ <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1537
+ <show_in_default>1</show_in_default>
1538
+ <show_in_website>1</show_in_website>
1539
+ <show_in_store>1</show_in_store>
1540
+ </allowspecific>
1541
+ <specificcountry translate="label">
1542
+ <label>Payment from Specific countries</label>
1543
+ <frontend_type>multiselect</frontend_type>
1544
+ <validate>validate-number</validate>
1545
+ <config_path>payment/novalnetPhonepayment/specificcountry</config_path>
1546
+ <sort_order>10</sort_order>
1547
+ <source_model>adminhtml/system_config_source_country</source_model>
1548
+ <show_in_default>1</show_in_default>
1549
+ <show_in_website>1</show_in_website>
1550
+ <show_in_store>1</show_in_store>
1551
+ <depends>
1552
+ <allowspecific>1</allowspecific>
1553
+ </depends>
1554
+ </specificcountry>
1555
+ <min_order_total translate="label">
1556
+ <label>Novalnet Minimum Order Total</label>
1557
+ <frontend_type>text</frontend_type>
1558
+ <validate>validate-number</validate>
1559
+ <config_path>payment/novalnetPhonepayment/min_order_total</config_path>
1560
+ <sort_order>11</sort_order>
1561
+ <show_in_default>1</show_in_default>
1562
+ <show_in_website>1</show_in_website>
1563
+ <show_in_store>1</show_in_store>
1564
+ </min_order_total>
1565
+ <max_order_total translate="label">
1566
+ <label>Novalnet Maximum Order Total</label>
1567
+ <frontend_type>text</frontend_type>
1568
+ <validate>validate-number</validate>
1569
+ <config_path>payment/novalnetPhonepayment/max_order_total</config_path>
1570
+ <sort_order>12</sort_order>
1571
+ <show_in_default>1</show_in_default>
1572
+ <show_in_website>1</show_in_website>
1573
+ <show_in_store>1</show_in_store>
1574
+ </max_order_total>
1575
+ <orderscount translate="label">
1576
+ <label>Novalnet Minimum Orders Count</label>
1577
+ <frontend_type>text</frontend_type>
1578
+ <validate>validate-digits</validate>
1579
+ <config_path>payment/novalnetPhonepayment/orderscount</config_path>
1580
+ <sort_order>13</sort_order>
1581
+ <comment>Novalnet Minimum Orders Count Desc</comment>
1582
+ <show_in_default>1</show_in_default>
1583
+ <show_in_website>1</show_in_website>
1584
+ <show_in_store>1</show_in_store>
1585
+ </orderscount>
1586
+ <sort_order translate="label">
1587
+ <label>Novalnet Sort Order</label>
1588
+ <comment>Sort order of display. Lowest is displayed first.</comment>
1589
+ <frontend_type>text</frontend_type>
1590
+ <validate>validate-digits</validate>
1591
+ <config_path>payment/novalnetPhonepayment/sort_order</config_path>
1592
+ <sort_order>14</sort_order>
1593
+ <show_in_default>1</show_in_default>
1594
+ <show_in_website>1</show_in_website>
1595
+ <show_in_store>1</show_in_store>
1596
+ </sort_order>
1597
+ </fields>
1598
+ </novalnetPhonepayment>
1599
+ <!--}}} Novalnet Phonepayment-->
1600
+ </groups>
1601
+ </novalnet_paymethods>
1602
+ <!-- novalnet paymethods -->
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1603
 
1604
+ <!-- Fraud prevention -->
1605
+ <fraud_prevent translate="label" module="novalnet_payment">
1606
+ <label>Risk and Control</label>
1607
  <tab>novalnet</tab>
1608
+ <frontend_type>text</frontend_type>
1609
  <sort_order>40</sort_order>
1610
  <show_in_default>1</show_in_default>
1611
  <show_in_website>1</show_in_website>
1612
  <show_in_store>1</show_in_store>
1613
+ <groups>
1614
+ <novalnetCc translate="label" module="novalnet_payment">
1615
+ <label>Novalnet Credit Card</label>
1616
+ <comment>Enable the payment Method and activate the Risk and Control option</comment>
1617
+ <frontend_type>text</frontend_type>
1618
+ <sort_order>10</sort_order>
1619
+ <show_in_default>1</show_in_default>
1620
+ <show_in_website>1</show_in_website>
1621
+ <show_in_store>1</show_in_store>
1622
+ <fields>
1623
+ <callback translate="label">
1624
+ <comment>PIN by Callback/SMS/E-Mail Desc</comment>
1625
+ <label>Fraud prevention through PIN by Callback/SMS/E-Mail</label>
1626
+ <frontend_type>select</frontend_type>
1627
+ <config_path>payment/novalnetCc/callback</config_path>
1628
+ <source_model>novalnet_payment/novalnet_source_callbacktypes</source_model>
1629
+ <sort_order>13</sort_order>
1630
+ <show_in_default>1</show_in_default>
1631
+ <show_in_website>1</show_in_website>
1632
+ <show_in_store>1</show_in_store>
1633
+ </callback>
1634
+ <callback_minimum_amount>
1635
+ <label>Minimum Amount For Callback (in cents)</label>
1636
+ <frontend_type>text</frontend_type>
1637
+ <validate>validate-digits</validate>
1638
+ <config_path>payment/novalnetCc/callback_minimum_amount</config_path>
1639
+ <sort_order>14</sort_order>
1640
+ <show_in_default>1</show_in_default>
1641
+ <show_in_website>1</show_in_website>
1642
+ <show_in_store>1</show_in_store>
1643
+ </callback_minimum_amount>
1644
+ </fields>
1645
+ </novalnetCc>
1646
+ <novalnetSepa translate="label" module="novalnet_payment">
1647
+ <label>Novalnet Direct Debit SEPA</label>
1648
+ <comment>Enable the payment Method and activate the Risk and Control option</comment>
1649
+ <frontend_type>text</frontend_type>
1650
+ <sort_order>11</sort_order>
1651
+ <show_in_default>1</show_in_default>
1652
+ <show_in_website>1</show_in_website>
1653
+ <show_in_store>1</show_in_store>
1654
+ <fields>
1655
+ <callback translate="label">
1656
+ <comment>PIN by Callback/SMS/E-Mail Desc</comment>
1657
+ <label>Fraud prevention through PIN by Callback/SMS/E-Mail</label>
1658
+ <frontend_type>select</frontend_type>
1659
+ <config_path>payment/novalnetSepa/callback</config_path>
1660
+ <source_model>novalnet_payment/novalnet_source_callbacktypes</source_model>
1661
+ <sort_order>13</sort_order>
1662
+ <show_in_default>1</show_in_default>
1663
+ <show_in_website>1</show_in_website>
1664
+ <show_in_store>1</show_in_store>
1665
+ </callback>
1666
+ <callback_minimum_amount>
1667
+ <label>Minimum Amount For Callback (in cents)</label>
1668
+ <frontend_type>text</frontend_type>
1669
+ <validate>validate-digits</validate>
1670
+ <config_path>payment/novalnetSepa/callback_minimum_amount</config_path>
1671
+ <sort_order>14</sort_order>
1672
+ <show_in_default>1</show_in_default>
1673
+ <show_in_website>1</show_in_website>
1674
+ <show_in_store>1</show_in_store>
1675
+ </callback_minimum_amount>
1676
+ </fields>
1677
+ </novalnetSepa>
1678
+ <novalnetInvoice translate="label" module="novalnet_payment">
1679
+ <label>Novalnet Invoice</label>
1680
+ <comment>Enable the payment Method and activate the Risk and Control option</comment>
1681
+ <frontend_type>text</frontend_type>
1682
+ <sort_order>12</sort_order>
1683
+ <show_in_default>1</show_in_default>
1684
+ <show_in_website>1</show_in_website>
1685
+ <show_in_store>1</show_in_store>
1686
+ <fields>
1687
+ <callback translate="label">
1688
+ <comment>PIN by Callback/SMS/E-Mail Desc</comment>
1689
+ <label>Fraud prevention through PIN by Callback/SMS/E-Mail</label>
1690
+ <frontend_type>select</frontend_type>
1691
+ <config_path>payment/novalnetInvoice/callback</config_path>
1692
+ <source_model>novalnet_payment/novalnet_source_callbacktypes</source_model>
1693
+ <sort_order>13</sort_order>
1694
+ <show_in_default>1</show_in_default>
1695
+ <show_in_website>1</show_in_website>
1696
+ <show_in_store>1</show_in_store>
1697
+ </callback>
1698
+ <callback_minimum_amount>
1699
+ <label>Minimum Amount For Callback (in cents)</label>
1700
+ <frontend_type>text</frontend_type>
1701
+ <validate>validate-digits</validate>
1702
+ <config_path>payment/novalnetInvoice/callback_minimum_amount</config_path>
1703
+ <sort_order>14</sort_order>
1704
+ <show_in_default>1</show_in_default>
1705
+ <show_in_website>1</show_in_website>
1706
+ <show_in_store>1</show_in_store>
1707
+ </callback_minimum_amount>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1708
 
1709
+ </fields>
1710
+ </novalnetInvoice>
1711
+ </groups>
1712
+ </fraud_prevent>
1713
+ <!-- Fraud prevention -->
1714
  </sections>
1715
  </config>
app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-install-5.0.2.php DELETED
@@ -1,106 +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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
-
27
- /** novalnet tables */
28
- $tableOrderLog = $this->getTable('novalnet_payment/order_log');
29
- $tableTransactionStatus = $this->getTable('novalnet_payment/transaction_status');
30
- $tableCallback = $this->getTable('novalnet_payment/callback');
31
-
32
- /** magento tables */
33
- $tableOrderPayment = $this->getTable('sales/order_payment');
34
-
35
- $installer = $this;
36
-
37
- $installer->startSetup();
38
-
39
- #-----------------------------------------------------------------
40
- #-- Create Table novalnet_order_log
41
- #-----------------------------------------------------------------
42
- $installer->run("
43
- CREATE TABLE IF NOT EXISTS `{$tableOrderLog}` (
44
- `nn_log_id` int(11) UNSIGNED NOT NULL auto_increment,
45
- `request_data` TEXT NOT NULL DEFAULT '',
46
- `response_data` TEXT NOT NULL DEFAULT '',
47
- `order_id` VARCHAR(50) NOT NULL DEFAULT '',
48
- `customer_id` VARCHAR(10) NOT NULL DEFAULT '',
49
- `status` VARCHAR(20) NOT NULL DEFAULT '',
50
- `failed_reason` TEXT NOT NULL DEFAULT '',
51
- `store_id` int(11) UNSIGNED NOT NULL,
52
- `shop_url` VARCHAR(255) NOT NULL DEFAULT '',
53
- `transaction_id` VARCHAR(50) NOT NULL,
54
- `additional_data` TEXT NOT NULL DEFAULT '',
55
- `created_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
56
- PRIMARY KEY (`nn_log_id`)
57
- ) ENGINE = MYISAM CHARACTER SET utf8 COLLATE utf8_unicode_ci;
58
- ");
59
-
60
- #-----------------------------------------------------------------
61
- #-- Create Table novalnet_transaction_status
62
- #-----------------------------------------------------------------
63
- $installer->run("
64
- CREATE TABLE IF NOT EXISTS `{$tableTransactionStatus}` (
65
- `nn_txn_id` int(11) UNSIGNED NOT NULL auto_increment,
66
- `transaction_no` VARCHAR(50) NOT NULL,
67
- `order_id` VARCHAR(50) NOT NULL DEFAULT '',
68
- `transaction_status` VARCHAR(20) NOT NULL DEFAULT 0,
69
- `nc_no` VARCHAR(11) NOT NULL,
70
- `customer_id` VARCHAR(10) NOT NULL DEFAULT '',
71
- `payment_name` VARCHAR(50) NOT NULL DEFAULT '',
72
- `amount` decimal(12,4) NOT NULL,
73
- `remote_ip` VARCHAR(20) NOT NULL,
74
- `store_id` int(11) UNSIGNED NOT NULL,
75
- `shop_url` VARCHAR(255) NOT NULL DEFAULT '',
76
- `additional_data` TEXT NOT NULL DEFAULT '',
77
- `created_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
78
- PRIMARY KEY (`nn_txn_id`)
79
- ) ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_unicode_ci;
80
- ");
81
-
82
- #-----------------------------------------------------------------
83
- #-- Create Table novalnet_order_callback
84
- #-----------------------------------------------------------------
85
- $installer->run("
86
- CREATE TABLE IF NOT EXISTS `{$tableCallback}` (
87
- `id` int(11) UNSIGNED NOT NULL auto_increment,
88
- `order_id` VARCHAR(50) NOT NULL DEFAULT '',
89
- `callback_amount` int(11) UNSIGNED NOT NULL,
90
- `reference_tid` VARCHAR(50) NOT NULL,
91
- `callback_datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
92
- `callback_tid` VARCHAR(50) NOT NULL,
93
- `callback_log` TEXT NOT NULL DEFAULT '',
94
- PRIMARY KEY (`id`)
95
- ) ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_unicode_ci;
96
- ");
97
-
98
- $installer->run("
99
- UPDATE `{$tableOrderPayment}` SET `method` = 'novalnetSofortueberweisung'
100
- WHERE `method` = 'novalnetsofortueberweisung';
101
- UPDATE `{$tableOrderPayment}` SET `method` = 'novalnetPaypal'
102
- WHERE `method` = 'novalnetpaypal';
103
- UPDATE `{$tableOrderPayment}` SET `method` = 'novalnetIdeal'
104
- WHERE `method` = 'novalnetideal';
105
- ");
106
- $installer->endSetup();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-install-5.0.3.php ADDED
@@ -0,0 +1,151 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ /** novalnet tables */
27
+ $tableOrderLog = $this->getTable('novalnet_payment/order_log');
28
+ $tableTransactionStatus = $this->getTable('novalnet_payment/transaction_status');
29
+ $tableCallback = $this->getTable('novalnet_payment/callback');
30
+
31
+ /** magento tables */
32
+ $tableOrderPayment = $this->getTable('sales/order_payment');
33
+ $tableConfigData = $this->getTable('core/config_data');
34
+
35
+ $magentoVersion = Mage::getVersion();
36
+
37
+ $installer = $this;
38
+
39
+ $installer->startSetup();
40
+
41
+ #-----------------------------------------------------------------
42
+ #-- Create Table novalnet_order_log
43
+ #-----------------------------------------------------------------
44
+ $installer->run("
45
+ CREATE TABLE IF NOT EXISTS `{$tableOrderLog}` (
46
+ `nn_log_id` int(11) UNSIGNED NOT NULL auto_increment,
47
+ `request_data` TEXT NOT NULL DEFAULT '',
48
+ `response_data` TEXT NOT NULL DEFAULT '',
49
+ `order_id` VARCHAR(50) NOT NULL DEFAULT '',
50
+ `customer_id` VARCHAR(10) NOT NULL DEFAULT '',
51
+ `status` VARCHAR(20) NOT NULL DEFAULT '',
52
+ `failed_reason` TEXT NOT NULL DEFAULT '',
53
+ `store_id` int(11) UNSIGNED NOT NULL,
54
+ `shop_url` VARCHAR(255) NOT NULL DEFAULT '',
55
+ `transaction_id` VARCHAR(50) NOT NULL,
56
+ `additional_data` TEXT NOT NULL DEFAULT '',
57
+ `created_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
58
+ PRIMARY KEY (`nn_log_id`)
59
+ ) ENGINE = MYISAM CHARACTER SET utf8 COLLATE utf8_unicode_ci;
60
+ ");
61
+
62
+ #-----------------------------------------------------------------
63
+ #-- Create Table novalnet_transaction_status
64
+ #-----------------------------------------------------------------
65
+ $installer->run("
66
+ CREATE TABLE IF NOT EXISTS `{$tableTransactionStatus}` (
67
+ `nn_txn_id` int(11) UNSIGNED NOT NULL auto_increment,
68
+ `transaction_no` VARCHAR(50) NOT NULL,
69
+ `order_id` VARCHAR(50) NOT NULL DEFAULT '',
70
+ `transaction_status` VARCHAR(20) NOT NULL DEFAULT 0,
71
+ `nc_no` VARCHAR(11) NOT NULL,
72
+ `customer_id` VARCHAR(10) NOT NULL DEFAULT '',
73
+ `payment_name` VARCHAR(50) NOT NULL DEFAULT '',
74
+ `amount` decimal(12,4) NOT NULL,
75
+ `remote_ip` VARCHAR(20) NOT NULL,
76
+ `store_id` int(11) UNSIGNED NOT NULL,
77
+ `shop_url` VARCHAR(255) NOT NULL DEFAULT '',
78
+ `additional_data` TEXT NOT NULL DEFAULT '',
79
+ `created_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
80
+ PRIMARY KEY (`nn_txn_id`)
81
+ ) ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_unicode_ci;
82
+ ");
83
+
84
+ #-----------------------------------------------------------------
85
+ #-- Create Table novalnet_order_callback
86
+ #-----------------------------------------------------------------
87
+ $installer->run("
88
+ CREATE TABLE IF NOT EXISTS `{$tableCallback}` (
89
+ `id` int(11) UNSIGNED NOT NULL auto_increment,
90
+ `order_id` VARCHAR(50) NOT NULL DEFAULT '',
91
+ `callback_amount` int(11) UNSIGNED NOT NULL,
92
+ `reference_tid` VARCHAR(50) NOT NULL,
93
+ `callback_datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
94
+ `callback_tid` VARCHAR(50) NOT NULL,
95
+ `callback_log` TEXT NOT NULL DEFAULT '',
96
+ PRIMARY KEY (`id`)
97
+ ) ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_unicode_ci;
98
+ ");
99
+
100
+ $methodFields = array();
101
+ $methodData = array(
102
+ 'sofortueberweisung' => 'novalnetSofortueberweisung',
103
+ 'novalnetsofortueberweisung' => 'novalnetSofortueberweisung',
104
+ 'novalnetpaypal' => 'novalnetPaypal',
105
+ 'novalnetCcpci' => 'novalnetCc',
106
+ 'novalnet_secure' => 'novalnetCc',
107
+ 'novalnetSecure' => 'novalnetCc',
108
+ 'novalnetElvatpci' => 'novalnetSepa',
109
+ 'novalnetElvdepci' => 'novalnetSepa',
110
+ 'novalnetElvaustria' => 'novalnetSepa',
111
+ 'novalnetElvgerman' => 'novalnetSepa'
112
+ );
113
+
114
+ foreach ($methodData as $variableId => $value) {
115
+ $methodFields['method'] = $value;
116
+ $installer->getConnection()->update(
117
+ $tableOrderPayment,
118
+ $methodFields,
119
+ array('method = ?' => $variableId)
120
+ );
121
+ }
122
+
123
+ if (version_compare($magentoVersion, '1.6', '<')) {
124
+ $nnPaypalFields = array();
125
+ $pathData = array(
126
+ 'payment/novalnetpaypal/active' => 'payment/novalnetPaypal/active',
127
+ 'payment/novalnetpaypal/title' => 'payment/novalnetPaypal/title',
128
+ 'payment/novalnetpaypal/order_status' => 'payment/novalnetPaypal/order_status',
129
+ 'payment/novalnetpaypal/booking_reference' => 'payment/novalnetPaypal/booking_reference',
130
+ 'payment/novalnetpaypal/order_status_after_payment' => 'payment/novalnetPaypal/order_status_after_payment',
131
+ 'payment/novalnetpaypal/user_group_excluded' => 'payment/novalnetPaypal/user_group_excluded',
132
+ 'payment/novalnetpaypal/gateway_timeout' => 'payment/novalnetPaypal/gateway_timeout',
133
+ 'payment/novalnetpaypal/allowspecific' => 'payment/novalnetPaypal/allowspecific',
134
+ 'payment/novalnetpaypal/min_order_total' => 'payment/novalnetPaypal/min_order_total',
135
+ 'payment/novalnetpaypal/max_order_total' => 'payment/novalnetPaypal/max_order_total',
136
+ 'payment/novalnetpaypal/orderscount' => 'payment/novalnetPaypal/orderscount',
137
+ 'payment/novalnetpaypal/sort_order' => 'payment/novalnetPaypal/sort_order'
138
+ );
139
+
140
+
141
+ foreach ($pathData as $variableId => $value) {
142
+ $nnPaypalFields['path'] = $value;
143
+ $installer->getConnection()->update(
144
+ $tableConfigData,
145
+ $nnPaypalFields,
146
+ array('path = ?' => $variableId)
147
+ );
148
+ }
149
+ }
150
+
151
+ $installer->endSetup();
app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-1.4.0-5.0.0.php ADDED
@@ -0,0 +1,147 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ /** novalnet tables */
27
+ $tableOrderLog = $this->getTable('novalnet_payment/order_log');
28
+ $tableTransactionStatus = $this->getTable('novalnet_payment/transaction_status');
29
+ $tableCallback = $this->getTable('novalnet_payment/callback');
30
+
31
+ /** magento tables */
32
+ $tableOrderPayment = $this->getTable('sales/order_payment');
33
+ $tableConfigData = $this->getTable('core/config_data');
34
+
35
+ $magentoVersion = Mage::getVersion();
36
+
37
+ $installer = $this;
38
+
39
+ $installer->startSetup();
40
+
41
+ #-----------------------------------------------------------------
42
+ #-- Create Table novalnet_order_log
43
+ #-----------------------------------------------------------------
44
+ $installer->run("
45
+ CREATE TABLE IF NOT EXISTS `{$tableOrderLog}` (
46
+ `nn_log_id` int(11) UNSIGNED NOT NULL auto_increment,
47
+ `request_data` TEXT NOT NULL DEFAULT '',
48
+ `response_data` TEXT NOT NULL DEFAULT '',
49
+ `order_id` VARCHAR(50) NOT NULL DEFAULT '',
50
+ `customer_id` VARCHAR(10) NOT NULL DEFAULT '',
51
+ `status` VARCHAR(20) NOT NULL DEFAULT '',
52
+ `failed_reason` TEXT NOT NULL DEFAULT '',
53
+ `store_id` int(11) UNSIGNED NOT NULL,
54
+ `shop_url` VARCHAR(255) NOT NULL DEFAULT '',
55
+ `transaction_id` VARCHAR(50) NOT NULL,
56
+ `additional_data` TEXT NOT NULL DEFAULT '',
57
+ `created_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
58
+ PRIMARY KEY (`nn_log_id`)
59
+ ) ENGINE = MYISAM CHARACTER SET utf8 COLLATE utf8_unicode_ci;
60
+ ");
61
+
62
+ #-----------------------------------------------------------------
63
+ #-- Create Table novalnet_transaction_status
64
+ #-----------------------------------------------------------------
65
+ $installer->run("
66
+ CREATE TABLE IF NOT EXISTS `{$tableTransactionStatus}` (
67
+ `nn_txn_id` int(11) UNSIGNED NOT NULL auto_increment,
68
+ `transaction_no` VARCHAR(50) NOT NULL,
69
+ `order_id` VARCHAR(50) NOT NULL DEFAULT '',
70
+ `transaction_status` VARCHAR(20) NOT NULL DEFAULT 0,
71
+ `nc_no` VARCHAR(11) NOT NULL,
72
+ `customer_id` VARCHAR(10) NOT NULL DEFAULT '',
73
+ `payment_name` VARCHAR(50) NOT NULL DEFAULT '',
74
+ `amount` decimal(12,4) NOT NULL,
75
+ `remote_ip` VARCHAR(20) NOT NULL,
76
+ `store_id` int(11) UNSIGNED NOT NULL,
77
+ `shop_url` VARCHAR(255) NOT NULL DEFAULT '',
78
+ `additional_data` TEXT NOT NULL DEFAULT '',
79
+ `created_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
80
+ PRIMARY KEY (`nn_txn_id`)
81
+ ) ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_unicode_ci;
82
+ ");
83
+
84
+ #-----------------------------------------------------------------
85
+ #-- Create Table novalnet_order_callback
86
+ #-----------------------------------------------------------------
87
+ $installer->run("
88
+ CREATE TABLE IF NOT EXISTS `{$tableCallback}` (
89
+ `id` int(11) UNSIGNED NOT NULL auto_increment,
90
+ `order_id` VARCHAR(50) NOT NULL DEFAULT '',
91
+ `callback_amount` int(11) UNSIGNED NOT NULL,
92
+ `reference_tid` VARCHAR(50) NOT NULL,
93
+ `callback_datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
94
+ `callback_tid` VARCHAR(50) NOT NULL,
95
+ `callback_log` TEXT NOT NULL DEFAULT '',
96
+ PRIMARY KEY (`id`)
97
+ ) ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_unicode_ci;
98
+ ");
99
+
100
+ $methodFields = array();
101
+ $methodData = array(
102
+ 'sofortueberweisung' => 'novalnetSofortueberweisung',
103
+ 'novalnetpaypal' => 'novalnetPaypal',
104
+ 'novalnetCcpci' => 'novalnetCc',
105
+ 'novalnet_secure' => 'novalnetCc',
106
+ 'novalnetElvatpci' => 'novalnetSepa',
107
+ 'novalnetElvdepci' => 'novalnetSepa'
108
+ );
109
+
110
+ foreach ($methodData as $variableId => $value) {
111
+ $methodFields['method'] = $value;
112
+ $installer->getConnection()->update(
113
+ $tableOrderPayment,
114
+ $methodFields,
115
+ array('method = ?' => $variableId)
116
+ );
117
+ }
118
+
119
+ if (version_compare($magentoVersion, '1.6', '<')) {
120
+ $nnPaypalFields = array();
121
+ $pathData = array(
122
+ 'payment/novalnetpaypal/active' => 'payment/novalnetPaypal/active',
123
+ 'payment/novalnetpaypal/title' => 'payment/novalnetPaypal/title',
124
+ 'payment/novalnetpaypal/order_status' => 'payment/novalnetPaypal/order_status',
125
+ 'payment/novalnetpaypal/booking_reference' => 'payment/novalnetPaypal/booking_reference',
126
+ 'payment/novalnetpaypal/order_status_after_payment' => 'payment/novalnetPaypal/order_status_after_payment',
127
+ 'payment/novalnetpaypal/user_group_excluded' => 'payment/novalnetPaypal/user_group_excluded',
128
+ 'payment/novalnetpaypal/gateway_timeout' => 'payment/novalnetPaypal/gateway_timeout',
129
+ 'payment/novalnetpaypal/allowspecific' => 'payment/novalnetPaypal/allowspecific',
130
+ 'payment/novalnetpaypal/min_order_total' => 'payment/novalnetPaypal/min_order_total',
131
+ 'payment/novalnetpaypal/max_order_total' => 'payment/novalnetPaypal/max_order_total',
132
+ 'payment/novalnetpaypal/orderscount' => 'payment/novalnetPaypal/orderscount',
133
+ 'payment/novalnetpaypal/sort_order' => 'payment/novalnetPaypal/sort_order'
134
+ );
135
+
136
+
137
+ foreach ($pathData as $variableId => $value) {
138
+ $nnPaypalFields['path'] = $value;
139
+ $installer->getConnection()->update(
140
+ $tableConfigData,
141
+ $nnPaypalFields,
142
+ array('path = ?' => $variableId)
143
+ );
144
+ }
145
+ }
146
+
147
+ $installer->endSetup();
app/code/community/Novalnet/Payment/{Model/Payment/Method/NovalnetElvgerman.php → sql/novalnet_setup/mysql4-upgrade-5.0.0-5.0.1.php} RENAMED
@@ -1,35 +1,48 @@
1
- <?php
2
-
3
- /**
4
- * Magento
5
- *
6
- * NOTICE OF LICENSE
7
- *
8
- * This source file is subject to the Open Software License (OSL 3.0)
9
- * that is bundled with this package in the file LICENSE.txt.
10
- * It is also available through the world-wide-web at this URL:
11
- * http://opensource.org/licenses/osl-3.0.php
12
- * If you did not receive a copy of the license and are unable to
13
- * obtain it through the world-wide-web, please send an email
14
- * to license@magentocommerce.com so we can send you a copy immediately.
15
- *
16
- * Part of the Paymentmodule of Novalnet AG
17
- * https://www.novalnet.de
18
- * If you have found this script usefull a small
19
- * recommendation as well as a comment on merchant form
20
- * would be greatly appreciated.
21
- *
22
- * @category Novalnet
23
- * @package Novalnet_Payment
24
- * @copyright Novalnet AG
25
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
- */
27
- class Novalnet_Payment_Model_Payment_Method_NovalnetElvgerman extends Novalnet_Payment_Model_Payment_Method_Abstract {
28
-
29
- protected $_code = Novalnet_Payment_Model_Config::NN_ELVDE;
30
- protected $_canCapture = Novalnet_Payment_Model_Config::NN_ELVDE_CAN_CAPTURE;
31
- protected $_canUseForMultishipping = Novalnet_Payment_Model_Config::NN_ELVDE_CAN_USE_MULTISHIPPING;
32
- protected $_formBlockType = Novalnet_Payment_Model_Config::NN_ELVDE_FORM_BLOCK;
33
- protected $_infoBlockType = Novalnet_Payment_Model_Config::NN_ELVDE_INFO_BLOCK;
34
-
35
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ /** magento table */
27
+ $tableOrderPayment = $this->getTable('sales/order_payment');
28
+
29
+ $installer = $this;
30
+
31
+ $installer->startSetup();
32
+
33
+ $methodFields = array();
34
+ $methodData = array(
35
+ 'novalnetsofortueberweisung' => 'novalnetSofortueberweisung',
36
+ 'novalnetpaypal' => 'novalnetPaypal',
37
+ 'novalnetideal' => 'novalnetIdeal'
38
+ );
39
+
40
+ foreach ($methodData as $variableId => $value) {
41
+ $methodFields['method'] = $value;
42
+ $installer->getConnection()->update(
43
+ $tableOrderPayment,
44
+ $methodFields,
45
+ array('method = ?' => $variableId)
46
+ );
47
+ }
48
+ $installer->endSetup();
app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-5.0.0-5.0.2.php DELETED
@@ -1,61 +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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
-
27
- /** novalnet table */
28
- $tableCallback = $this->getTable('novalnet_payment/callback');
29
-
30
- /** magento table */
31
- $tableOrderPayment = $this->getTable('sales/order_payment');
32
-
33
- $installer = $this;
34
-
35
- $installer->startSetup();
36
-
37
- #-----------------------------------------------------------------
38
- #-- Create Table novalnet_order_callback
39
- #-----------------------------------------------------------------
40
- $installer->run("
41
- CREATE TABLE IF NOT EXISTS `{$tableCallback}` (
42
- `id` int(11) UNSIGNED NOT NULL auto_increment,
43
- `order_id` VARCHAR(50) NOT NULL DEFAULT '',
44
- `callback_amount` int(11) UNSIGNED NOT NULL,
45
- `reference_tid` VARCHAR(50) NOT NULL,
46
- `callback_datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
47
- `callback_tid` VARCHAR(50) NOT NULL,
48
- `callback_log` TEXT NOT NULL DEFAULT '',
49
- PRIMARY KEY (`id`)
50
- ) ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_unicode_ci;
51
- ");
52
-
53
- $installer->run("
54
- UPDATE `{$tableOrderPayment}` SET `method` = 'novalnetSofortueberweisung'
55
- WHERE `method` = 'novalnetsofortueberweisung';
56
- UPDATE `{$tableOrderPayment}` SET `method` = 'novalnetPaypal'
57
- WHERE `method` = 'novalnetpaypal';
58
- UPDATE `{$tableOrderPayment}` SET `method` = 'novalnetIdeal'
59
- WHERE `method` = 'novalnetideal';
60
- ");
61
- $installer->endSetup();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-5.0.1-5.0.2.php CHANGED
@@ -23,7 +23,6 @@
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
-
27
  /** novalnet table */
28
  $tableCallback = $this->getTable('novalnet_payment/callback');
29
 
@@ -38,24 +37,37 @@ $installer->startSetup();
38
  #-- Create Table novalnet_order_callback
39
  #-----------------------------------------------------------------
40
  $installer->run("
41
- CREATE TABLE IF NOT EXISTS `{$tableCallback}` (
42
- `id` int(11) UNSIGNED NOT NULL auto_increment,
43
- `order_id` VARCHAR(50) NOT NULL DEFAULT '',
44
- `callback_amount` int(11) UNSIGNED NOT NULL,
45
- `reference_tid` VARCHAR(50) NOT NULL,
46
- `callback_datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
47
- `callback_tid` VARCHAR(50) NOT NULL,
48
- `callback_log` TEXT NOT NULL DEFAULT '',
49
- PRIMARY KEY (`id`)
50
- ) ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_unicode_ci;
51
  ");
52
 
53
- $installer->run("
54
- UPDATE `{$tableOrderPayment}` SET `method` = 'novalnetSofortueberweisung'
55
- WHERE `method` = 'novalnetsofortueberweisung';
56
- UPDATE `{$tableOrderPayment}` SET `method` = 'novalnetPaypal'
57
- WHERE `method` = 'novalnetpaypal';
58
- UPDATE `{$tableOrderPayment}` SET `method` = 'novalnetIdeal'
59
- WHERE `method` = 'novalnetideal';
60
- ");
 
 
 
 
 
 
 
 
 
 
 
 
 
61
  $installer->endSetup();
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
26
  /** novalnet table */
27
  $tableCallback = $this->getTable('novalnet_payment/callback');
28
 
37
  #-- Create Table novalnet_order_callback
38
  #-----------------------------------------------------------------
39
  $installer->run("
40
+ CREATE TABLE IF NOT EXISTS `{$tableCallback}` (
41
+ `id` int(11) UNSIGNED NOT NULL auto_increment,
42
+ `order_id` VARCHAR(50) NOT NULL DEFAULT '',
43
+ `callback_amount` int(11) UNSIGNED NOT NULL,
44
+ `reference_tid` VARCHAR(50) NOT NULL,
45
+ `callback_datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
46
+ `callback_tid` VARCHAR(50) NOT NULL,
47
+ `callback_log` TEXT NOT NULL DEFAULT '',
48
+ PRIMARY KEY (`id`)
49
+ ) ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_unicode_ci;
50
  ");
51
 
52
+ $methodFields = array();
53
+ $methodData = array(
54
+ 'sofortueberweisung' => 'novalnetSofortueberweisung',
55
+ 'novalnetsofortueberweisung' => 'novalnetSofortueberweisung',
56
+ 'novalnetpaypal' => 'novalnetPaypal',
57
+ 'novalnetideal' => 'novalnetIdeal',
58
+ 'novalnetCcpci' => 'novalnetCc',
59
+ 'novalnet_secure' => 'novalnetCc',
60
+ 'novalnetSecure' => 'novalnetCc',
61
+ 'novalnetElvatpci' => 'novalnetSepa',
62
+ 'novalnetElvdepci' => 'novalnetSepa'
63
+ );
64
+
65
+ foreach ($methodData as $variableId => $value) {
66
+ $methodFields['method'] = $value;
67
+ $installer->getConnection()->update(
68
+ $tableOrderPayment,
69
+ $methodFields,
70
+ array('method = ?' => $variableId)
71
+ );
72
+ }
73
  $installer->endSetup();
app/code/community/Novalnet/Payment/{Model/Novalnet/Source/PendingOrder.php → sql/novalnet_setup/mysql4-upgrade-5.0.2-5.0.3.php} RENAMED
@@ -1,31 +1,49 @@
1
- <?php
2
-
3
- /**
4
- * Magento
5
- *
6
- * NOTICE OF LICENSE
7
- *
8
- * This source file is subject to the Open Software License (OSL 3.0)
9
- * that is bundled with this package in the file LICENSE.txt.
10
- * It is also available through the world-wide-web at this URL:
11
- * http://opensource.org/licenses/osl-3.0.php
12
- * If you did not receive a copy of the license and are unable to
13
- * obtain it through the world-wide-web, please send an email
14
- * to license@magentocommerce.com so we can send you a copy immediately.
15
- *
16
- * Part of the Paymentmodule of Novalnet AG
17
- * https://www.novalnet.de
18
- * If you have found this script usefull a small
19
- * recommendation as well as a comment on merchant form
20
- * would be greatly appreciated.
21
- *
22
- * @category Novalnet
23
- * @package Novalnet_Payment
24
- * @copyright Novalnet AG
25
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
- */
27
- class Novalnet_Payment_Model_Novalnet_Source_PendingOrder extends Mage_Adminhtml_Model_System_Config_Source_Order_Status {
28
-
29
- protected $_stateStatuses = Mage_Sales_Model_Order::STATE_NEW;
30
-
31
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ /** magento table */
27
+ $tableOrderPayment = $this->getTable('sales/order_payment');
28
+
29
+ $installer = $this;
30
+
31
+ $installer->startSetup();
32
+
33
+ $methodFields = array();
34
+ $methodData = array(
35
+ 'novalnetElvaustria' => 'novalnetSepa',
36
+ 'novalnetElvgerman' => 'novalnetSepa',
37
+ 'novalnetSecure' => 'novalnetCc'
38
+ );
39
+
40
+ foreach ($methodData as $variableId => $value) {
41
+ $methodFields['method'] = $value;
42
+ $installer->getConnection()->update(
43
+ $tableOrderPayment,
44
+ $methodFields,
45
+ array('method = ?' => $variableId)
46
+ );
47
+ }
48
+
49
+ $installer->endSetup();
app/design/adminhtml/default/default/layout/novalnet/configuration.xml CHANGED
@@ -17,12 +17,11 @@
17
  </reference>
18
  </novalnet_payment_adminhtml_sales_order_index>
19
 
20
- <!--
21
  Sales Order View
22
  -->
23
  <adminhtml_sales_order_view>
24
  <reference name="sales_order_tabs">
25
- <!-- template="novalnet/novalnetideal/sales/order/view/tab/transaction.phtml"-->
26
  <block type="novalnet_payment/adminhtml_sales_order_view_tab_transactionStatus"
27
  name="novalnet_payment_adminhtml_sales_order_view_tab_transactionStatus">
28
  </block>
@@ -31,72 +30,61 @@
31
  <block>novalnet_payment/adminhtml_sales_order_view_tab_transactionStatus</block>
32
  </action>
33
  <block type="novalnet_payment/adminhtml_sales_order_view_tab_transactionOverview"
34
- name="novalnet_payment_adminhtml_sales_order_view_tab_transactionOverview">
35
  </block>
36
  <action method="addTab">
37
  <name>novalnet_payment_adminhtml_sales_order_view_tab_transactionOverview</name>
38
  <block>novalnet_payment/adminhtml_sales_order_view_tab_transactionOverview</block>
39
  </action>
40
  </reference>
41
- <reference name="order_tab_info">
42
- <action method="setTemplate">
43
- <template>novalnet/sales/order/view/info.phtml</template>
44
- </action>
45
- </reference>
46
- <!--
47
- <reference name="content">
48
- <block type="adminhtml/sales_order_view" name="order_info" template="novalnet/sales/order/info.phtml" />
49
- </reference>
50
- -->
51
  </adminhtml_sales_order_view>
52
 
53
- <!--
54
- Novalnet transaction
55
- -->
56
  <novalnet_payment_adminhtml_transaction_index>
57
  <reference name="content">
58
  <block type="novalnet_payment/adminhtml_transaction" name="novalnet_payment_transaction" />
59
  </reference>
60
  </novalnet_payment_adminhtml_transaction_index>
61
 
62
- <!--
63
- Novalnet transaction view
64
- -->
65
  <novalnet_payment_adminhtml_transaction_view>
66
  <reference name="content">
67
  <block type="novalnet_payment/adminhtml_transaction_view" name="novalnet_payment_transaction_view" template="novalnet/transaction/view/form.phtml">
68
- <!--block type="novalnet_payment/adminhtml_transaction_view_form" name="novalnet_payment_transaction_view_form" template="novalnet/transaction/view/form.phtml" /-->
69
  </block>
70
  </reference>
71
  </novalnet_payment_adminhtml_transaction_view>
72
 
73
- <!--
74
- Novalnet transaction overview / order log
75
- -->
76
  <novalnet_payment_adminhtml_transactionoverview_index>
77
  <reference name="content">
78
  <block type="novalnet_payment/adminhtml_transactionoverview" name="novalnet_payment_transactionoverview" />
79
  </reference>
80
  </novalnet_payment_adminhtml_transactionoverview_index>
81
 
82
- <!--
83
- Novalnet transaction overview / order log
84
- -->
85
  <novalnet_payment_adminhtml_transactionoverview_view>
86
  <reference name="content">
87
  <block type="novalnet_payment/adminhtml_transactionoverview_view" name="novalnet_payment_transactionoverview_view" template="novalnet/transaction/overview/view/form.phtml"/>
88
  </reference>
89
  </novalnet_payment_adminhtml_transactionoverview_view>
90
 
91
- <!-- Global Configuration -->
92
 
93
  <novalnet_payment_adminhtml_configuration_wizard_page_index>
94
  <update handle="novalnet_payment_adminhtml_configuration_wizard_page_view" />
95
  <reference name="novalnet.config.wizard.page.view">
96
  <block type="adminhtml/system_config_switcher"
97
- name="novalnet.config.wizard.page.switcher"
98
- before="-"
99
- template="novalnet/payment/configuration/wizard/page/store_switcher.phtml" />
100
 
101
  </reference>
102
  </novalnet_payment_adminhtml_configuration_wizard_page_index>
@@ -105,24 +93,24 @@
105
  <reference name="content">
106
  <block type="novalnet_payment/adminhtml_configuration_wizard_page_view"
107
  name="novalnet.config.wizard.page.view"
108
- template="novalnet/payment/configuration/wizard/page/view/container.phtml" />
109
  </reference>
110
  </novalnet_payment_adminhtml_configuration_wizard_page_view>
111
 
112
  <novalnet_payment_adminhtml_configuration_wizard_page_generalglobal>
113
  <reference name="content">
114
  <block type="novalnet_payment/adminhtml_configuration_wizard_page_edit"
115
- name="novalnet.config.wizard.page.edit" template="novalnet/payment/configuration/wizard/page/form/container.phtml">
116
  <block type="novalnet_payment/adminhtml_configuration_wizard_config_form"
117
- name="form" >
118
  </block>
119
  </block>
120
  </reference>
121
  </novalnet_payment_adminhtml_configuration_wizard_page_generalglobal>
122
 
123
- <!--
124
- Novalnet information index overview / order log
125
- -->
126
  <novalnet_payment_adminhtml_information_index>
127
  <reference name="content">
128
  <block type="novalnet_payment/adminhtml_information"
17
  </reference>
18
  </novalnet_payment_adminhtml_sales_order_index>
19
 
20
+ <!--
21
  Sales Order View
22
  -->
23
  <adminhtml_sales_order_view>
24
  <reference name="sales_order_tabs">
 
25
  <block type="novalnet_payment/adminhtml_sales_order_view_tab_transactionStatus"
26
  name="novalnet_payment_adminhtml_sales_order_view_tab_transactionStatus">
27
  </block>
30
  <block>novalnet_payment/adminhtml_sales_order_view_tab_transactionStatus</block>
31
  </action>
32
  <block type="novalnet_payment/adminhtml_sales_order_view_tab_transactionOverview"
33
+ name="novalnet_payment_adminhtml_sales_order_view_tab_transactionOverview">
34
  </block>
35
  <action method="addTab">
36
  <name>novalnet_payment_adminhtml_sales_order_view_tab_transactionOverview</name>
37
  <block>novalnet_payment/adminhtml_sales_order_view_tab_transactionOverview</block>
38
  </action>
39
  </reference>
 
 
 
 
 
 
 
 
 
 
40
  </adminhtml_sales_order_view>
41
 
42
+ <!--
43
+ Novalnet transaction
44
+ -->
45
  <novalnet_payment_adminhtml_transaction_index>
46
  <reference name="content">
47
  <block type="novalnet_payment/adminhtml_transaction" name="novalnet_payment_transaction" />
48
  </reference>
49
  </novalnet_payment_adminhtml_transaction_index>
50
 
51
+ <!--
52
+ Novalnet transaction view
53
+ -->
54
  <novalnet_payment_adminhtml_transaction_view>
55
  <reference name="content">
56
  <block type="novalnet_payment/adminhtml_transaction_view" name="novalnet_payment_transaction_view" template="novalnet/transaction/view/form.phtml">
 
57
  </block>
58
  </reference>
59
  </novalnet_payment_adminhtml_transaction_view>
60
 
61
+ <!--
62
+ Novalnet transaction overview / order log
63
+ -->
64
  <novalnet_payment_adminhtml_transactionoverview_index>
65
  <reference name="content">
66
  <block type="novalnet_payment/adminhtml_transactionoverview" name="novalnet_payment_transactionoverview" />
67
  </reference>
68
  </novalnet_payment_adminhtml_transactionoverview_index>
69
 
70
+ <!--
71
+ Novalnet transaction overview / order log
72
+ -->
73
  <novalnet_payment_adminhtml_transactionoverview_view>
74
  <reference name="content">
75
  <block type="novalnet_payment/adminhtml_transactionoverview_view" name="novalnet_payment_transactionoverview_view" template="novalnet/transaction/overview/view/form.phtml"/>
76
  </reference>
77
  </novalnet_payment_adminhtml_transactionoverview_view>
78
 
79
+ <!-- Global Configuration -->
80
 
81
  <novalnet_payment_adminhtml_configuration_wizard_page_index>
82
  <update handle="novalnet_payment_adminhtml_configuration_wizard_page_view" />
83
  <reference name="novalnet.config.wizard.page.view">
84
  <block type="adminhtml/system_config_switcher"
85
+ name="novalnet.config.wizard.page.switcher"
86
+ before="-"
87
+ template="novalnet/payment/configuration/store_switcher.phtml" />
88
 
89
  </reference>
90
  </novalnet_payment_adminhtml_configuration_wizard_page_index>
93
  <reference name="content">
94
  <block type="novalnet_payment/adminhtml_configuration_wizard_page_view"
95
  name="novalnet.config.wizard.page.view"
96
+ template="novalnet/payment/configuration/container.phtml" />
97
  </reference>
98
  </novalnet_payment_adminhtml_configuration_wizard_page_view>
99
 
100
  <novalnet_payment_adminhtml_configuration_wizard_page_generalglobal>
101
  <reference name="content">
102
  <block type="novalnet_payment/adminhtml_configuration_wizard_page_edit"
103
+ name="novalnet.config.wizard.page.edit" template="novalnet/payment/configuration/formcontainer.phtml">
104
  <block type="novalnet_payment/adminhtml_configuration_wizard_config_form"
105
+ name="form" >
106
  </block>
107
  </block>
108
  </reference>
109
  </novalnet_payment_adminhtml_configuration_wizard_page_generalglobal>
110
 
111
+ <!--
112
+ Novalnet information index overview / order log
113
+ -->
114
  <novalnet_payment_adminhtml_information_index>
115
  <reference name="content">
116
  <block type="novalnet_payment/adminhtml_information"
app/design/adminhtml/default/default/template/novalnet/payment/{method/form/Ccsecure.phtml → configuration/container.phtml} RENAMED
@@ -1,27 +1,45 @@
1
- <?php
2
- /**
3
- * Magento
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Open Software License (OSL 3.0)
8
- * that is bundled with this package in the file LICENSE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://opensource.org/licenses/osl-3.0.php
11
- * If you did not receive a copy of the license and are unable to
12
- * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
- *
15
- * Part of the Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- ?>
27
- <?php echo $this->__('Not possible') ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ ?>
27
+ <div class="content-header">
28
+ <table cellspacing="0">
29
+ <tr>
30
+ <td><h3><?php echo $this->getHeaderText() ?></h3></td>
31
+ </tr>
32
+ </table>
33
+ </div>
34
+
35
+ <?php echo $this->getViewHtml() ?>
36
+
37
+ <div class="content-header" id="novalnet_wizard_form_buttons">
38
+ <table cellspacing="0">
39
+ <tr>
40
+ <td class="form-buttons">
41
+ <?php echo $this->getButtonsHtml() ?>
42
+ </td>
43
+ </tr>
44
+ </table>
45
+ </div>
app/design/adminhtml/default/default/template/novalnet/payment/{method/form/Safetypay.phtml → configuration/formcontainer.phtml} RENAMED
@@ -24,4 +24,15 @@
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
- <?php echo $this->__('Not possible') ?>
 
 
 
 
 
 
 
 
 
 
 
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
+ <?php echo $this->getFormInitScripts() ?>
28
+ <div class="content-header">
29
+ <?php echo $this->getHeaderHtml() ?>
30
+ </div>
31
+ <?php echo $this->getFormHtml() ?>
32
+ <div class="content-header">
33
+ <p class="form-buttons"><?php echo $this->getButtonsHtml('header') ?></p>
34
+ </div>
35
+ <script type="text/javascript">
36
+ editForm = new varienForm('edit_form', '<?php echo $this->getValidationUrl() ?>');
37
+ </script>
38
+ <?php echo $this->getFormScripts() ?>
app/design/adminhtml/default/default/template/novalnet/payment/configuration/store_switcher.phtml ADDED
@@ -0,0 +1,46 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ ?>
27
+ <div class="switcher">
28
+ <label for="store_switcher"><?php echo $this->__('Current Configuration Scope:') ?></label>
29
+ <select id="store_switcher" class="system-config-store-switcher" onchange="location.href = this.options[this.selectedIndex].getAttribute('url')">
30
+ <?php foreach ($this->getStoreSelectOptions() as $_value => $_option): ?>
31
+ <?php if (isset($_option['is_group'])): ?>
32
+ <?php if ($_option['is_close']): ?>
33
+ </optgroup>
34
+ <?php else: ?>
35
+ <optgroup label="<?php echo $_option['label'] ?>" style="<?php echo $_option['style'] ?>">
36
+ <?php endif; ?>
37
+ <?php continue ?>
38
+ <?php endif; ?>
39
+ <option value="<?php echo $_value ?>" url="<?php echo $_option['url'] ?>" <?php
40
+ echo $_option['selected'] ? 'selected="selected"' : ''
41
+ ?> style="<?php echo $_option['style'] ?>">
42
+ <?php echo $_option['label'] ?>
43
+ </option>
44
+ <?php endforeach ?>
45
+ </select>
46
+ </div>
app/design/adminhtml/default/default/template/novalnet/payment/configuration/wizard/page/form/container.phtml DELETED
@@ -1,12 +0,0 @@
1
- <?php echo $this->getFormInitScripts() ?>
2
- <div class="content-header">
3
- <?php echo $this->getHeaderHtml() ?>
4
- </div>
5
- <?php echo $this->getFormHtml() ?>
6
- <div class="content-header">
7
- <p class="form-buttons"><?php echo $this->getButtonsHtml('header') ?></p>
8
- </div>
9
- <script type="text/javascript">
10
- editForm = new varienForm('edit_form', '<?php echo $this->getValidationUrl() ?>');
11
- </script>
12
- <?php echo $this->getFormScripts() ?>
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/novalnet/payment/configuration/wizard/page/store_switcher.phtml DELETED
@@ -1,19 +0,0 @@
1
-
2
- <div class="switcher">
3
- <label for="store_switcher"><?php echo $this->__('Current Configuration Scope:') ?></label>
4
- <select id="store_switcher" class="system-config-store-switcher" onchange="location.href=this.options[this.selectedIndex].getAttribute('url')">
5
- <?php foreach ($this->getStoreSelectOptions() as $_value=>$_option): ?>
6
- <?php if (isset($_option['is_group'])): ?>
7
- <?php if ($_option['is_close']): ?>
8
- </optgroup>
9
- <?php else: ?>
10
- <optgroup label="<?php echo $_option['label'] ?>" style="<?php echo $_option['style'] ?>">
11
- <?php endif; ?>
12
- <?php continue ?>
13
- <?php endif; ?>
14
- <option value="<?php echo $_value ?>" url="<?php echo $_option['url'] ?>" <?php echo $_option['selected']?'selected="selected"':'' ?> style="<?php echo $_option['style'] ?>">
15
- <?php echo $_option['label'] ?>
16
- </option>
17
- <?php endforeach ?>
18
- </select>
19
- </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/novalnet/payment/configuration/wizard/page/view/container.phtml DELETED
@@ -1,19 +0,0 @@
1
- <div class="content-header">
2
- <table cellspacing="0">
3
- <tr>
4
- <td><h3><?php echo $this->getHeaderText() ?></h3></td>
5
- </tr>
6
- </table>
7
- </div>
8
-
9
- <?php echo $this->getViewHtml() ?>
10
-
11
- <div class="content-header" id="novalnet_wizard_form_buttons">
12
- <table cellspacing="0">
13
- <tr>
14
- <td class="form-buttons">
15
- <?php echo $this->getButtonsHtml() ?>
16
- </td>
17
- </tr>
18
- </table>
19
- </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Cc.phtml CHANGED
@@ -23,42 +23,49 @@
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
- include(MAGENTO_ROOT.'/novalnet_css_link.php');
27
 
28
- $code = $this->getMethodCode();
29
  $helper = Mage::helper('novalnet_payment');
30
-
31
  ?>
32
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
33
  <!--{{{ Payment Logo -->
34
- <div>
35
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "creditcard_small.jpg" ?>
37
- <img style="height:20px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->_getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
38
- </a>
39
- <!-- Amex Logo -->
40
- </div>
 
 
 
 
 
 
 
 
41
  <!--}}} Payment Logo -->
42
- <!--{{{ Novalnet Cc Form -->
43
  <div id="payment_form_<?php echo $code ?>" style="display:none;">
44
- <?php if(!$this->getMethod()->validateNovalnetIframeParams()): ?>
45
  <div style="font-weight:bold;color:red;font-size:12px;">
46
- <?php echo $this->__('Basic parameter not valid').'!' ?>
47
  </div>
48
- <?php else:?>
49
  <div id="nncc_loading">
50
  <img src="<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif" alt="Loading" />
51
  </div>
52
  <iframe frameborder="0" name="ifm_payment_form_<?php echo $code ?>" id="ifm_payment_form_<?php echo $code ?>"
53
- style="width: 400px; height: 320px; border: none; display: block; margin-top: 5px;" onload="document.getElementById('nncc_loading').style.display = 'none'" src="<?php echo Mage::helper('adminhtml')->getUrl('adminhtml/NovalnetCc/index') ?>" >
54
  </iframe>
55
  <?php endif; ?>
56
  </div>
57
 
58
  <input type="hidden" id="original_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>" />
59
  <input type="hidden" id="original_vendor_authcode" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>" />
60
- <input type="hidden" id="original_customstyle_css" value="<?php echo NOVALNET_CC_CUSTOM_CSS; ?>" />
61
- <input type="hidden" id="original_customstyle_cssval" value="<?php echo NOVALNET_CC_CUSTOM_CSS_STYLE; ?>" />
62
  <input type="hidden" name="novalnet_cc_owner" id="novalnet_cc_owner" value="" />
63
  <input type="hidden" name="novalnet_cc_type" id="novalnet_cc_type" value="" />
64
  <input type="hidden" name="novalnet_cc_exp_month" id="novalnet_cc_exp_month" value="" />
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ include(Mage::getBaseDir('base') . '/novalnet_css_link.php');
27
 
28
+ $code = $this->getMethodCode();
29
  $helper = Mage::helper('novalnet_payment');
 
30
  ?>
31
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
32
  <!--{{{ Payment Logo -->
33
+ <div>
34
+ <!-- Amex Logo -->
35
+ <?php if ($this->getMethod()->_getConfigData('enable_amex_logo')): ?>
36
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
37
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl()."creditcard_amex.png" ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>"
39
+ title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
40
+ </a>
41
+ <?php else: ?>
42
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
43
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "creditcard_small.png" ?>
44
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->_getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
45
+ </a>
46
+ <?php endif; ?>
47
+ </div>
48
  <!--}}} Payment Logo -->
49
+ <!--{{{ Novalnet Cc Form -->
50
  <div id="payment_form_<?php echo $code ?>" style="display:none;">
51
+ <?php if (!$this->getMethod()->validateNovalnetIframeParams()): ?>
52
  <div style="font-weight:bold;color:red;font-size:12px;">
53
+ <?php echo $this->__('Basic parameter not valid') . '!' ?>
54
  </div>
55
+ <?php else: ?>
56
  <div id="nncc_loading">
57
  <img src="<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif" alt="Loading" />
58
  </div>
59
  <iframe frameborder="0" name="ifm_payment_form_<?php echo $code ?>" id="ifm_payment_form_<?php echo $code ?>"
60
+ scrolling= "no" style="width: 420px; height: 300px; border: none; display: block; margin-top: 5px;" onload="novalnet_cc_iframe(this)" src="<?php echo Mage::helper('adminhtml')->getUrl('adminhtml/NovalnetCc/index') ?>" >
61
  </iframe>
62
  <?php endif; ?>
63
  </div>
64
 
65
  <input type="hidden" id="original_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>" />
66
  <input type="hidden" id="original_vendor_authcode" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>" />
67
+ <input type="hidden" id="original_customstyle_css" value="<?php echo NOVALNET_CC_CUSTOM_CSS; ?>" />
68
+ <input type="hidden" id="original_customstyle_cssval" value="<?php echo NOVALNET_CC_CUSTOM_CSS_STYLE; ?>" />
69
  <input type="hidden" name="novalnet_cc_owner" id="novalnet_cc_owner" value="" />
70
  <input type="hidden" name="novalnet_cc_type" id="novalnet_cc_type" value="" />
71
  <input type="hidden" name="novalnet_cc_exp_month" id="novalnet_cc_exp_month" value="" />
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Ccform.phtml CHANGED
@@ -25,70 +25,29 @@
25
  */
26
  ?>
27
  <?php
28
- $_code = Novalnet_Payment_Model_Config::NN_CC;
29
  ?>
30
- <script type="text/javascript">
31
- function updateHiddenElements(elements) {
32
-
33
- var cc_type=0; var cc_owner=0; var cc_no=0; var cc_hash=0; var cc_month=0; var cc_year=0; var cc_cid=0;
34
- if(document.getElementById("novalnetCc_cc_type").value!= '') cc_type=1;
35
- if(document.getElementById("novalnetCc_cc_owner").value!= '') cc_owner=1;
36
- if(document.getElementById("novalnetCc_cc_number").value!= '') cc_no=1;
37
- if(document.getElementById("novalnetCc_expiration").value!= '') cc_month = 1;
38
- if(document.getElementById("novalnetCc_expiration_yr").value!= '') cc_year = 1;
39
- if(document.getElementById("novalnetCc_cc_cid").value!= '') cc_cid=1;
40
-
41
- var novalnet_cc_field_validator = cc_type+','+cc_owner+','+cc_no+','+cc_month+','+cc_year+','+cc_cid;
42
-
43
- for (var i=0; i<elements.length; i++) {
44
- switch (elements[i].name) {
45
- case 'novalnet_cc_field_validator':
46
- elements[i].value = novalnet_cc_field_validator;
47
- break;
48
- case 'novalnet_cc_owner':
49
- elements[i].value = document.getElementById('<?php echo $_code ?>_cc_owner').value;
50
- break;
51
- case 'novalnet_cc_type':
52
- elements[i].value = document.getElementById('<?php echo $_code ?>_cc_type').value;
53
- break;
54
- case 'novalnet_cc_pan_hash':
55
- elements[i].value = document.getElementById('nncc_cardno_id').value;
56
- break;
57
- case 'novalnet_cc_unique_id':
58
- elements[i].value = document.getElementById('nncc_unique_id').value;
59
- break;
60
- case 'novalnet_cc_exp_month':
61
- elements[i].value = document.getElementById('<?php echo $_code ?>_expiration').value;
62
- break;
63
- case 'novalnet_cc_exp_year':
64
- elements[i].value = document.getElementById('<?php echo $_code ?>_expiration_yr').value;
65
- break;
66
- case 'novalnet_cc_cid':
67
- elements[i].value = document.getElementById('<?php echo $_code ?>_cc_cid').value;
68
- break;
69
- }
70
- }
71
- return true;
72
- }
73
- </script>
74
  <!--{{{ Payment Description -->
75
  <ul>
76
  <li style="margin: 0 0 8px;">
77
- <?php echo $this->__('The amount will be booked immediately from your credit card.');?>
78
  </li>
79
  <li style="margin: 0 0 8px;">
80
  <?php echo Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('booking_reference') ?>
81
  </li>
82
- <?php if(Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('live_mode', true) == 0): ?>
83
- <li style="margin: 0 0 8px;">
84
- <div style="font-weight:bold;color:red;font-size:12px;">
85
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
86
- </div>
87
- </li>
 
 
 
88
  <?php endif ?>
89
  </ul>
90
  <!--}}} Payment Description -->
91
 
92
  <!--{{{ Novalnet Iframe -->
93
- <?php echo Mage::helper('novalnet_payment')->getModel('novalnetCc')->getNovalnetIframe() ?>
94
  <!--}}} Novalnet Iframe -->
25
  */
26
  ?>
27
  <?php
28
+ $_code = Novalnet_Payment_Model_Config::NN_CC;
29
  ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
30
  <!--{{{ Payment Description -->
31
  <ul>
32
  <li style="margin: 0 0 8px;">
33
+ <?php echo $this->__('The amount will be booked immediately from your credit card.'); ?>
34
  </li>
35
  <li style="margin: 0 0 8px;">
36
  <?php echo Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('booking_reference') ?>
37
  </li>
38
+ <?php
39
+ if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('live_mode', true)
40
+ == 0):
41
+ ?>
42
+ <li style="margin: 0 0 8px;">
43
+ <div style="font-weight:bold;color:red;font-size:12px;">
44
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
45
+ </div>
46
+ </li>
47
  <?php endif ?>
48
  </ul>
49
  <!--}}} Payment Description -->
50
 
51
  <!--{{{ Novalnet Iframe -->
52
+ <?php echo Mage::helper('novalnet_payment')->getModel('novalnetCc')->getNovalnetIframe() ?>
53
  <!--}}} Novalnet Iframe -->
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Elvaustria.phtml DELETED
@@ -1,81 +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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- ?>
27
- <?php
28
- $code = $this->getMethodCode();
29
- $helper = Mage::helper('novalnet_payment');
30
- $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
31
- $elvastriaError = $this->getMethod()->getConfigData('elvastria_error');
32
- ?>
33
- <fieldset class="form-list">
34
- <div>
35
- <!--{{{ Payment Logo -->
36
- <a href="<?php echo $helper->getNovalnetUrl();?>" target="_new" style="text-decoration:none;">
37
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl()."ELV_Logo.png"; ?>
38
- <img style="height:20px;" src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
39
- </a>
40
- <!--}}} Payment Logo -->
41
- </div>
42
- <!--{{{ ELVAT Form -->
43
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
44
- <!--{{{ Payment Description -->
45
- <li style="padding-top: 0.5em;">
46
- <?php echo $this->__('Your account will be debited upon delivery of goods.') ?>
47
- </li>
48
- <!--}}} Payment Description -->
49
- <?php if($this->getUserInfo()): ?>
50
- <li>
51
- <?php echo $this->getUserInfo() ?>
52
- </li>
53
- <?php endif ?>
54
- <?php if($this->getLiveMode() == 0): ?>
55
- <li>
56
- <div style="font-weight:bold;color:red;font-size:12px;">
57
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
58
- </div>
59
- </li>
60
- <?php endif ?>
61
- <li>
62
- <div class="input-box">
63
- <label style="float:none;" for="<?php echo $code ?>_account_holder"><?php echo $this->__('Account Holder') ?><span class="required">*</span></label><br/>
64
- <input type="text" value="<?php echo $elvastriaError ? $assignDatahelper->_getCheckout()->getElvAtAccountHolder() : '';?>"id="<?php echo $code ?>_account_holder" name="payment[account_holder_at]" title="<?php echo $this->__('Account Holder') ?>" class="required-entry input-text" autocomplete="off" />
65
- </div>
66
- </li>
67
- <li>
68
- <div class="input-box">
69
- <label style="float:none;" for="<?php echo $code ?>_account_number"><?php echo $this->__('NnAccount number') ?><span class="required">*</span></label><br/>
70
- <input type="text" value="<?php echo $elvastriaError ? $assignDatahelper->_getCheckout()->getElvAtAccountNumber() : '';?>"id="<?php echo $code ?>_account_number" name="payment[account_number_at]" title="<?php echo $this->__('NnAccount Number') ?>" class="required-entry input-text" autocomplete="off" />
71
- </div>
72
- </li>
73
- <li>
74
- <div class="input-box">
75
- <label style="float:none;" for="<?php echo $code ?>_bank_sorting_code"><?php echo $this->__('Bank Code') ?><span class="required">*</span></label><br/>
76
- <input type="text" value="<?php echo $elvastriaError ? $assignDatahelper->_getCheckout()->getElvAtBankSortingCode() : '';?>" id="<?php echo $code ?>_bank_sorting_code" name="payment[bank_sorting_code_at]" title="<?php echo $this->__('Bank Code') ?>" class="required-entry input-text" autocomplete="off" />
77
- </div>
78
- </li>
79
- </ul>
80
- <!-- ELVAT Form -->
81
- </fieldset>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Elvgerman.phtml DELETED
@@ -1,105 +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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- ?>
27
- <?php
28
- $code = $this->getMethodCode();
29
- $helper = Mage::helper('novalnet_payment');
30
- $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
31
- $elvgermanError = $this->getMethod()->getConfigData('elvgerman_error');
32
- ?>
33
- <fieldset class="form-list">
34
- <div>
35
- <!--{{{ Payment Logo -->
36
- <a href="<?php echo $helper->getNovalnetUrl();?>" target="_new" style="text-decoration:none;">
37
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl()."ELV_Logo.png"; ?>
38
- <img style="height:20px;" src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
39
- </a>
40
- <!--}}} Payment Logo -->
41
- </div>
42
- <!--{{{ ELVDE Form -->
43
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
44
- <!--{{{ Payment Description -->
45
- <li style="padding-top: 0.5em;">
46
- <?php echo $this->__('Your account will be debited upon delivery of goods.') ?>
47
- </li>
48
- <!--}}} Payment Description -->
49
- <?php if($this->getUserInfo()): ?>
50
- <li>
51
- <?php echo $this->getUserInfo() ?>
52
- </li>
53
- <?php endif ?>
54
- <?php if($this->getLiveMode() == 0): ?>
55
- <li>
56
- <div style="font-weight:bold;color:red;font-size:12px;">
57
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
58
- </div>
59
- </li>
60
- <?php endif ?>
61
- <li>
62
- <div class="input-box">
63
- <label style="float:none;" for="<?php echo $code ?>_account_holder"><?php echo $this->__('Account Holder') ?><span class="required">*</span></label><br/>
64
- <input type="text" value="<?php echo $elvgermanError ? $assignDatahelper->_getCheckout()->getElvDeAccountHolder() : '';?>"id="<?php echo $code ?>_account_holder" name="payment[account_holder]" title="<?php echo $this->__('Account Holder') ?>" class="required-entry input-text" autocomplete="off" />
65
- </div>
66
- </li>
67
- <li>
68
- <div class="input-box">
69
- <label style="float:none;" for="<?php echo $code ?>_account_number"><?php echo $this->__('NnAccount number') ?><span class="required">*</span></label><br/>
70
- <input type="text" value="<?php echo $elvgermanError ? $assignDatahelper->_getCheckout()->getElvDeAccountNumber() : '';?>"id="<?php echo $code ?>_account_number" name="payment[account_number]" title="<?php echo $this->__('NnAccount Number') ?>" class="required-entry input-text" autocomplete="off" />
71
- </div>
72
- </li>
73
- <li>
74
- <div class="input-box">
75
- <label style="float:none;" for="<?php echo $code ?>_bank_sorting_code"><?php echo $this->__('Bank Code') ?><span class="required">*</span></label><br/>
76
- <input type="text" value="<?php echo $elvgermanError ? $assignDatahelper->_getCheckout()->getElvDeBankSortingCode() : '';?>" id="<?php echo $code ?>_bank_sorting_code" name="payment[bank_sorting_code]" title="<?php echo $this->__('Bank Code') ?>" class="required-entry input-text" autocomplete="off" />
77
- </div>
78
- </li>
79
- <!--{{{ ACDC check-->
80
- <?php if ($this->getAcdc()): ?>
81
- <li>
82
- <div class="input-box">
83
- <input type="checkbox" id="<?php echo $code ?>_acdc" name="payment[acdc]" title="<?php echo $this->__('acdc') ?>" class="required-entry" />
84
- <label style="float:none;" id="elvde_acdc" for="<?php echo $code ?>_acdc"><b><a><?php echo $this->__('Please enable ACDC Check.') ?></a></b>&nbsp;<span class="required">*</span></label>
85
- </div>
86
- </li>
87
- <script type="text/javascript">
88
- var showbaby;
89
-
90
- //ACDC Info
91
- $("elvde_acdc").observe('mouseover', function() {
92
- var url = parent.location.href;
93
- url = '<?php echo $helper->getNovalnetPaymentFormLogoUrl(); ?>acdc_info.png';w='550';h='300';x=screen.availWidth/2-w/2;y=screen.availHeight/2-h/2;
94
- showbaby = window.open(url,'showbaby','toolbar=0,location=0,directories=0,status=0,menubar=0,resizable=1,width='+w+',height='+h+',left='+x+',top='+y+',screenX='+x+',screenY='+y);
95
- showbaby.focus();
96
- });
97
-
98
- //Hide ACDC info
99
- function hide_acdc_info() { showbaby.close(); }
100
- </script>
101
- <?php endif ?>
102
- <!--}}} ACDC check-->
103
- </ul>
104
- <!-- ELVDE Form -->
105
- </fieldset>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/{frontend/default/default/template/novalnet/payment/method/form/Safetypay.phtml → adminhtml/default/default/template/novalnet/payment/method/form/Ideal.phtml} RENAMED
@@ -33,8 +33,10 @@ $helper = Mage::helper('novalnet_payment');
33
  <!--{{{ Payment Logo -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
- <?php $image = "safetypay_logo.jpg"; ?>
37
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image; ?>
 
 
38
  <img style="height:32px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
  </a>
40
  </div>
@@ -43,20 +45,20 @@ $helper = Mage::helper('novalnet_payment');
43
  <div>
44
  <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
45
  <li>
46
- <?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
47
  </li>
48
- <?php if ($this->getUserInfo()): ?>
49
  <li>
50
- <?php echo $this->getUserInfo() ?>
51
  </li>
52
  <?php endif; ?>
53
- <?php if ($this->getLiveMode() == 0): ?>
54
  <li>
55
  <div style="font-weight:bold;color:red;font-size:12px;">
56
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
57
  </div>
58
  </li>
59
- <?php endif ?>
60
  </ul>
61
  </div>
62
  <!--}}} Payment Description -->
33
  <!--{{{ Payment Logo -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
+ <?php
37
+ $image = "ideal_payment_small.png";
38
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
39
+ ?>
40
  <img style="height:32px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
41
  </a>
42
  </div>
45
  <div>
46
  <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
47
  <li>
48
+ <?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
49
  </li>
50
+ <?php if ($this->getUserInfo()): ?>
51
  <li>
52
+ <?php echo $this->getUserInfo() ?>
53
  </li>
54
  <?php endif; ?>
55
+ <?php if ($this->getMethod()->_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
  </ul>
63
  </div>
64
  <!--}}} Payment Description -->
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Invoice.phtml CHANGED
@@ -25,15 +25,15 @@
25
  */
26
  ?>
27
  <?php
28
- $code = $this->getMethodCode();
29
- $helper = Mage::helper('novalnet_payment');
30
  ?>
31
  <fieldset class="form-list">
32
  <!-- PAYMENT LOGO -->
33
  <div>
34
  <A HREF="<?php echo $helper->getNovalnetUrl() ?>" TARGET="_new" style="text-decoration:none;">
35
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl()."kauf-auf-rechnung.jpg"; ?>
36
- <img style="height:30px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
  </A>
38
  </div>
39
  <!-- PAYMENT LOGO -->
@@ -42,17 +42,17 @@
42
  <li>
43
  <?php echo $this->__('The Bank details will be emailed to you soon after the completion of checkout process') ?>
44
  </li>
45
- <?php if($this->getUserInfo()): ?>
46
- <li>
47
- <?php echo $this->getUserInfo()?>
48
- </li>
49
  <?php endif ?>
50
- <?php if($this->getLiveMode() == 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
  </ul>
25
  */
26
  ?>
27
  <?php
28
+ $code = $this->getMethodCode();
29
+ $helper = Mage::helper('novalnet_payment');
30
  ?>
31
  <fieldset class="form-list">
32
  <!-- PAYMENT LOGO -->
33
  <div>
34
  <A HREF="<?php echo $helper->getNovalnetUrl() ?>" TARGET="_new" style="text-decoration:none;">
35
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "kauf-auf-rechnung.png"; ?>
36
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
  </A>
38
  </div>
39
  <!-- PAYMENT LOGO -->
42
  <li>
43
  <?php echo $this->__('The Bank details will be emailed to you soon after the completion of checkout process') ?>
44
  </li>
45
+ <?php if ($this->getUserInfo()): ?>
46
+ <li>
47
+ <?php echo $this->getUserInfo() ?>
48
+ </li>
49
  <?php endif ?>
50
+ <?php if ($this->getMethod()->_getConfigData('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
  </ul>
app/design/{frontend/base/default/template/novalnet/payment/method/form/Safetypay.phtml → adminhtml/default/default/template/novalnet/payment/method/form/Paypal.phtml} RENAMED
@@ -33,8 +33,10 @@ $helper = Mage::helper('novalnet_payment');
33
  <!--{{{ Payment Logo -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
- <?php $image = "safetypay_logo.jpg"; ?>
37
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image; ?>
 
 
38
  <img style="height:32px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
  </a>
40
  </div>
@@ -43,20 +45,20 @@ $helper = Mage::helper('novalnet_payment');
43
  <div>
44
  <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
45
  <li>
46
- <?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
47
  </li>
48
- <?php if ($this->getUserInfo()): ?>
49
  <li>
50
- <?php echo $this->getUserInfo() ?>
51
  </li>
52
  <?php endif; ?>
53
- <?php if ($this->getLiveMode() == 0): ?>
54
  <li>
55
  <div style="font-weight:bold;color:red;font-size:12px;">
56
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
57
  </div>
58
  </li>
59
- <?php endif ?>
60
  </ul>
61
  </div>
62
  <!--}}} Payment Description -->
33
  <!--{{{ Payment Logo -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
+ <?php
37
+ $image = "paypal-small.png";
38
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
39
+ ?>
40
  <img style="height:32px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
41
  </a>
42
  </div>
45
  <div>
46
  <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
47
  <li>
48
+ <?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
49
  </li>
50
+ <?php if ($this->getUserInfo()): ?>
51
  <li>
52
+ <?php echo $this->getUserInfo() ?>
53
  </li>
54
  <?php endif; ?>
55
+ <?php if ($this->getMethod()->_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
  </ul>
63
  </div>
64
  <!--}}} Payment Description -->
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Phonepayment.phtml ADDED
@@ -0,0 +1,61 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ ?>
27
+ <?php
28
+ $code = $this->getMethodCode();
29
+ $helper = Mage::helper('novalnet_payment');
30
+ ?>
31
+ <fieldset class="form-list">
32
+ <!--{{{ Payment Logo -->
33
+ <div>
34
+ <A HREF="<?php echo $helper->getNovalnetUrl() ?>" TARGET="_new" style="text-decoration:none;">
35
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "novaltel_reciever.png"; ?>
36
+ <img style="height:32px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
+ </A>
38
+ </div>
39
+ <!--}}} Payment Logo -->
40
+ <!--{{{ Payment Description-->
41
+ <div>
42
+ <ul id="payment_form_<?php echo $code ?>" style="display:none">
43
+ <li>
44
+ <?php echo $this->__('Your amount will be added in your telephone bill when you place the order') ?>
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
+ </ul>
59
+ </div>
60
+ <!--}}} Payment Description-->
61
+ </fieldset>
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Prepayment.phtml CHANGED
@@ -25,15 +25,15 @@
25
  */
26
  ?>
27
  <?php
28
- $code = $this->getMethodCode();
29
- $helper = Mage::helper('novalnet_payment');
30
  ?>
31
  <fieldset class="form-list">
32
  <!-- PAYMENT LOGO -->
33
  <div>
34
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
35
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl()."vorauskasse.jpg"; ?>
36
- <img style="height:30px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
  </a>
38
  </div>
39
  <!-- PAYMENT LOGO -->
@@ -42,17 +42,17 @@
42
  <li>
43
  <?php echo $this->__('The Bank details will be emailed to you soon after the completion of checkout process') ?>
44
  </li>
45
- <?php if($this->getUserInfo()): ?>
46
- <li>
47
- <?php echo $this->getUserInfo()?>
48
- </li>
49
  <?php endif ?>
50
- <?php if($this->getLiveMode() == 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
  </ul>
25
  */
26
  ?>
27
  <?php
28
+ $code = $this->getMethodCode();
29
+ $helper = Mage::helper('novalnet_payment');
30
  ?>
31
  <fieldset class="form-list">
32
  <!-- PAYMENT LOGO -->
33
  <div>
34
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
35
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "vorauskasse.png"; ?>
36
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
  </a>
38
  </div>
39
  <!-- PAYMENT LOGO -->
42
  <li>
43
  <?php echo $this->__('The Bank details will be emailed to you soon after the completion of checkout process') ?>
44
  </li>
45
+ <?php if ($this->getUserInfo()): ?>
46
+ <li>
47
+ <?php echo $this->getUserInfo() ?>
48
+ </li>
49
  <?php endif ?>
50
+ <?php if ($this->getMethod()->_getConfigData('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
  </ul>
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Sepa.phtml CHANGED
@@ -23,21 +23,22 @@
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
- include(MAGENTO_ROOT.'/novalnet_css_link.php');
27
 
28
  $code = $this->getMethodCode();
29
  $helper = Mage::helper('novalnet_payment');
30
-
31
  ?>
32
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
33
  <!--{{{ Payment Logo -->
34
- <div>
35
- <a HREF="<?php echo $helper->getNovalnetUrl();?>" TARGET="_new" style="text-decoration:none;">
36
- <?php $image = "sepa_logo.jpg";
37
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl().$image; ?>
38
- <img style="height:20px;" src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
39
- </a>
40
- </div>
 
 
41
  <!--}}} Payment Logo -->
42
  <!--{{{ Novalnet SEPA Form -->
43
  <div id="payment_form_<?php echo $code ?>" style="display:none;">
@@ -46,21 +47,19 @@ $helper = Mage::helper('novalnet_payment');
46
  <?php echo $this->__('Basic parameter not valid') . '!' ?>
47
  </div>
48
  <?php else: ?>
49
- <div id="nn_loading">
50
  <img src="<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif" alt="Loading" />
51
  </div>
52
  <iframe frameborder="0" scrolling="no" name="ifm_payment_form_<?php echo $code ?>" id="ifm_payment_form_<?php echo $code ?>"
53
- style="width: 400px; height: 480px; border: none; display: block; margin-top: 5px;" onload="document.getElementById('nn_loading').style.display = 'none'" src="<?php echo Mage::helper('adminhtml')->getUrl('adminhtml/NovalnetSepa/index') ?>" >
54
  </iframe>
55
  <?php endif; ?>
56
  </div>
57
  <input type="hidden" id="original_sepa_customstyle_css" value="<?php echo NOVALNET_SEPA_CUSTOM_CSS; ?>" />
58
- <input type="hidden" id="original_sepa_customstyle_cssval" value="<?php echo NOVALNET_SEPA_CUSTOM_CSS_STYLE; ?>" />
59
- <input type="hidden" name="novalnet_sepa_owner" id="novalnet_sepa_owner" value="" />
60
  <input type="hidden" name="novalnet_sepa_pan_hash" id="novalnet_sepa_pan_hash" value="" />
61
- <input type="hidden" name="novalnet_sepa_unique_id" id="novalnet_sepa_unique_id" value="" />
62
- <input type="hidden" name="novalnet_sepa_mandate_ref" id="novalnet_sepa_mandate_ref" value="" />
63
- <input type="hidden" name="novalnet_sepa_mandate_date" id="novalnet_sepa_mandate_date" value="" />
64
  <input type="hidden" name="novalnet_sepa_iban_confirmed" id="novalnet_sepa_iban_confirmed" value="" />
65
  <input type="hidden" name="novalnet_sepa_field_validator" id="novalnet_sepa_field_validator" value="" />
66
  <!--}}} Novalnet SEPA Form -->
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ include(Mage::getBaseDir('base') . '/novalnet_css_link.php');
27
 
28
  $code = $this->getMethodCode();
29
  $helper = Mage::helper('novalnet_payment');
 
30
  ?>
31
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
32
  <!--{{{ Payment Logo -->
33
+ <div>
34
+ <a HREF="<?php echo $helper->getNovalnetUrl(); ?>" TARGET="_new" style="text-decoration:none;">
35
+ <?php
36
+ $image = "sepa_logo.png";
37
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
38
+ ?>
39
+ <img src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
40
+ </a>
41
+ </div>
42
  <!--}}} Payment Logo -->
43
  <!--{{{ Novalnet SEPA Form -->
44
  <div id="payment_form_<?php echo $code ?>" style="display:none;">
47
  <?php echo $this->__('Basic parameter not valid') . '!' ?>
48
  </div>
49
  <?php else: ?>
50
+ <div id="nnsepa_loading">
51
  <img src="<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif" alt="Loading" />
52
  </div>
53
  <iframe frameborder="0" scrolling="no" name="ifm_payment_form_<?php echo $code ?>" id="ifm_payment_form_<?php echo $code ?>"
54
+ style="width: 400px; height: 580px; border: none; display: block; margin-top: 5px;" onload="novalnet_sepa_iframe(this)" src="<?php echo Mage::helper('adminhtml')->getUrl('adminhtml/NovalnetSepa/index') ?>" >
55
  </iframe>
56
  <?php endif; ?>
57
  </div>
58
  <input type="hidden" id="original_sepa_customstyle_css" value="<?php echo NOVALNET_SEPA_CUSTOM_CSS; ?>" />
59
+ <input type="hidden" id="original_sepa_customstyle_cssval" value="<?php echo NOVALNET_SEPA_CUSTOM_CSS_STYLE; ?>" />
60
+ <input type="hidden" name="novalnet_sepa_owner" id="novalnet_sepa_owner" value="" />
61
  <input type="hidden" name="novalnet_sepa_pan_hash" id="novalnet_sepa_pan_hash" value="" />
62
+ <input type="hidden" name="novalnet_sepa_unique_id" id="novalnet_sepa_unique_id" value="" />
 
 
63
  <input type="hidden" name="novalnet_sepa_iban_confirmed" id="novalnet_sepa_iban_confirmed" value="" />
64
  <input type="hidden" name="novalnet_sepa_field_validator" id="novalnet_sepa_field_validator" value="" />
65
  <!--}}} Novalnet SEPA Form -->
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Sepaform.phtml CHANGED
@@ -27,64 +27,18 @@
27
  <?php
28
  $_code = Novalnet_Payment_Model_Config::NN_SEPA;
29
  ?>
30
- <script type="text/javascript">
31
- function updateHiddenElements(elements) {
32
- var sepa_owner=0;var sepa_accountno=0;var sepa_bankcode=0;var sepa_iban=0;var sepa_swiftbic=0; var sepa_hash=0; var sepa_country=0;
33
- if(document.getElementById("novalnet_sepa_owner").value!= '')sepa_owner=1;
34
- if(document.getElementById("novalnet_sepa_accountno").value!= '')sepa_accountno=1;
35
- if(document.getElementById("novalnet_sepa_bankcode").value!= '')sepa_bankcode=1;
36
- if(document.getElementById("novalnet_sepa_iban").value!= '')sepa_iban=1;
37
- if(document.getElementById("novalnet_sepa_swiftbic").value!= '')sepa_swiftbic=1;
38
- if(document.getElementById("nnsepa_hash").value!= '')sepa_hash=1;
39
- if(document.getElementById("novalnet_sepa_country").value!= '') {
40
- var country = document.getElementById("novalnet_sepa_country");
41
- sepa_country = 1+'-'+country.options[country.selectedIndex].value;
42
- }
43
-
44
- var novalnet_sepa_field_validator = sepa_owner+','+sepa_accountno+','+sepa_bankcode+','+sepa_iban+','+sepa_swiftbic+','+sepa_hash+','+sepa_country;
45
-
46
- for (var i=0; i<elements.length; i++) {
47
- switch (elements[i].name) {
48
- case 'novalnet_sepa_field_validator':
49
- elements[i].value = novalnet_sepa_field_validator;
50
- break;
51
- case 'novalnet_sepa_owner':
52
- elements[i].value = document.getElementById('novalnet_sepa_owner').value;
53
- break;
54
- case 'novalnet_sepa_pan_hash':
55
- elements[i].value = document.getElementById('nnsepa_hash').value;
56
- break;
57
- case 'novalnet_sepa_unique_id':
58
- elements[i].value = document.getElementById('nnsepa_unique_id').value;
59
- break;
60
- case 'novalnet_sepa_mandate_ref':
61
- elements[i].value = document.getElementById('nnsepa_mandate_ref').value;
62
- break;
63
- case 'novalnet_sepa_mandate_date':
64
- elements[i].value = document.getElementById('nnsepa_mandate_date').value;
65
- break;
66
- case 'novalnet_sepa_iban_confirmed':
67
- elements[i].value = document.getElementById('nnsepa_iban_confirmed').value;
68
- break;
69
- }
70
- }
71
- return true;
72
- }
73
- </script>
74
  <!--{{{ Payment Description -->
75
  <ul>
76
  <li style="margin: 0 0 8px;">
77
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('sepatypes') == 'DD_SEPA') {
78
- echo $this->__('Your account will be debited upon delivery of goods.');
79
- } else {
80
- echo $this->__('Please note that your account will be debited after receiving the signed mandate from you.');
81
- }
82
- ?>
83
  </li>
84
  <li style="margin: 0 0 8px;">
85
  <?php echo Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('booking_reference') ?>
86
  </li>
87
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('live_mode', true) == 0): ?>
 
 
 
88
  <li style="margin: 0 0 8px;">
89
  <div style="font-weight:bold;color:red;font-size:12px;">
90
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
27
  <?php
28
  $_code = Novalnet_Payment_Model_Config::NN_SEPA;
29
  ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
30
  <!--{{{ Payment Description -->
31
  <ul>
32
  <li style="margin: 0 0 8px;">
33
+ <?php echo $this->__('Your account will be debited upon delivery of goods.'); ?>
 
 
 
 
 
34
  </li>
35
  <li style="margin: 0 0 8px;">
36
  <?php echo Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('booking_reference') ?>
37
  </li>
38
+ <?php
39
+ if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('live_mode', true)
40
+ == 0):
41
+ ?>
42
  <li style="margin: 0 0 8px;">
43
  <div style="font-weight:bold;color:red;font-size:12px;">
44
  <?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/Sofortueberweisung.phtml CHANGED
@@ -1,27 +1,66 @@
1
- <?php
2
- /**
3
- * Magento
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Open Software License (OSL 3.0)
8
- * that is bundled with this package in the file LICENSE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://opensource.org/licenses/osl-3.0.php
11
- * If you did not receive a copy of the license and are unable to
12
- * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
- *
15
- * Part of the Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- ?>
27
- <?php echo $this->__('Not possible') ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ ?>
27
+ <a name="<?php echo $this->getMethodCode() ?>"></a>
28
+ <?php
29
+ $_code = $this->getMethodCode();
30
+ $helper = Mage::helper('novalnet_payment');
31
+ ?>
32
+ <fieldset class="form-list">
33
+ <!--{{{ Payment Logo -->
34
+ <div>
35
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
+ <?php
37
+ $image = "sofort_Logo.png";
38
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
39
+ ?>
40
+ <img style="height:32px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
41
+ </a>
42
+ </div>
43
+ <!--}}} Payment Logo -->
44
+ <!--{{{ Payment Description -->
45
+ <div>
46
+ <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
47
+ <li>
48
+ <?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
49
+ </li>
50
+ <?php if ($this->getUserInfo()): ?>
51
+ <li>
52
+ <?php echo $this->getUserInfo() ?>
53
+ </li>
54
+ <?php endif; ?>
55
+ <?php if ($this->getMethod()->_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
+ </ul>
63
+ </div>
64
+ <!--}}} Payment Description -->
65
+ <div class="clear"></div>
66
+ </fieldset>
app/design/adminhtml/default/default/template/novalnet/payment/method/form/blank.phtml CHANGED
@@ -26,13 +26,13 @@
26
  ?>
27
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
28
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
29
- <head>
30
- <?php echo $this->getChildHtml('head') ?>
31
- <style>
32
- body {background-color:transparent; background-image:none; text-align:left}
33
- </style>
34
- </head>
35
- <body>
36
- <?php echo $this->getChildHtml('content') ?>
37
- </body>
38
  </html>
26
  ?>
27
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
28
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
29
+ <head>
30
+ <?php echo $this->getChildHtml('head') ?>
31
+ <style>
32
+ body {background-color:transparent; background-image:none; text-align:left}
33
+ </style>
34
+ </head>
35
+ <body>
36
+ <?php echo $this->getChildHtml('content') ?>
37
+ </body>
38
  </html>
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Cc.phtml CHANGED
@@ -24,12 +24,30 @@
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
- <?php if ($_info = $this->getInfo()): ?>
28
- <?php if ($this->getAdditionalData('NnTestOrder'))
29
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!',$this->__('Testorder'),'!</div>' ?>
30
- <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
31
- <?php if ($_info->getLastTransId()!="") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())) ?>
32
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments') ?><br />
33
- <?php else: ?>
34
- <?php echo $this->__('Error in getting payment method') ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
35
  <?php endif; ?>
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
+ <?php
28
+ $_info = $this->getInfo();
29
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
30
+ $helper = Mage::helper('novalnet_payment');
31
+ if ($_info):
32
+ ?>
33
+ <?php
34
+ if ($this->getAdditionalData('NnTestOrder'))
35
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
36
+ ?>
37
+ <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
38
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
39
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('Transaction deactivated successfully') . '<br><br>' ?>
40
+ <?php if ($this->getAdditionalData('refunded_tid')):
41
+ foreach($this->getAdditionalData('refunded_tid') as $key => $value):
42
+ if ($this->getAdditionalData('fullRefund') == true):
43
+ echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
44
+ else:
45
+ echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
46
+ endif;
47
+ endforeach;
48
+ endif;
49
+ ?>
50
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
51
+ <?php else: ?>
52
+ <?php echo $this->__('Error in getting payment method') ?>
53
  <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Ccsecure.phtml DELETED
@@ -1,37 +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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- ?>
27
- <?php if($_info = $this->getInfo()): ?>
28
- <?php if ($this->getAdditionalData('NnTestOrder'))
29
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!',$this->__('Testorder'),'!</div>' ?>
30
- <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
31
- <?php if ($_info->getLastTransId()!="") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())).'<br />' ?>
32
- <?php if ($this->getAdditionalData('NnComments')) { ?>
33
- <?php echo $this->getAdditionalData('NnComments') ?><br />
34
- <?php } ?>
35
- <?php else: ?>
36
- <?php echo $this->__('Error in getting payment method') ?>
37
- <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Elvaustria.phtml DELETED
@@ -1,37 +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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- ?>
27
- <?php if($_info = $this->getInfo()):?>
28
- <?php if ($this->getAdditionalData('NnTestOrder'))
29
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!',$this->__('Testorder'),'!</div>' ?>
30
- <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
31
- <?php if ($_info->getLastTransId()!="") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())).'<br />' ?>
32
- <!--<?php echo $this->__('Account Holder: %s', $this->htmlEscape($this->getAdditionalData('NnAccountHolder'))) ?><br />
33
- <?php echo $this->__('Account Number: %s', $this->htmlEscape($this->getAdditionalData('NnAccountNumber'))) ?><br />
34
- <?php echo $this->__('Bank Sorting Code: %s', $this->htmlEscape($this->getAdditionalData('NnBankSortingCode'))) ?><br />-->
35
- <?php else: ?>
36
- <?php echo $this->__('Error in getting payment method') ?>
37
- <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Elvgerman.phtml DELETED
@@ -1,37 +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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- ?>
27
- <?php if($_info = $this->getInfo()):?>
28
- <?php if ($this->getAdditionalData('NnTestOrder'))
29
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!',$this->__('Testorder'),'!</div>' ?>
30
- <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
31
- <?php if ($_info->getLastTransId()!="") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())).'<br />' ?>
32
- <!--<?php echo $this->__('Account Holder: %s', $this->htmlEscape($this->getAdditionalData('NnAccountHolder'))) ?><br />
33
- <?php echo $this->__('Account Number: %s', $this->htmlEscape($this->getAdditionalData('NnAccountNumber'))) ?><br />
34
- <?php echo $this->__('Bank Sorting Code: %s', $this->htmlEscape($this->getAdditionalData('NnBankSortingCode'))) ?><br />-->
35
- <?php else: ?>
36
- <?php echo $this->__('Error in getting payment method') ?>
37
- <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Ideal.phtml CHANGED
@@ -24,14 +24,16 @@
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
- <?php if($_info = $this->getInfo()): ?>
28
- <?php if ($this->getAdditionalData('NnTestOrder'))
29
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!',$this->__('Testorder'),'!</div>' ?>
30
- <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
31
- <?php if ($_info->getLastTransId()!="") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())).'<br />' ?>
32
- <?php if ($this->getAdditionalData('NnComments')) { ?>
33
- <?php echo $this->getAdditionalData('NnComments') ?><br />
34
- <?php } ?>
 
 
35
  <?php else: ?>
36
- <?php echo $this->__('Error in getting payment method'); ?>
37
  <?php endif; ?>
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
+ <?php if ($_info = $this->getInfo()): ?>
28
+ <?php
29
+ if ($this->getAdditionalData('NnTestOrder'))
30
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
31
+ ?>
32
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
33
+ <?php if ($_info->getLastTransId() != "") echo $this->__('Novalnet Transaction ID: %s', $this->htmlEscape($_info->getLastTransId())) . '<br />' ?>
34
+ <?php if ($this->getAdditionalData('NnComments')) { ?>
35
+ <?php echo $this->getAdditionalData('NnComments') ?><br />
36
+ <?php } ?>
37
  <?php else: ?>
38
+ <?php echo $this->__('Error in getting payment method'); ?>
39
  <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Invoice.phtml CHANGED
@@ -13,28 +13,61 @@
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * Part of the Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
- *
21
  * @category Mage
22
  * @package Mage_Novalnet
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
 
 
26
  ?>
27
- <?php if($_info = $this->getInfo()):?>
28
- <?php if ($this->getAdditionalData('NnTestOrder'))
29
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!',$this->__('Testorder'),'!</div>' ?>
30
- <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
31
- <?php if ($_info->getLastTransId()!="") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())) ?>
32
- <?php if (strlen($this->getAdditionalData('NnComments'))) { echo '<br>', nl2br($this->getAdditionalData('NnComments')); } ?>
33
- <?php if (strlen($this->getAdditionalData('NnNote'))) { echo '<br>', nl2br($this->getAdditionalData('NnNote')); } ?>
34
- <?php if (strlen($this->getAdditionalData('NnNoteAmount'))) { echo nl2br($this->getAdditionalData('NnNoteAmount')); } ?>
35
- <?php if (strlen($this->getAdditionalData('NnNoteTID'))) { echo nl2br($this->getAdditionalData('NnNoteTID')); } ?>
36
- <?php if (strlen($this->getAdditionalData('NnNoteTransfer'))) { echo nl2br($this->getAdditionalData('NnNoteTransfer')); } ?>
37
- <?php if (strlen($this->getAdditionalData('NnScript'))) { echo '<br>', nl2br($this->getAdditionalData('NnScript')); } ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
38
  <?php else: ?>
39
- <?php echo $this->__('Error in getting payment method') ?>
40
  <?php endif; ?>
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
+ *
21
  * @category Mage
22
  * @package Mage_Novalnet
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
+ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
  ?>
31
+ <?php if ($_info): ?>
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->getPaymentMethod()) ?><br />
37
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
38
+ <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('Transaction deactivated successfully') . '<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 '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
43
+ else:
44
+ echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
45
+ endif;
46
+ endforeach;
47
+ endif;
48
+ ?>
49
+ <?php if (!preg_match("/creditmemo|shipment|callback_novalnet2magento/i", $currentUrl)) { ?>
50
+ <?php
51
+ if (strlen($this->getAdditionalData('NnNote'))) {
52
+ echo ($this->getAdditionalData('NnNote'));
53
+ }
54
+ ?>
55
+ <?php
56
+ if (strlen($this->getAdditionalData('NnNoteAmount'))) {
57
+ echo nl2br($this->getAdditionalData('NnNoteAmount'));
58
+ }
59
+ ?>
60
+ <?php
61
+ if (strlen($this->getAdditionalData('NnNoteTID'))) {
62
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
63
+ }
64
+ ?>
65
+ <?php
66
+ if (strlen($this->getAdditionalData('NnComments'))) {
67
+ echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
68
+ }
69
+ ?>
70
+ <?php } ?>
71
  <?php else: ?>
72
+ <?php echo $this->__('Error in getting payment method') ?>
73
  <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Paypal.phtml CHANGED
@@ -24,14 +24,16 @@
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
- <?php if($_info = $this->getInfo()): ?>
28
- <?php if ($this->getAdditionalData('NnTestOrder'))
29
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!',$this->__('Testorder'),'!</div>' ?>
30
- <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
31
- <?php if ($_info->getLastTransId()!="") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())).'<br />' ?>
32
- <?php if ($this->getAdditionalData('NnComments')) { ?>
33
- <?php echo $this->getAdditionalData('NnComments') ?><br />
34
- <?php } ?>
 
 
35
  <?php else: ?>
36
- <?php echo $this->__('Error in getting payment method'); ?>
37
  <?php endif; ?>
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
+ <?php if ($_info = $this->getInfo()): ?>
28
+ <?php
29
+ if ($this->getAdditionalData('NnTestOrder'))
30
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
31
+ ?>
32
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
33
+ <?php if ($_info->getLastTransId() != "") echo $this->__('Novalnet Transaction ID: %s', $this->htmlEscape($_info->getLastTransId())) . '<br />' ?>
34
+ <?php if ($this->getAdditionalData('NnComments')) { ?>
35
+ <?php echo $this->getAdditionalData('NnComments') ?><br />
36
+ <?php } ?>
37
  <?php else: ?>
38
+ <?php echo $this->__('Error in getting payment method'); ?>
39
  <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Phonepayment.phtml CHANGED
@@ -24,14 +24,16 @@
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
- <?php if($_info = $this->getInfo()):?>
28
- <?php if ($this->getAdditionalData('NnTestOrder'))
29
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!',$this->__('Testorder'),'!</div>' ?>
 
 
30
  <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
31
- <?php if ($_info->getLastTransId()!="") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())).'<br />' ?>
32
  <?php if ($this->getAdditionalData('NnComments')) { ?>
33
- <?php echo $this->getAdditionalData('NnComments') ?><br />
34
- <?php } ?>
35
  <?php else: ?>
36
  <?php echo $this->__('Error in getting payment method') ?>
37
  <?php endif; ?>
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
+ <?php if ($_info = $this->getInfo()): ?>
28
+ <?php
29
+ if ($this->getAdditionalData('NnTestOrder'))
30
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
31
+ ?>
32
  <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
33
+ <?php if ($_info->getLastTransId() != "") echo $this->__('Novalnet Transaction ID: %s', $this->htmlEscape($_info->getLastTransId())) . '<br />' ?>
34
  <?php if ($this->getAdditionalData('NnComments')) { ?>
35
+ <?php echo $this->getAdditionalData('NnComments') ?><br />
36
+ <?php } ?>
37
  <?php else: ?>
38
  <?php echo $this->__('Error in getting payment method') ?>
39
  <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Prepayment.phtml CHANGED
@@ -13,28 +13,61 @@
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * Part of the Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
- *
21
  * @category Mage
22
  * @package Mage_Novalnet
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
 
 
26
  ?>
27
- <?php if($_info = $this->getInfo()):?>
28
- <?php if ($this->getAdditionalData('NnTestOrder'))
29
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!',$this->__('Testorder'),'!</div>' ?>
30
- <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
31
- <?php if ($_info->getLastTransId()!="") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())) ?>
32
- <?php if (strlen($this->getAdditionalData('NnComments'))) { echo '<br>', nl2br($this->getAdditionalData('NnComments')); } ?>
33
- <?php if (strlen($this->getAdditionalData('NnNote'))) { echo '<br>', nl2br($this->getAdditionalData('NnNote')); } ?>
34
- <?php if (strlen($this->getAdditionalData('NnNoteAmount'))) { echo nl2br($this->getAdditionalData('NnNoteAmount')); } ?>
35
- <?php if (strlen($this->getAdditionalData('NnNoteTID'))) { echo nl2br($this->getAdditionalData('NnNoteTID')); } ?>
36
- <?php if (strlen($this->getAdditionalData('NnNoteTransfer'))) { echo nl2br($this->getAdditionalData('NnNoteTransfer')); } ?>
37
- <?php if (strlen($this->getAdditionalData('NnScript'))) { echo '<br>', nl2br($this->getAdditionalData('NnScript')); } ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
38
  <?php else: ?>
39
- <?php echo $this->__('Error in getting payment method') ?>
40
  <?php endif; ?>
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
+ *
21
  * @category Mage
22
  * @package Mage_Novalnet
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
+ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
  ?>
31
+ <?php if ($_info): ?>
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->getPaymentMethod()) ?><br />
37
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
38
+ <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('Transaction deactivated successfully') . '<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 '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
43
+ else:
44
+ echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
45
+ endif;
46
+ endforeach;
47
+ endif;
48
+ ?>
49
+ <?php if (!preg_match("/invoice|creditmemo|shipment|callback_novalnet2magento/i", $currentUrl)) { ?>
50
+ <?php
51
+ if (strlen($this->getAdditionalData('NnNote'))) {
52
+ echo ($this->getAdditionalData('NnNote'));
53
+ }
54
+ ?>
55
+ <?php
56
+ if (strlen($this->getAdditionalData('NnNoteAmount'))) {
57
+ echo nl2br($this->getAdditionalData('NnNoteAmount'));
58
+ }
59
+ ?>
60
+ <?php
61
+ if (strlen($this->getAdditionalData('NnNoteTID'))) {
62
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
63
+ }
64
+ ?>
65
+ <?php
66
+ if (strlen($this->getAdditionalData('NnComments'))) {
67
+ echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
68
+ }
69
+ ?>
70
+ <?php } ?>
71
  <?php else: ?>
72
+ <?php echo $this->__('Error in getting payment method') ?>
73
  <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Safetypay.phtml DELETED
@@ -1,37 +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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- ?>
27
- <?php if($_info = $this->getInfo()): ?>
28
- <?php if ($this->getAdditionalData('NnTestOrder'))
29
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!',$this->__('Testorder'),'!</div>' ?>
30
- <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
31
- <?php if ($_info->getLastTransId()!="") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())).'<br />' ?>
32
- <?php if ($this->getAdditionalData('NnComments')) { ?>
33
- <?php echo $this->getAdditionalData('NnComments') ?><br />
34
- <?php } ?>
35
- <?php else: ?>
36
- <?php echo $this->__('Error in getting payment method'); ?>
37
- <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Sepa.phtml CHANGED
@@ -13,11 +13,11 @@
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * Part of the Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
- *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
  * @copyright Novalnet AG
@@ -26,14 +26,30 @@
26
  ?>
27
  <?php
28
  $_info = $this->getInfo();
29
- if ($_info): ?>
30
- <?php if ($this->getAdditionalData('NnTestOrder'))
31
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!',$this->__('Testorder'),'!</div>' ?>
32
- <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
33
- <?php if ($_info->getLastTransId()!="") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())).'<br />'; ?>
34
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments') ?>
35
- <?php if ($this->getAdditionalData('NnSepaDueDate')) echo $this->__('Mandate Signature Date : '). $this->getAdditionalData('NnSepaDueDate') ?><br />
36
- <?php if ($_info->getLastTransId()!="" && $this->getAdditionalData('NnSepaMandateUrl')) echo $this->__('Download your mandate').'<a href="'.$this->getAdditionalData('NnSepaMandateUrl').'">'.$this->__('Click here').'</a>'; ?>
37
- <?php else: ?>
38
- <?php echo $this->__('Error in getting payment method') ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
39
  <?php endif; ?>
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
+ *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
  * @copyright Novalnet AG
26
  ?>
27
  <?php
28
  $_info = $this->getInfo();
29
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
30
+ $helper = Mage::helper('novalnet_payment');
31
+ if ($_info):
32
+ ?>
33
+ <?php
34
+ if ($this->getAdditionalData('NnTestOrder'))
35
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
36
+ ?>
37
+ <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
38
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
39
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('Transaction deactivated successfully') . '<br><br>' ?>
40
+ <?php if ($this->getAdditionalData('refunded_tid')):
41
+ foreach($this->getAdditionalData('refunded_tid') as $key => $value):
42
+ if ($this->getAdditionalData('fullRefund') == true):
43
+ echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
44
+ elseif(preg_match("/refund/i", $value['reftid'])):
45
+ echo $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br><br>';
46
+ else:
47
+ 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>';
48
+ endif;
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/info/Sofortueberweisung.phtml CHANGED
@@ -24,14 +24,16 @@
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
- <?php if($_info = $this->getInfo()): ?>
28
- <?php if ($this->getAdditionalData('NnTestOrder'))
29
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!',$this->__('Testorder'),'!</div>' ?>
30
- <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
31
- <?php if ($_info->getLastTransId()!="") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())).'<br />' ?>
32
- <?php if ($this->getAdditionalData('NnComments')) { ?>
33
- <?php echo $this->getAdditionalData('NnComments') ?><br />
34
- <?php } ?>
 
 
35
  <?php else: ?>
36
- <?php echo $this->__('Error in getting payment method'); ?>
37
  <?php endif; ?>
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
+ <?php if ($_info = $this->getInfo()): ?>
28
+ <?php
29
+ if ($this->getAdditionalData('NnTestOrder'))
30
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
31
+ ?>
32
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
33
+ <?php if ($_info->getLastTransId() != "") echo $this->__('Novalnet Transaction ID: %s', $this->htmlEscape($_info->getLastTransId())) . '<br />' ?>
34
+ <?php if ($this->getAdditionalData('NnComments')) { ?>
35
+ <?php echo $this->getAdditionalData('NnComments') ?><br />
36
+ <?php } ?>
37
  <?php else: ?>
38
+ <?php echo $this->__('Error in getting payment method'); ?>
39
  <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Cc.phtml CHANGED
@@ -23,7 +23,21 @@
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
 
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
- <strong><?php echo Mage::helper('novalnet_payment')->__('%s',$this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
- <?php echo Mage::helper('novalnet_payment')->__('TID: %s',$this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
 
 
 
 
 
 
 
 
 
 
 
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
  ?>
30
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
31
+ <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
32
+ <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br>'; ?>{{pdf_row_separator}}
33
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('Transaction deactivated successfully') . '<br><br>' ?>{{pdf_row_separator}}
34
+ <?php if ($this->getAdditionalData('refunded_tid')):
35
+ foreach($this->getAdditionalData('refunded_tid') as $key => $value):
36
+ if ($this->getAdditionalData('fullRefund') == true):
37
+ echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
38
+ else:
39
+ echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
40
+ endif;
41
+ endforeach;
42
+ endif;
43
+ ?>{{pdf_row_separator}}
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Ideal.phtml CHANGED
@@ -25,5 +25,5 @@
25
  */
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
- <strong><?php echo Mage::helper('novalnet_payment')->__('%s',$this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
- <?php echo Mage::helper('novalnet_payment')->__('TID: %s',$this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
25
  */
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
+ <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
+ <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Invoice.phtml CHANGED
@@ -23,13 +23,44 @@
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
 
 
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
- <strong><?php echo Mage::helper('novalnet_payment')->__('%s',$this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
- <?php echo Mage::helper('novalnet_payment')->__('TID: %s',$this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
30
- <?php if (strlen($this->getAdditionalData('NnComments'))) { echo $this->getAdditionalData('NnComments'); } ?>{{pdf_row_separator}}
31
- <?php if (strlen($this->getAdditionalData('NnNote'))) { echo $this->getAdditionalData('NnNote'); } ?>{{pdf_row_separator}}
32
- <?php if (strlen($this->getAdditionalData('NnNoteAmount'))) { echo $this->getAdditionalData('NnNoteAmount'); } ?>{{pdf_row_separator}}
33
- <?php if (strlen($this->getAdditionalData('NnNoteTID'))) { echo $this->getAdditionalData('NnNoteTID'); } ?>{{pdf_row_separator}}
34
- <?php if (strlen($this->getAdditionalData('NnNoteTransfer'))) { echo $this->getAdditionalData('NnNoteTransfer'); } ?>{{pdf_row_separator}}
35
- <?php if (strlen($this->getAdditionalData('NnScript'))) { echo $this->getAdditionalData('NnScript'); } ?>{{pdf_row_separator}}
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
+ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
  ?>
31
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
32
+ <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
33
+ <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br>'; ?>{{pdf_row_separator}}
34
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('Transaction deactivated successfully') ?>{{pdf_row_separator}}
35
+ <?php if ($this->getAdditionalData('refunded_tid')):
36
+ foreach($this->getAdditionalData('refunded_tid') as $key => $value):
37
+ if ($this->getAdditionalData('fullRefund') == true):
38
+ echo '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
39
+ else:
40
+ echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
41
+ endif;
42
+ endforeach;
43
+ endif;
44
+ ?>{{pdf_row_separator}}
45
+ <?php if (!preg_match("/creditmemo|shipment|callback_novalnet2magento/i", $currentUrl)) { ?>
46
+ <?php
47
+ if (strlen($this->getAdditionalData('NnNote'))) {
48
+ echo $this->getAdditionalData('NnNote');
49
+ }
50
+ ?>{{pdf_row_separator}}
51
+ <?php
52
+ if (strlen($this->getAdditionalData('NnNoteAmount'))) {
53
+ echo $this->getAdditionalData('NnNoteAmount');
54
+ }
55
+ ?>{{pdf_row_separator}}
56
+ <?php
57
+ if (strlen($this->getAdditionalData('NnNoteTID'))) {
58
+ echo $this->getAdditionalData('NnNoteTID');
59
+ }
60
+ ?>{{pdf_row_separator}}
61
+ <?php
62
+ if (strlen($this->getAdditionalData('NnComments'))) {
63
+ echo $this->getAdditionalData('NnComments');
64
+ }
65
+ ?>{{pdf_row_separator}}
66
+ <?php } ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Paypal.phtml CHANGED
@@ -25,6 +25,10 @@
25
  */
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
- <strong><?php echo Mage::helper('novalnet_payment')->__('%s',$this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
- <?php echo Mage::helper('novalnet_payment')->__('TID: %s',$this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
30
- <?php if (strlen($this->getAdditionalData('NnComments'))) { echo $this->getAdditionalData('NnComments'); } ?>{{pdf_row_separator}}
 
 
 
 
25
  */
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
+ <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
+ <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
30
+ <?php
31
+ if (strlen($this->getAdditionalData('NnComments'))) {
32
+ echo $this->getAdditionalData('NnComments');
33
+ }
34
+ ?>{{pdf_row_separator}}
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Phonepayment.phtml CHANGED
@@ -25,5 +25,5 @@
25
  */
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
- <strong><?php echo Mage::helper('novalnet_payment')->__('%s',$this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
- <?php echo Mage::helper('novalnet_payment')->__('TID: %s',$this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
25
  */
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
+ <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
+ <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Prepayment.phtml CHANGED
@@ -23,13 +23,44 @@
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
 
 
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
- <strong><?php echo Mage::helper('novalnet_payment')->__('%s',$this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
- <?php echo Mage::helper('novalnet_payment')->__('TID: %s',$this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
30
- <?php if (strlen($this->getAdditionalData('NnComments'))) { echo $this->getAdditionalData('NnComments'); } ?>{{pdf_row_separator}}
31
- <?php if (strlen($this->getAdditionalData('NnNote'))) { echo $this->getAdditionalData('NnNote'); } ?>{{pdf_row_separator}}
32
- <?php if (strlen($this->getAdditionalData('NnNoteAmount'))) { echo $this->getAdditionalData('NnNoteAmount'); } ?>{{pdf_row_separator}}
33
- <?php if (strlen($this->getAdditionalData('NnNoteTID'))) { echo $this->getAdditionalData('NnNoteTID'); } ?>{{pdf_row_separator}}
34
- <?php if (strlen($this->getAdditionalData('NnNoteTransfer'))) { echo $this->getAdditionalData('NnNoteTransfer'); } ?>{{pdf_row_separator}}
35
- <?php if (strlen($this->getAdditionalData('NnScript'))) { echo $this->getAdditionalData('NnScript'); } ?>{{pdf_row_separator}}
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
+ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
  ?>
31
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
32
+ <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
33
+ <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br>'; ?>{{pdf_row_separator}}
34
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('Transaction deactivated successfully') ?>{{pdf_row_separator}}
35
+ <?php if ($this->getAdditionalData('refunded_tid')):
36
+ foreach($this->getAdditionalData('refunded_tid') as $key => $value):
37
+ if ($this->getAdditionalData('fullRefund') == true):
38
+ echo '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
39
+ else:
40
+ echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
41
+ endif;
42
+ endforeach;
43
+ endif;
44
+ ?>{{pdf_row_separator}}
45
+ <?php if (!preg_match("/invoice|creditmemo|shipment|callback_novalnet2magento/i", $currentUrl)) { ?>
46
+ <?php
47
+ if (strlen($this->getAdditionalData('NnNote'))) {
48
+ echo $this->getAdditionalData('NnNote');
49
+ }
50
+ ?>{{pdf_row_separator}}
51
+ <?php
52
+ if (strlen($this->getAdditionalData('NnNoteAmount'))) {
53
+ echo $this->getAdditionalData('NnNoteAmount');
54
+ }
55
+ ?>{{pdf_row_separator}}
56
+ <?php
57
+ if (strlen($this->getAdditionalData('NnNoteTID'))) {
58
+ echo $this->getAdditionalData('NnNoteTID');
59
+ }
60
+ ?>{{pdf_row_separator}}
61
+ <?php
62
+ if (strlen($this->getAdditionalData('NnComments'))) {
63
+ echo $this->getAdditionalData('NnComments');
64
+ }
65
+ ?>{{pdf_row_separator}}
66
+ <?php } ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Sepa.phtml CHANGED
@@ -13,21 +13,33 @@
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * Part of the Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
- *
21
  * @category Mage
22
  * @package Mage_Novalnet
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
- ?>
27
- <?php
28
  $_info = $this->getInfo();
 
 
29
  ?>
30
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
31
- <strong><?php echo Mage::helper('novalnet_payment')->__('%s',$this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
32
- <?php echo Mage::helper('novalnet_payment')->__('TID: %s',$this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
33
- <?php if ($this->getAdditionalData('NnSepaDueDate')) echo $this->__('Mandate Signature Date : '). $this->getAdditionalData('NnSepaDueDate') ?>{{pdf_row_separator}}
 
 
 
 
 
 
 
 
 
 
 
 
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
+ *
21
  * @category Mage
22
  * @package Mage_Novalnet
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
26
  $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
  ?>
30
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
31
+ <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
32
+ <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br>'; ?>{{pdf_row_separator}}
33
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('Transaction deactivated successfully') . '<br><br>' ?>{{pdf_row_separator}}
34
+ <?php if ($this->getAdditionalData('refunded_tid')):
35
+ foreach($this->getAdditionalData('refunded_tid') as $key => $value):
36
+ if ($this->getAdditionalData('fullRefund') == true):
37
+ echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
38
+ elseif(preg_match("/refund/i", $value['reftid'])):
39
+ echo $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br><br>';
40
+ else:
41
+ 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>';
42
+ endif;
43
+ endforeach;
44
+ endif;
45
+ ?>{{pdf_row_separator}}
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Sofortueberweisung.phtml CHANGED
@@ -25,5 +25,5 @@
25
  */
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
- <strong><?php echo Mage::helper('novalnet_payment')->__('%s',$this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
- <?php echo Mage::helper('novalnet_payment')->__('TID: %s',$this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
25
  */
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
+ <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
+ <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
app/design/adminhtml/default/default/template/novalnet/sales/order/{view/tab/transactionoverview.phtml → transactionoverview.phtml} RENAMED
@@ -23,6 +23,8 @@
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
26
  $transactioOverviewCollection = $this->getTransactionOverview();
27
  $i = 1;
28
  foreach ($transactioOverviewCollection as $transactioOverviewId => $data) {
@@ -148,7 +150,4 @@ foreach ($transactioOverviewCollection as $transactioOverviewId => $data) {
148
  </div>
149
  </div>
150
  </div>
151
- <?php
152
- }
153
-
154
- ?>
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ ?>
27
+ <?php
28
  $transactioOverviewCollection = $this->getTransactionOverview();
29
  $i = 1;
30
  foreach ($transactioOverviewCollection as $transactioOverviewId => $data) {
150
  </div>
151
  </div>
152
  </div>
153
+ <?php } ?>
 
 
 
app/design/adminhtml/default/default/template/novalnet/sales/order/view/info.phtml DELETED
@@ -1,165 +0,0 @@
1
- <?php
2
- /**
3
- * Magento
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Academic Free License (AFL 3.0)
8
- * that is bundled with this package in the file LICENSE_AFL.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://opensource.org/licenses/afl-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 design
22
- * @package default_default
23
- * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
- */
26
- ?>
27
- <?php /** @var $this Mage_Adminhtml_Block_Sales_Order_View_Tab_Info */ ?>
28
- <?php $_order = $this->getOrder();
29
- $payment = $_order->getPayment();
30
- ?>
31
- <div>
32
- <div id="order-messages">
33
- <?php echo $this->getChildHtml('order_messages') ?>
34
- </div>
35
- <?php echo $this->getChildHtml('order_info') ?>
36
- <input type="hidden" name="order_id" value="<?php echo $_order->getId() ?>"/>
37
- <?php if ($_order->getIsVirtual()): ?>
38
- <div class="box-right">
39
- <?php else: ?>
40
- <div class="box-left">
41
- <?php endif; ?>
42
- <!--Payment Method-->
43
- <div class="entry-edit">
44
- <div class="entry-edit-head">
45
- <h4 class="icon-head head-payment-method"><?php echo Mage::helper('sales')->__('Payment Information') ?></h4>
46
- </div>
47
- <fieldset>
48
- <?php echo $this->getPaymentHtml() ?>
49
- <div><?php echo Mage::helper('sales')->__('Order was placed using %s', $_order->getOrderCurrencyCode()) ?></div>
50
- </fieldset>
51
- </div>
52
- <?php if (Mage::helper('novalnet_payment')->getAdditionalData($payment,'NnSepaSigned')): ?>
53
- <div class="entry-edit">
54
- <div class="entry-edit-head">
55
- <h4 class="icon-head head-products"><?php echo Mage::helper('sales')->__('Novalnet Mandate confirmed') ?></h4>
56
- </div>
57
- <fieldset>
58
- <br />
59
- <div><?php echo $this->__('Mandate Signature Date') ?>:&nbsp;<input class="validate-date required-entry" type="text" id="sepa_mandate_sign" name="sepa_mandate_sign" value="" style="width:6em" /> &nbsp;&nbsp;
60
- <button type="button" title="<?php echo $this->__('SEPA Mandate Sign') ?>" class="button" onclick="sepa_action('<?php echo Mage::helper('adminhtml')->getUrl('*/*/sepasigned',array('order_id' => $_order->getId())) ?>');"><span><span><?php echo $this->__('SEPA Mandate Sign') ?></span></span></button><br /><br />
61
- <?php echo $this->__('Enter Mandate signature date in the format of YYYY-MM-DD') ?>
62
- </div>
63
- <br />
64
- </fieldset>
65
- </div>
66
- <?php endif; ?>
67
- </div>
68
- <?php if (!$_order->getIsVirtual()): ?>
69
- <div class="box-right">
70
- <!--Shipping Method-->
71
- <div class="entry-edit">
72
- <div class="entry-edit-head">
73
- <h4 class="icon-head head-shipping-method"><?php echo Mage::helper('sales')->__('Shipping &amp; Handling Information') ?></h4>
74
- </div>
75
- <fieldset>
76
- <?php if ($_order->getTracksCollection()->count()) : ?>
77
- <a href="#" id="linkId" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_order) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?php echo $this->__('Track Order') ?>"><?php echo $this->__('Track Order') ?></a>
78
- <br/>
79
- <?php endif; ?>
80
- <?php if ($_order->getShippingDescription()): ?>
81
- <strong><?php echo $this->escapeHtml($_order->getShippingDescription()) ?></strong>
82
-
83
- <?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
84
- <?php $_excl = $this->displayShippingPriceInclTax($_order); ?>
85
- <?php else: ?>
86
- <?php $_excl = $this->displayPriceAttribute('shipping_amount', false, ' '); ?>
87
- <?php endif; ?>
88
- <?php $_incl = $this->displayShippingPriceInclTax($_order); ?>
89
-
90
- <?php echo $_excl; ?>
91
- <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
92
- (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
93
- <?php endif; ?>
94
- <?php else: ?>
95
- <?php echo $this->helper('sales')->__('No shipping information available'); ?>
96
- <?php endif; ?>
97
- </fieldset>
98
- </div>
99
- </div>
100
- <?php endif; ?>
101
- <div class="clear"></div>
102
- <?php echo $this->getGiftOptionsHtml() ?>
103
- <div class="clear"></div>
104
- <div class="entry-edit">
105
- <div class="entry-edit-head">
106
- <h4 class="icon-head head-products"><?php echo Mage::helper('sales')->__('Items Ordered') ?></h4>
107
- </div>
108
- </div>
109
- <?php echo $this->getItemsHtml() ?>
110
- <div class="clear"></div>
111
-
112
- <div class="box-left">
113
- <div class="entry-edit">
114
- <div class="entry-edit-head">
115
- <h4><?php echo Mage::helper('sales')->__('Comments History') ?></h4>
116
- </div>
117
- <fieldset><?php echo $this->getChildHtml('order_history') ?></fieldset>
118
- </div>
119
- </div>
120
- <div class="box-right entry-edit">
121
- <div class="entry-edit-head"><h4><?php echo Mage::helper('sales')->__('Order Totals') ?></h4></div>
122
- <div class="order-totals"><?php echo $this->getChildHtml('order_totals') ?></div>
123
- </div>
124
- <div class="clear"></div>
125
- </div>
126
-
127
- <?php echo $this->getChildHtml('popup_window');?>
128
- <script type="text/javascript">
129
- //<![CDATA[
130
- /**
131
- * Retrieve gift options tooltip content
132
- */
133
- function getGiftOptionsTooltipContent(itemId) {
134
- var contentLines = [];
135
- var headerLine = null;
136
- var contentLine = null;
137
-
138
- $$('#gift_options_data_' + itemId + ' .gift-options-tooltip-content').each(function (element) {
139
- if (element.down(0)) {
140
- headerLine = element.down(0).innerHTML;
141
- contentLine = element.down(0).next().innerHTML;
142
- if (contentLine.length > 30) {
143
- contentLine = contentLine.slice(0,30) + '...';
144
- }
145
- contentLines.push(headerLine + ' ' + contentLine);
146
- }
147
- });
148
- return contentLines.join('<br/>');
149
- }
150
- giftOptionsTooltip.setTooltipContentLoaderFunction(getGiftOptionsTooltipContent);
151
-
152
- function sepa_action(url)
153
- {
154
- var date = document.getElementById('sepa_mandate_sign').value;
155
-
156
- if(date.match(/^[0-9]{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])/)) {
157
- window.location.href = url + "sepa_date/" + date;
158
- } else {
159
- Translator.add('Mandate signature date is invalid', '<?php echo $this->__('Mandate signature date is invalid'); ?>');
160
- alert(Translator.translate('Mandate signature date is invalid'));
161
- }
162
- return false;
163
- }
164
- //]]>
165
- </script>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/novalnet/sales/order/view/tab/info.phtml DELETED
@@ -1,16 +0,0 @@
1
- <div class="clear"></div>
2
- <div class="box-left">
3
- <div class="entry-edit">
4
- <div class="entry-edit-head">
5
- <h4 class="icon-head head-products"><?php echo Mage::helper('sales')->__('SEPA Mandate Signed') ?></h4>
6
- </div>
7
- </div>
8
- <div class="grid np">
9
- <fieldset>
10
- <br />
11
- <div><?php echo $this->__('Date') ?>:&nbsp;<input class="input-text no-changes required-entry" type="text" id="sepa_mandate_sign" name="sepa_mandate_sign" value="<?php echo $this->getFilter('report_from') ?>" style="width:5em" /> &nbsp;&nbsp;
12
- <button style="" onclick="setLocation('')" class="scalable go" type="button" title="SEPA Mandate Signed" id="id_b4e98b73dc3651d37e7548172e49c4d4"><span><span><span>Mandate Signed</span></span></span></button>
13
- </div>
14
- <br />
15
- </fieldset>
16
- </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/novalnet/transaction/overview/view/form.phtml CHANGED
@@ -23,9 +23,8 @@
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
- //$data = $this->getTransaction();
27
- $data = $this->getNovalnetTransactionOverview();
28
  ?>
 
29
  <div class="content-header">
30
  <table cellspacing="0">
31
  <tr>
@@ -39,147 +38,147 @@ $data = $this->getNovalnetTransactionOverview();
39
  <input type="hidden" name="order_id" value="<?php echo $data->getOrderId() ?>"/>
40
 
41
  <div class="box-left">
42
- <!--Novalnet Order Information-->
43
- <div class="entry-edit">
44
- <div class="entry-edit-head">
45
- <h4 class="icon-head head-payment-method"><?php echo Mage::helper('novalnet_payment')->__('Novalnet Order Information') ?></h4>
46
- </div>
47
- <div class="fieldset">
48
- <table cellspacing="0" class="form-list">
49
- <tr>
50
- <td class="label">
51
- <label><?php echo $this->helper('novalnet_payment')->__('Store-ID') ?></label>
52
- </td>
53
- <td class="label">
54
- <strong><?php echo $data->getStoreId() ?></strong>
55
- </td>
56
- </tr>
57
- <tr>
58
- <td class="label">
59
- <label><?php echo $this->helper('novalnet_payment')->__('Order-ID') ?></label>
60
- </td>
61
- <td class="label">
62
- <?php
63
- $orderViewId = Mage::getModel('sales/order')->loadByIncrementId($data->getOrderId())->getId();
64
- $orderViewUrl = Mage::helper('adminhtml')->getUrl('adminhtml/sales_order/view', array('order_id' => $orderViewId));
65
- ?>
66
- <strong><a href="<?php echo $orderViewUrl ?>"><?php echo $data->getOrderId() ?></a></strong>
67
- </td>
68
- </tr>
69
- <tr>
70
- <td class="label">
71
- <label><?php echo $this->helper('novalnet_payment')->__('Tranaction-ID') ?></label>
72
- </td>
73
- <td class="label">
74
- <strong><?php echo $data->getTransactionId() ?></strong>
75
- </td>
76
- </tr>
77
- <tr>
78
- <td class="label">
79
- <label><?php echo $this->helper('novalnet_payment')->__('Customer-ID') ?></label>
80
- </td>
81
- <td class="label">
82
- <strong><?php echo $data->getCustomerId() ?></strong>
83
- </td>
84
- </tr>
85
- <tr>
86
- <td class="label">
87
- <label><?php echo $this->helper('novalnet_payment')->__('Payment Name') ?></label>
88
- </td>
89
- <td class="label">
90
- <strong><?php echo $this->getPaymentTitle() ?></strong>
91
- </td>
92
- </tr>
93
- </table>
94
- </div>
95
- </div>
96
  </div>
97
 
98
 
99
  <div class="box-right">
100
- <!--Novalnet Order Shop Information-->
101
- <div class="entry-edit">
102
- <div class="entry-edit-head">
103
- <h4 class="icon-head head-payment-method"><?php echo Mage::helper('novalnet_payment')->__('Novalnet Shop Information') ?></h4>
104
- </div>
105
- <div class="fieldset">
106
- <table cellspacing="0" class="form-list" width="100%">
107
- <tr>
108
- <td class="label">
109
- <label><?php echo $this->helper('novalnet_payment')->__('Shop URL') ?></label>
110
- </td>
111
- <td style="word-break:break-word;">
112
- <strong><?php echo $data->getShopUrl() ?></strong>
113
- </td>
114
- </tr>
115
- </table>
116
- </div>
117
- </div>
118
  </div>
119
 
120
  <div class="box-right">
121
- <!--Novalnet Order Additional Information-->
122
- <div class="entry-edit">
123
- <div class="entry-edit-head">
124
- <h4 class="icon-head head-payment-method"><?php echo Mage::helper('novalnet_payment')->__('Novalnet Additional Information') ?></h4>
125
- </div>
126
- <div class="fieldset">
127
- <table cellspacing="0" class="form-list">
128
- <tr>
129
- <td class="label">
130
- <label><?php echo $this->helper('novalnet_payment')->__('Additional Data') ?></label>
131
- </td>
132
- <td style="word-break:break-word;">
133
- <strong><?php echo $data->getAdditionalData() ?></strong>
134
- </td>
135
- </tr>
136
- </table>
137
- </div>
138
- </div>
139
  </div>
140
  <!-- Novalnet API Data -->
141
  <div class="box-left" style="clear:both;">
142
- <div class="entry-edit">
143
- <div class="entry-edit-head">
144
- <h4 class="icon-head head-payment-method"><?php echo Mage::helper('novalnet_payment')->__('Novalnet Request Data') ?></h4>
145
- </div>
146
- <div class="fieldset">
147
- <table cellspacing="0" class="form-list" width="100%">
148
- <tr>
149
- <td class="label">
150
- <label><?php echo $this->helper('novalnet_payment')->__('Request Data') ?></label><br>
151
- <div style="height:250px;overflow:scroll;width:600px;"><strong><?php
152
 
153
- $getrequestData = unserialize($data->getRequestData());
154
- echo "<pre>";print_r($getrequestData);echo "</pre>";
155
 
156
- ?></strong></div>
157
- </td>
158
- </tr>
159
- </table>
160
- </div>
161
- </div>
162
  </div>
163
 
164
  <div class="box-right">
165
- <div class="entry-edit">
166
- <div class="entry-edit-head">
167
- <h4 class="icon-head head-payment-method"><?php echo Mage::helper('novalnet_payment')->__('Novalnet Response Data') ?></h4>
168
- </div>
169
- <div class="fieldset">
170
- <table cellspacing="0" class="form-list" width="100%">
171
- <tr>
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
 
176
- $getresponseData = unserialize($data->getResponseData());
177
- echo "<pre>";print_r($getresponseData);echo "</pre>";
178
 
179
- ?></strong></div>
180
- </td>
181
- </tr>
182
- </table>
183
- </div>
184
- </div>
185
  </div>
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
26
  ?>
27
+ <?php $data = $this->getNovalnetTransactionOverview(); ?>
28
  <div class="content-header">
29
  <table cellspacing="0">
30
  <tr>
38
  <input type="hidden" name="order_id" value="<?php echo $data->getOrderId() ?>"/>
39
 
40
  <div class="box-left">
41
+ <!--Novalnet Order Information-->
42
+ <div class="entry-edit">
43
+ <div class="entry-edit-head">
44
+ <h4 class="icon-head head-payment-method"><?php echo Mage::helper('novalnet_payment')->__('Novalnet Order Information') ?></h4>
45
+ </div>
46
+ <div class="fieldset">
47
+ <table cellspacing="0" class="form-list">
48
+ <tr>
49
+ <td class="label">
50
+ <label><?php echo $this->helper('novalnet_payment')->__('Store-ID') ?></label>
51
+ </td>
52
+ <td class="label">
53
+ <strong><?php echo $data->getStoreId() ?></strong>
54
+ </td>
55
+ </tr>
56
+ <tr>
57
+ <td class="label">
58
+ <label><?php echo $this->helper('novalnet_payment')->__('Order-ID') ?></label>
59
+ </td>
60
+ <td class="label">
61
+ <?php
62
+ $orderViewId = Mage::getModel('sales/order')->loadByIncrementId($data->getOrderId())->getId();
63
+ $orderViewUrl = Mage::helper('adminhtml')->getUrl('adminhtml/sales_order/view', array('order_id' => $orderViewId));
64
+ ?>
65
+ <strong><a href="<?php echo $orderViewUrl ?>"><?php echo $data->getOrderId() ?></a></strong>
66
+ </td>
67
+ </tr>
68
+ <tr>
69
+ <td class="label">
70
+ <label><?php echo $this->helper('novalnet_payment')->__('Tranaction-ID') ?></label>
71
+ </td>
72
+ <td class="label">
73
+ <strong><?php echo $data->getTransactionId() ?></strong>
74
+ </td>
75
+ </tr>
76
+ <tr>
77
+ <td class="label">
78
+ <label><?php echo $this->helper('novalnet_payment')->__('Customer-ID') ?></label>
79
+ </td>
80
+ <td class="label">
81
+ <strong><?php echo $data->getCustomerId() ?></strong>
82
+ </td>
83
+ </tr>
84
+ <tr>
85
+ <td class="label">
86
+ <label><?php echo $this->helper('novalnet_payment')->__('Payment Name') ?></label>
87
+ </td>
88
+ <td class="label">
89
+ <strong><?php echo $this->getPaymentTitle() ?></strong>
90
+ </td>
91
+ </tr>
92
+ </table>
93
+ </div>
94
+ </div>
95
  </div>
96
 
97
 
98
  <div class="box-right">
99
+ <!--Novalnet Order Shop Information-->
100
+ <div class="entry-edit">
101
+ <div class="entry-edit-head">
102
+ <h4 class="icon-head head-payment-method"><?php echo Mage::helper('novalnet_payment')->__('Novalnet Shop Information') ?></h4>
103
+ </div>
104
+ <div class="fieldset">
105
+ <table cellspacing="0" class="form-list" width="100%">
106
+ <tr>
107
+ <td class="label">
108
+ <label><?php echo $this->helper('novalnet_payment')->__('Shop URL') ?></label>
109
+ </td>
110
+ <td style="word-break:break-word;">
111
+ <strong><?php echo $data->getShopUrl() ?></strong>
112
+ </td>
113
+ </tr>
114
+ </table>
115
+ </div>
116
+ </div>
117
  </div>
118
 
119
  <div class="box-right">
120
+ <!--Novalnet Order Additional Information-->
121
+ <div class="entry-edit">
122
+ <div class="entry-edit-head">
123
+ <h4 class="icon-head head-payment-method"><?php echo Mage::helper('novalnet_payment')->__('Novalnet Additional Information') ?></h4>
124
+ </div>
125
+ <div class="fieldset">
126
+ <table cellspacing="0" class="form-list">
127
+ <tr>
128
+ <td class="label">
129
+ <label><?php echo $this->helper('novalnet_payment')->__('Additional Data') ?></label>
130
+ </td>
131
+ <td style="word-break:break-word;">
132
+ <strong><?php echo $data->getAdditionalData() ?></strong>
133
+ </td>
134
+ </tr>
135
+ </table>
136
+ </div>
137
+ </div>
138
  </div>
139
  <!-- Novalnet API Data -->
140
  <div class="box-left" style="clear:both;">
141
+ <div class="entry-edit">
142
+ <div class="entry-edit-head">
143
+ <h4 class="icon-head head-payment-method"><?php echo Mage::helper('novalnet_payment')->__('Novalnet Request Data') ?></h4>
144
+ </div>
145
+ <div class="fieldset">
146
+ <table cellspacing="0" class="form-list" width="100%">
147
+ <tr>
148
+ <td class="label">
149
+ <label><?php echo $this->helper('novalnet_payment')->__('Request Data') ?></label><br>
150
+ <div style="height:250px;overflow:scroll;width:600px;"><strong><?php
151
 
152
+ $getrequestData = unserialize($data->getRequestData());
153
+ echo "<pre>";print_r($getrequestData);echo "</pre>";
154
 
155
+ ?></strong></div>
156
+ </td>
157
+ </tr>
158
+ </table>
159
+ </div>
160
+ </div>
161
  </div>
162
 
163
  <div class="box-right">
164
+ <div class="entry-edit">
165
+ <div class="entry-edit-head">
166
+ <h4 class="icon-head head-payment-method"><?php echo Mage::helper('novalnet_payment')->__('Novalnet Response Data') ?></h4>
167
+ </div>
168
+ <div class="fieldset">
169
+ <table cellspacing="0" class="form-list" width="100%">
170
+ <tr>
171
+ <td class="label">
172
+ <label><?php echo $this->helper('novalnet_payment')->__('Response Data') ?></label><br>
173
+ <div style="height:250px;overflow:scroll;width:600px;"><strong><?php
174
 
175
+ $getresponseData = unserialize($data->getResponseData());
176
+ echo "<pre>";print_r($getresponseData);echo "</pre>";
177
 
178
+ ?></strong></div>
179
+ </td>
180
+ </tr>
181
+ </table>
182
+ </div>
183
+ </div>
184
  </div>
app/design/adminhtml/default/default/template/novalnet/transaction/view/form.phtml CHANGED
@@ -23,11 +23,8 @@
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
-
27
- $data = $this->getNovalnetTransactionStatus();
28
-
29
  ?>
30
-
31
  <div class="content-header">
32
  <table cellspacing="0">
33
  <tr>
@@ -41,145 +38,147 @@ $data = $this->getNovalnetTransactionStatus();
41
  <input type="hidden" name="order_id" value="<?php echo $data->getOrderNo() ?>"/>
42
 
43
  <div class="box-left">
44
- <!--Novalnet Order Information-->
45
- <div class="entry-edit">
46
- <div class="entry-edit-head">
47
- <h4 class="icon-head head-payment-method"><?php echo Mage::helper('novalnet_payment')->__('Novalnet Order Information') ?></h4>
48
- </div>
49
- <div class="fieldset">
50
- <table cellspacing="0" class="form-list">
51
- <tr>
52
- <td class="label">
53
- <label><?php echo $this->helper('novalnet_payment')->__('Store-ID') ?></label>
54
- </td>
55
- <td class="label">
56
- <strong><?php echo $data->getStoreId() ?></strong>
57
- </td>
58
- </tr>
59
- <tr>
60
- <td class="label">
61
- <label><?php echo $this->helper('novalnet_payment')->__('Order-ID') ?></label>
62
- </td>
63
- <td class="label">
64
- <?php
65
- $orderViewId = Mage::getModel('sales/order')->loadByIncrementId($data->getOrderId())->getId();
66
- $orderViewUrl = Mage::helper('adminhtml')->getUrl('adminhtml/sales_order/view', array('order_id' => $orderViewId));
67
- ?>
68
- <strong><a href="<?php echo $orderViewUrl ?>"><?php echo $data->getOrderId() ?></a></strong>
69
- </td>
70
- </tr>
71
- <tr>
72
- <td class="label">
73
- <label><?php echo $this->helper('novalnet_payment')->__('Tranaction-ID') ?></label>
74
- </td>
75
- <td class="label">
76
- <strong><?php echo $data->getTransactionNo() ?></strong>
77
- </td>
78
- </tr>
79
- <tr>
80
- <td class="label">
81
- <label><?php echo $this->helper('novalnet_payment')->__('Transaction-Status Text') ?></label>
82
- </td>
83
- <td class="label">
84
- <strong>
85
- <?php
86
- if($data->getTransactionStatus() == 100) {
87
- echo $this->helper('novalnet_payment')->__('Successful');
88
- }elseif($data->getTransactionStatus() == 103) {
89
- echo $this->helper('novalnet_payment')->__('Transaction deactivate');
90
- }elseif(in_array($data->getTransactionStatus(), array(98, 99, 91))) {
91
- echo $this->helper('novalnet_payment')->__('TID on hold');
92
- }elseif($data->getTransactionStatus() == 90) {
93
- echo $this->helper('novalnet_payment')->__('PayPal Payment Pending');
94
- }elseif($data->getTransactionStatus() == 18) {
95
- echo $this->helper('novalnet_payment')->__('Zahlungsanruf noch nicht durchgeführt');
96
- }
97
- ?>
98
- </strong>
99
- </td>
100
- </tr>
101
- <tr>
102
- <td class="label">
103
- <label><?php echo $this->helper('novalnet_payment')->__('Transaction-Status') ?></label>
104
- </td>
105
- <td class="label">
106
- <strong><?php echo $data->getTransactionStatus() ?></strong>
107
- </td>
108
- </tr>
109
- <tr>
110
- <td class="label">
111
- <label><?php echo $this->helper('novalnet_payment')->__('NC No') ?></label>
112
- </td>
113
- <td class="label">
114
- <strong><?php echo $data->getNcNo() ?></strong>
115
- </td>
116
- </tr>
117
- <tr>
118
- <td class="label">
119
- <label><?php echo $this->helper('novalnet_payment')->__('Customer-ID') ?></label>
120
- </td>
121
- <td class="label">
122
- <strong><?php echo $data->getCustomerId() ?></strong>
123
- </td>
124
- </tr>
125
- <tr>
126
- <td class="label">
127
- <label><?php echo $this->helper('novalnet_payment')->__('Amount') ?></label>
128
- </td>
129
- <td class="label">
130
- <strong><?php echo sprintf('%.2f', $data->getAmount()) ." ". $this->getCurrencyCode() ?></strong>
131
- </td>
132
- </tr>
133
- <tr>
134
- <td class="label">
135
- <label><?php echo $this->helper('novalnet_payment')->__('Payment Name') ?></label>
136
- </td>
137
- <td class="label">
138
- <strong><?php echo $this->getPaymentTitle() ?></strong>
139
- </td>
140
- </tr>
141
- </table>
142
- </div>
143
- </div>
 
 
144
  </div>
145
  <div class="box-right">
146
- <!--Novalnet Order Shop Information-->
147
- <div class="entry-edit">
148
- <div class="entry-edit-head">
149
- <h4 class="icon-head head-payment-method"><?php echo Mage::helper('novalnet_payment')->__('Novalnet Shop Information') ?></h4>
150
- </div>
151
- <div class="fieldset">
152
- <table cellspacing="0" class="form-list" width="100%">
153
- <tr>
154
- <td class="label">
155
- <label><?php echo $this->helper('novalnet_payment')->__('Shop URL') ?></label>
156
- </td>
157
- <td style="word-break:break-word;">
158
- <strong><?php echo $data->getShopUrl() ?></strong>
159
- </td>
160
- </tr>
161
- </table>
162
- </div>
163
- </div>
164
  </div>
165
 
166
  <div class="box-right">
167
- <!--Novalnet Order Additional Information-->
168
- <div class="entry-edit">
169
- <div class="entry-edit-head">
170
- <h4 class="icon-head head-payment-method"><?php echo Mage::helper('novalnet_payment')->__('Novalnet Additional Information') ?></h4>
171
- </div>
172
- <div class="fieldset">
173
- <table cellspacing="0" class="form-list">
174
- <tr>
175
- <td class="label">
176
- <label><?php echo $this->helper('novalnet_payment')->__('Additional Data') ?></label>
177
- </td>
178
- <td style="word-break:break-word;">
179
- <strong><?php echo $data->getAdditionalData() ?></strong>
180
- </td>
181
- </tr>
182
- </table>
183
- </div>
184
- </div>
185
  </div>
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
 
26
  ?>
27
+ <?php $data = $this->getNovalnetTransactionStatus(); ?>
28
  <div class="content-header">
29
  <table cellspacing="0">
30
  <tr>
38
  <input type="hidden" name="order_id" value="<?php echo $data->getOrderNo() ?>"/>
39
 
40
  <div class="box-left">
41
+ <!--Novalnet Order Information-->
42
+ <div class="entry-edit">
43
+ <div class="entry-edit-head">
44
+ <h4 class="icon-head head-payment-method"><?php echo Mage::helper('novalnet_payment')->__('Novalnet Order Information') ?></h4>
45
+ </div>
46
+ <div class="fieldset">
47
+ <table cellspacing="0" class="form-list">
48
+ <tr>
49
+ <td class="label">
50
+ <label><?php echo $this->helper('novalnet_payment')->__('Store-ID') ?></label>
51
+ </td>
52
+ <td class="label">
53
+ <strong><?php echo $data->getStoreId() ?></strong>
54
+ </td>
55
+ </tr>
56
+ <tr>
57
+ <td class="label">
58
+ <label><?php echo $this->helper('novalnet_payment')->__('Order-ID') ?></label>
59
+ </td>
60
+ <td class="label">
61
+ <?php
62
+ $orderViewId = Mage::getModel('sales/order')->loadByIncrementId($data->getOrderId())->getId();
63
+ $orderViewUrl = Mage::helper('adminhtml')->getUrl('adminhtml/sales_order/view', array(
64
+ 'order_id' => $orderViewId));
65
+ ?>
66
+ <strong><a href="<?php echo $orderViewUrl ?>"><?php echo $data->getOrderId() ?></a></strong>
67
+ </td>
68
+ </tr>
69
+ <tr>
70
+ <td class="label">
71
+ <label><?php echo $this->helper('novalnet_payment')->__('Transaction-ID') ?></label>
72
+ </td>
73
+ <td class="label">
74
+ <strong><?php echo $data->getTransactionNo() ?></strong>
75
+ </td>
76
+ </tr>
77
+ <tr>
78
+ <td class="label">
79
+ <label><?php echo $this->helper('novalnet_payment')->__('Transaction-Status Text') ?></label>
80
+ </td>
81
+ <td class="label">
82
+ <strong>
83
+ <?php
84
+ if ($data->getTransactionStatus() == 100) {
85
+ echo $this->helper('novalnet_payment')->__('Successful');
86
+ } elseif ($data->getTransactionStatus() == 103) {
87
+ echo $this->helper('novalnet_payment')->__('Transaction deactivate');
88
+ } elseif (in_array($data->getTransactionStatus(), array(
89
+ 98, 99, 91))) {
90
+ echo $this->helper('novalnet_payment')->__('TID on hold');
91
+ } elseif ($data->getTransactionStatus() == 90) {
92
+ echo $this->helper('novalnet_payment')->__('PayPal Payment Pending');
93
+ } elseif ($data->getTransactionStatus() == 18) {
94
+ echo $this->helper('novalnet_payment')->__('Not yet performed payment call');
95
+ }
96
+ ?>
97
+ </strong>
98
+ </td>
99
+ </tr>
100
+ <tr>
101
+ <td class="label">
102
+ <label><?php echo $this->helper('novalnet_payment')->__('Transaction-Status') ?></label>
103
+ </td>
104
+ <td class="label">
105
+ <strong><?php echo $data->getTransactionStatus() ?></strong>
106
+ </td>
107
+ </tr>
108
+ <tr>
109
+ <td class="label">
110
+ <label><?php echo $this->helper('novalnet_payment')->__('NC No') ?></label>
111
+ </td>
112
+ <td class="label">
113
+ <strong><?php echo $data->getNcNo() ?></strong>
114
+ </td>
115
+ </tr>
116
+ <tr>
117
+ <td class="label">
118
+ <label><?php echo $this->helper('novalnet_payment')->__('Customer-ID') ?></label>
119
+ </td>
120
+ <td class="label">
121
+ <strong><?php echo $data->getCustomerId() ?></strong>
122
+ </td>
123
+ </tr>
124
+ <tr>
125
+ <td class="label">
126
+ <label><?php echo $this->helper('novalnet_payment')->__('Amount') ?></label>
127
+ </td>
128
+ <td class="label">
129
+ <strong><?php echo sprintf('%.2f', $data->getAmount()) . " " . $this->getCurrencyCode() ?></strong>
130
+ </td>
131
+ </tr>
132
+ <tr>
133
+ <td class="label">
134
+ <label><?php echo $this->helper('novalnet_payment')->__('Payment Name') ?></label>
135
+ </td>
136
+ <td class="label">
137
+ <strong><?php echo $this->getPaymentTitle() ?></strong>
138
+ </td>
139
+ </tr>
140
+ </table>
141
+ </div>
142
+ </div>
143
  </div>
144
  <div class="box-right">
145
+ <!--Novalnet Order Shop Information-->
146
+ <div class="entry-edit">
147
+ <div class="entry-edit-head">
148
+ <h4 class="icon-head head-payment-method"><?php echo Mage::helper('novalnet_payment')->__('Novalnet Shop Information') ?></h4>
149
+ </div>
150
+ <div class="fieldset">
151
+ <table cellspacing="0" class="form-list" width="100%">
152
+ <tr>
153
+ <td class="label">
154
+ <label><?php echo $this->helper('novalnet_payment')->__('Shop URL') ?></label>
155
+ </td>
156
+ <td style="word-break:break-word;">
157
+ <strong><?php echo $data->getShopUrl() ?></strong>
158
+ </td>
159
+ </tr>
160
+ </table>
161
+ </div>
162
+ </div>
163
  </div>
164
 
165
  <div class="box-right">
166
+ <!--Novalnet Order Additional Information-->
167
+ <div class="entry-edit">
168
+ <div class="entry-edit-head">
169
+ <h4 class="icon-head head-payment-method"><?php echo Mage::helper('novalnet_payment')->__('Novalnet Additional Information') ?></h4>
170
+ </div>
171
+ <div class="fieldset">
172
+ <table cellspacing="0" class="form-list">
173
+ <tr>
174
+ <td class="label">
175
+ <label><?php echo $this->helper('novalnet_payment')->__('Additional Data') ?></label>
176
+ </td>
177
+ <td style="word-break:break-word;">
178
+ <strong><?php echo $data->getAdditionalData() ?></strong>
179
+ </td>
180
+ </tr>
181
+ </table>
182
+ </div>
183
+ </div>
184
  </div>
app/design/frontend/base/default/template/novalnet/payment/method/form/Cc.phtml CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -28,22 +27,30 @@
28
  * For Custom Style
29
  */
30
 
31
- include(MAGENTO_ROOT.'/novalnet_css_link.php');
32
 
33
  $code = $this->getMethodCode();
34
  $helper = Mage::helper('novalnet_payment');
35
- $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
36
- $ccError = $this->getMethod()->getConfigData('cc_error');
37
  ?>
38
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
39
  <!--{{{ Payment Logo -->
40
- <div>
41
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
42
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "creditcard_small.jpg" ?>
43
- <img style="height:20px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->_getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
44
- </a>
45
- <!-- Amex Logo -->
46
- </div>
 
 
 
 
 
 
 
 
47
  <!--}}} Payment Logo -->
48
  <!--{{{ Novalnet Cc Form -->
49
  <div id="payment_form_<?php echo $code ?>" style="display:none;">
@@ -56,60 +63,72 @@ $ccError = $this->getMethod()->getConfigData('cc_error');
56
  <img src="<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif" alt="Loading" />
57
  </div>
58
  <iframe frameborder="0" name="ifm_payment_form_<?php echo $code ?>" id="ifm_payment_form_<?php echo $code ?>"
59
- style="width: 603px; height: 320px; border: none; display: block; margin-top: 5px;" onload="document.getElementById('nncc_loading').style.display = 'none'" src="<?php echo $helper->getUrl('novalnet_payment/NovalnetCc') ?>" >
60
  </iframe>
61
  <ul>
62
- <!--{{{ CallbackType-->
63
- <?php if ($this->isCallbackTypeCall()): ?>
64
- <!--{{{ PIN by Callback-->
65
- <?php if ($this->getCallbackConfigData() != 3): ?>
66
- <li>
67
- <div class="input-box">
68
- <label style="float:none;" for="<?php echo $code ?>_callback_tel">
69
- <?php if ($this->getCallbackConfigData() == 2): ?>
70
- <?php echo $this->__('Mobile phone number'); ?>
71
- <?php else: ?>
72
- <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
73
- <?php endif; ?>
74
- <span class="required">*</span></label><br/>
75
- <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" value="<?php echo $ccError ? $assignDatahelper->_getCheckout()->getNnCallbackTelNovalnetCc() : '';?>"/>
76
- </div>
77
- </li>
78
- <li>
79
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
80
- <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze eine PIN per Telefon-/Handyrückruf oder SMS.') ?>
81
- </div>
82
- <div class="input-box">
83
- <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
84
- <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/>
85
- <input id="new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
86
- <label style="float:none;" for="new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
87
- </div>
88
- </li>
89
- <!--}}} PIN by Callback-->
90
- <!--{{{ Reply by Email-->
91
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
92
- <li>
93
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
94
- <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze ein EMAIL, das Sie sofort ohne änderung des Mailtexts beantworten müssen.') ?>
95
- </div>
96
- <div class="input-box">
97
- <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
98
- <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 $ccError ? $assignDatahelper->_getCheckout()->getNnCallbackEmailNovalnetCc() : '';?>"/>
99
- </div>
100
- </li>
101
- <?php endif ?>
102
- <!--}}} Reply by Email-->
103
- <?php endif ?>
104
- <!--}}} CallbackType-->
105
- </ul>
 
 
 
 
 
 
 
 
 
 
 
 
106
  <?php endif; ?>
107
  </div>
108
 
109
  <input type="hidden" id="original_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>" />
110
  <input type="hidden" id="original_vendor_authcode" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>" />
111
- <input type="hidden" id="original_customstyle_css" value="<?php echo NOVALNET_CC_CUSTOM_CSS; ?>" />
112
- <input type="hidden" id="original_customstyle_cssval" value="<?php echo NOVALNET_CC_CUSTOM_CSS_STYLE; ?>" />
113
 
114
  <input type="hidden" name="novalnet_cc_owner" id="novalnet_cc_owner" value="" />
115
  <input type="hidden" name="novalnet_cc_type" id="novalnet_cc_type" value="" />
1
  <?php
 
2
  /**
3
  * Magento
4
  *
27
  * For Custom Style
28
  */
29
 
30
+ include(Mage::getBaseDir('base') . '/novalnet_css_link.php');
31
 
32
  $code = $this->getMethodCode();
33
  $helper = Mage::helper('novalnet_payment');
34
+ $ccRefill = $this->getMethod()->getConfigData('cc_refill');
35
+ $creditCardSecure = $this->getMethod()->getConfigData('active_cc3d');
36
  ?>
37
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
38
  <!--{{{ Payment Logo -->
39
+ <div>
40
+ <!-- Amex Logo -->
41
+ <?php if ($this->getMethod()->_getConfigData('enable_amex_logo')): ?>
42
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
43
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl()."creditcard_amex.png" ?>
44
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>"
45
+ title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
46
+ </a>
47
+ <?php else: ?>
48
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
49
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "creditcard_small.png" ?>
50
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->_getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
51
+ </a>
52
+ <?php endif; ?>
53
+ </div>
54
  <!--}}} Payment Logo -->
55
  <!--{{{ Novalnet Cc Form -->
56
  <div id="payment_form_<?php echo $code ?>" style="display:none;">
63
  <img src="<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif" alt="Loading" />
64
  </div>
65
  <iframe frameborder="0" name="ifm_payment_form_<?php echo $code ?>" id="ifm_payment_form_<?php echo $code ?>"
66
+ scrolling= "no" style="width: 603px; height: 270px; border: none; display: block; margin-top: 5px;" onload="novalnet_cc_iframe(this)" src="<?php echo $helper->getUrl('novalnet_payment/NovalnetCc') ?>" >
67
  </iframe>
68
  <ul>
69
+ <!--{{{ CallbackType-->
70
+ <?php if (!$creditCardSecure && $this->isCallbackTypeCall()): ?>
71
+ <!--{{{ PIN by Callback-->
72
+ <?php
73
+ if ($this->getCallbackConfigData() != 3):
74
+ ?>
75
+ <li>
76
+ <div class="input-box">
77
+ <label style="float:none;" for="<?php echo $code ?>_callback_tel">
78
+ <?php
79
+ if ($this->getCallbackConfigData() == 2):
80
+ ?>
81
+ <?php echo $this->__('Mobile phone number'); ?>
82
+ <?php else: ?>
83
+ <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
84
+ <?php endif; ?>
85
+ <span class="required">*</span></label><br/>
86
+ <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" value="<?php
87
+ echo $ccRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackTelNovalnetCc()
88
+ : '';
89
+ ?>"/>
90
+ </div>
91
+ </li>
92
+ <li>
93
+ <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
94
+ <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze eine PIN per Telefon-/Handyrückruf oder SMS.') ?>
95
+ </div>
96
+ <div class="input-box">
97
+ <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
98
+ <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/>
99
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
100
+ <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
101
+ </div>
102
+ </li>
103
+ <!--}}} PIN by Callback-->
104
+ <!--{{{ Reply by Email-->
105
+ <?php
106
+ elseif ($this->getCallbackConfigData() == 3):
107
+ ?>
108
+ <li>
109
+ <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
110
+ <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze ein EMAIL, das Sie sofort ohne änderung des Mailtexts beantworten müssen.') ?>
111
+ </div>
112
+ <div class="input-box">
113
+ <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
114
+ <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
115
+ echo $ccRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackEmailNovalnetCc()
116
+ : '';
117
+ ?>"/>
118
+ </div>
119
+ </li>
120
+ <?php endif ?>
121
+ <!--}}} Reply by Email-->
122
+ <?php endif ?>
123
+ <!--}}} CallbackType-->
124
+ </ul>
125
  <?php endif; ?>
126
  </div>
127
 
128
  <input type="hidden" id="original_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>" />
129
  <input type="hidden" id="original_vendor_authcode" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>" />
130
+ <input type="hidden" id="original_customstyle_css" value="<?php echo NOVALNET_CC_CUSTOM_CSS; ?>" />
131
+ <input type="hidden" id="original_customstyle_cssval" value="<?php echo NOVALNET_CC_CUSTOM_CSS_STYLE; ?>" />
132
 
133
  <input type="hidden" name="novalnet_cc_owner" id="novalnet_cc_owner" value="" />
134
  <input type="hidden" name="novalnet_cc_type" id="novalnet_cc_type" value="" />
app/design/frontend/base/default/template/novalnet/payment/method/form/Ccform.phtml CHANGED
@@ -27,50 +27,6 @@
27
  <?php
28
  $_code = Novalnet_Payment_Model_Config::NN_CC;
29
  ?>
30
- <script type="text/javascript">
31
- function updateHiddenElements(elements) {
32
-
33
- var cc_type=0; var cc_owner=0; var cc_no=0; var cc_hash=0; var cc_month=0; var cc_year=0; var cc_cid=0;
34
- if(document.getElementById("novalnetCc_cc_type").value!= '') cc_type=1;
35
- if(document.getElementById("novalnetCc_cc_owner").value!= '') cc_owner=1;
36
- if(document.getElementById("novalnetCc_cc_number").value!= '') cc_no=1;
37
- if(document.getElementById("novalnetCc_expiration").value!= '') cc_month = 1;
38
- if(document.getElementById("novalnetCc_expiration_yr").value!= '') cc_year = 1;
39
- if(document.getElementById("novalnetCc_cc_cid").value!= '') cc_cid=1;
40
-
41
- var novalnet_cc_field_validator = cc_type+','+cc_owner+','+cc_no+','+cc_month+','+cc_year+','+cc_cid;
42
-
43
- for (var i=0; i<elements.length; i++) {
44
- switch (elements[i].name) {
45
- case 'novalnet_cc_field_validator':
46
- elements[i].value = novalnet_cc_field_validator;
47
- break;
48
- case 'novalnet_cc_owner':
49
- elements[i].value = document.getElementById('<?php echo $_code ?>_cc_owner').value;
50
- break;
51
- case 'novalnet_cc_type':
52
- elements[i].value = document.getElementById('<?php echo $_code ?>_cc_type').value;
53
- break;
54
- case 'novalnet_cc_pan_hash':
55
- elements[i].value = document.getElementById('nncc_cardno_id').value;
56
- break;
57
- case 'novalnet_cc_unique_id':
58
- elements[i].value = document.getElementById('nncc_unique_id').value;
59
- break;
60
- case 'novalnet_cc_exp_month':
61
- elements[i].value = document.getElementById('<?php echo $_code ?>_expiration').value;
62
- break;
63
- case 'novalnet_cc_exp_year':
64
- elements[i].value = document.getElementById('<?php echo $_code ?>_expiration_yr').value;
65
- break;
66
- case 'novalnet_cc_cid':
67
- elements[i].value = document.getElementById('<?php echo $_code ?>_cc_cid').value;
68
- break;
69
- }
70
- }
71
- return true;
72
- }
73
- </script>
74
  <!--{{{ Payment Description -->
75
  <ul>
76
  <li style="margin: 0 0 8px;">
@@ -79,7 +35,10 @@ $_code = Novalnet_Payment_Model_Config::NN_CC;
79
  <li style="margin: 0 0 8px;">
80
  <?php echo Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('booking_reference') ?>
81
  </li>
82
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('live_mode', true) == 0): ?>
 
 
 
83
  <li style="margin: 0 0 8px;">
84
  <div style="font-weight:bold;color:red;font-size:12px;">
85
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
27
  <?php
28
  $_code = Novalnet_Payment_Model_Config::NN_CC;
29
  ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
30
  <!--{{{ Payment Description -->
31
  <ul>
32
  <li style="margin: 0 0 8px;">
35
  <li style="margin: 0 0 8px;">
36
  <?php echo Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('booking_reference') ?>
37
  </li>
38
+ <?php
39
+ if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('live_mode', true)
40
+ == 0):
41
+ ?>
42
  <li style="margin: 0 0 8px;">
43
  <div style="font-weight:bold;color:red;font-size:12px;">
44
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
app/design/frontend/base/default/template/novalnet/payment/method/form/Ccsecure.phtml DELETED
@@ -1,117 +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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- ?>
27
- <?php
28
- $code = $this->getMethodCode();
29
- $helper = Mage::helper('novalnet_payment');
30
- $novalnetSecureError = $this->getMethod()->getConfigData('novalnetSecure_error');
31
- ?>
32
- <fieldset class="form-list">
33
- <!--{{{ Payment Logo -->
34
- <div>
35
- <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
36
- <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
37
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $_typeCode . "_Logo.png"; ?>
38
- <img style="height:20px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
- <?php endforeach; ?>
40
- </a>
41
- </div>
42
- <!--}}} Payment Logo -->
43
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
44
- <li>
45
- <?php echo $helper->__('The amount will be booked immediately from your credit card.') ?>
46
- </li>
47
- <?php if ($this->getUserInfo()): ?>
48
- <li>
49
- <?php echo $this->getUserInfo() ?>
50
- </li>
51
- <?php endif ?>
52
- <?php if ($this->getLiveMode() == 0): ?>
53
- <li>
54
- <div style="font-weight:bold;color:red;font-size:12px;">
55
- <?php echo $helper->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
56
- </div>
57
- </li>
58
- <?php endif ?>
59
- <li>
60
- <div class="input-box">
61
- <label style="float:none;" for="<?php echo $code ?>_cc_type"><?php echo $this->__('Credit Card Type') ?><span class="required">*</span></label><br />
62
- <select id="<?php echo $code ?>_cc_type" name="payment[nn_cc_type]" class="required-entry validate-cc-type-select">
63
- <option value=""><?php echo $this->__('--Please Select--') ?></option>
64
- <?php $_ccType = Mage::helper('core')->decrypt($helper->_getCheckoutSession()->getNnCcType()) ?>
65
- <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
66
- <option value="<?php echo $_typeCode ?>"<?php if($_typeCode==$_ccType && $novalnetSecureError): ?> selected="selected"<?php endif ?>><?php echo $_typeName ?></option>
67
- <?php endforeach; ?>
68
- </select>
69
- </div>
70
- </li>
71
- <li>
72
- <div class="input-box">
73
- <label style="float:none;" for="<?php echo $code ?>_cc_owner"><?php echo $this->__('Credit card holder') ?><span class="required">*</span></label><br/>
74
- <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_cc_owner" name="payment[nn_cc_owner]" autocomplete="off" value="<?php echo $novalnetSecureError ? Mage::helper('core')->decrypt($helper->_getCheckoutSession()->getNnCcOwner()) : '';?>" />
75
- </div>
76
- </li>
77
- <li>
78
- <div class="input-box">
79
- <label style="float:none;" for="<?php echo $code ?>_cc_number"><?php echo $this->__('Card number') ?><span class="required">*</span></label><br/>
80
- <input type="text" id="<?php echo $code ?>_cc_number" name="payment[nn_cc_number]" title="<?php echo $this->__('Credit Card Number') ?>" class="required-entry input-text validate-cc-number validate-cc-type" autocomplete="off" value="<?php echo $novalnetSecureError ? Mage::helper('core')->decrypt($helper->_getCheckoutSession()->getNnCcNumber()) : '';?>" />
81
- </div>
82
- </li>
83
- <li>
84
- <div class="input-box">
85
- <label style="float:none;" for="<?php echo $code ?>_expiration"><?php echo $this->__('Cc Expiration Date') ?><span class="required">*</span></label><br />
86
- <div class="v-fix">
87
- <select id="<?php echo $code ?>_expiration" style="width:140px;" name="payment[nn_cc_exp_month]" class="required-entry">
88
- <option value=""><?php echo $this->__('Month'); ?></option>
89
- <?php $_ccExpMonth = Mage::helper('core')->decrypt($helper->_getCheckoutSession()->getNnCcExpMonth()) ?>
90
- <?php foreach ($this->getCcMonths() as $k => $v): ?>
91
- <option value="<?php echo $k ?>"<?php if($k==$_ccExpMonth && $novalnetSecureError): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
92
- <?php endforeach; ?>
93
- </select>
94
- </div>
95
- <div class="v-fix" style="padding-left:5px;">
96
- <select id="<?php echo $code ?>_expiration_yr" style="width:103px;" name="payment[nn_cc_exp_year]" class="required-entry">
97
- <option value=""><?php echo $this->__('Year'); ?></option>
98
- <?php $_ccExpYear = Mage::helper('core')->decrypt($helper->_getCheckoutSession()->getNnCcExpYear()) ?>
99
- <?php foreach ($this->getCcYears() as $k => $v): ?>
100
- <option value="<?php echo $k ?>"<?php if($k==$_ccExpYear && $novalnetSecureError): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
101
- <?php endforeach; ?>
102
- </select>
103
- </div>
104
- </div>
105
- </li>
106
- <?php if ($this->hasVerification()): ?>
107
- <li>
108
- <div class="input-box">
109
- <label style="float:none;" for="<?php echo $code ?>_cc_cid"><?php echo $this->__('Cc Card Verification Number') ?><span class="required">*</span></label><br />
110
- <div class="v-fix"><input type="text" title="<?php echo $this->__('Card Verification Number') ?>" class="required-entry input-text validate-cc-cvn" id="<?php echo $code ?>_cc_cid" name="payment[nn_cc_cid]" style="width:3em;" autocomplete="off" maxlength="4" /></div>
111
- &nbsp;
112
- <a href="#" class="cvv-what-is-this"><?php echo $this->__('What is this?') ?></a>
113
- </div>
114
- </li>
115
- <?php endif; ?>
116
- </ul>
117
- </fieldset>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/novalnet/payment/method/form/Elvaustria.phtml DELETED
@@ -1,124 +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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- ?>
27
- <?php
28
- $code = $this->getMethodCode();
29
- $helper = Mage::helper('novalnet_payment');
30
- $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
31
- $elvastriaError = $this->getMethod()->getConfigData('elvastria_error');
32
- ?>
33
- <fieldset class="form-list">
34
- <div>
35
- <!--{{{ Payment Logo -->
36
- <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
37
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "ELV_Logo.png"; ?>
38
- <img style="height:20px;" src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
39
- </a>
40
- <!--}}} Payment Logo -->
41
- </div>
42
- <!--{{{ ELVAT Form -->
43
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
44
- <!--{{{ Payment Description -->
45
- <li style="padding-top: 0.5em;">
46
- <?php echo $this->__('Your account will be debited upon delivery of goods.') ?>
47
- </li>
48
- <!--}}} Payment Description -->
49
- <?php if ($this->getUserInfo()): ?>
50
- <li>
51
- <?php echo $this->getUserInfo() ?>
52
- </li>
53
- <?php endif ?>
54
- <?php if ($this->getLiveMode() == 0): ?>
55
- <li>
56
- <div style="font-weight:bold;color:red;font-size:12px;">
57
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
58
- </div>
59
- </li>
60
- <?php endif ?>
61
- <li>
62
- <div class="input-box">
63
- <label style="float:none;" for="<?php echo $code ?>_account_holder"><?php echo $this->__('Account Holder') ?><span class="required">*</span></label><br/>
64
- <input type="text" value="<?php echo $elvastriaError ? $assignDatahelper->_getCheckout()->getElvAtAccountHolder(): '';?>"id="<?php echo $code ?>_account_holder" name="payment[account_holder_at]" title="<?php echo $this->__('Account Holder') ?>" class="required-entry input-text" autocomplete="off" />
65
- </div>
66
- </li>
67
- <li>
68
- <div class="input-box">
69
- <label style="float:none;" for="<?php echo $code ?>_account_number"><?php echo $this->__('NnAccount number') ?><span class="required">*</span></label><br/>
70
- <input type="text" value="<?php echo $elvastriaError ? $assignDatahelper->_getCheckout()->getElvAtAccountNumber(): '';?>"id="<?php echo $code ?>_account_number" name="payment[account_number_at]" title="<?php echo $this->__('NnAccount Number') ?>" class="required-entry input-text" autocomplete="off" />
71
- </div>
72
- </li>
73
- <li>
74
- <div class="input-box">
75
- <label style="float:none;" for="<?php echo $code ?>_bank_sorting_code"><?php echo $this->__('Bank Sorting Code') ?><span class="required">*</span></label><br/>
76
- <input type="text" value="<?php echo $elvastriaError ? $assignDatahelper->_getCheckout()->getElvAtBankSortingCode() : '';?>" id="<?php echo $code ?>_bank_sorting_code" name="payment[bank_sorting_code_at]" title="<?php echo $this->__('Bank Sorting Code') ?>" class="required-entry input-text" autocomplete="off" />
77
- </div>
78
- </li>
79
- <!--{{{ CallbackType-->
80
- <?php if ($this->isCallbackTypeCall()): ?>
81
- <!--{{{ PIN by Callback-->
82
- <?php if ($this->getCallbackConfigData() != 3): ?>
83
- <li>
84
- <div class="input-box">
85
- <label style="float:none;" for="<?php echo $code ?>_callback_tel">
86
- <?php if ($this->getCallbackConfigData() == 2): ?>
87
- <?php echo $this->__('Mobile phone number'); ?>
88
- <?php else: ?>
89
- <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
90
- <?php endif; ?>
91
- <span class="required">*</span></label><br/>
92
- <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" value="<?php echo $elvastriaError ? $assignDatahelper->_getCheckout()->getNnCallbackTelNovalnetElvaustria(): '';?>"/>
93
- </div>
94
- </li>
95
- <li>
96
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
97
- <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze eine PIN per Telefon-/Handyrückruf oder SMS.') ?>
98
- </div>
99
- <div class="input-box">
100
- <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
101
- <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/>
102
- <input id="new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
103
- <label style="float:none;" for="new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
104
- </div>
105
- </li>
106
- <!--}}} PIN by Callback-->
107
- <!--{{{ Reply by Email-->
108
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
109
- <li>
110
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
111
- <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze ein EMAIL, das Sie sofort ohne änderung des Mailtexts beantworten müssen.') ?>
112
- </div>
113
- <div class="input-box">
114
- <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
115
- <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 $elvastriaError ? $assignDatahelper->_getCheckout()->getNnCallbackEmailNovalnetElvaustria(): '';?>"/>
116
- </div>
117
- </li>
118
- <?php endif ?>
119
- <!--}}} Reply by Email-->
120
- <?php endif ?>
121
- <!--}}} CallbackType-->
122
- </ul>
123
- <!-- ELVAT Form -->
124
- </fieldset>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/novalnet/payment/method/form/Elvgerman.phtml DELETED
@@ -1,148 +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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- ?>
27
- <?php
28
- $code = $this->getMethodCode();
29
- $helper = Mage::helper('novalnet_payment');
30
- $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
31
- $elvgermanError = $this->getMethod()->getConfigData('elvgerman_error');
32
- ?>
33
- <fieldset class="form-list">
34
- <div>
35
- <!--{{{ Payment Logo -->
36
- <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
37
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "ELV_Logo.png"; ?>
38
- <img style="height:20px;" src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
39
- </a>
40
- <!--}}} Payment Logo -->
41
- </div>
42
- <!--{{{ ELVDE Form -->
43
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
44
- <!--{{{ Payment Description -->
45
- <li style="padding-top: 0.5em;">
46
- <?php echo $this->__('Your account will be debited upon delivery of goods.') ?>
47
- </li>
48
- <!--}}} Payment Description -->
49
- <?php if ($this->getUserInfo()): ?>
50
- <li>
51
- <?php echo $this->getUserInfo() ?>
52
- </li>
53
- <?php endif ?>
54
- <?php if ($this->getLiveMode() == 0): ?>
55
- <li>
56
- <div style="font-weight:bold;color:red;font-size:12px;">
57
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
58
- </div>
59
- </li>
60
- <?php endif ?>
61
- <li>
62
- <div class="input-box">
63
- <label style="float:none;" for="<?php echo $code ?>_account_holder"><?php echo $this->__('Account Holder') ?><span class="required">*</span></label><br/>
64
- <input type="text" value="<?php echo $elvgermanError ? $assignDatahelper->_getCheckout()->getElvDeAccountHolder() : '';?>" id="<?php echo $code ?>_account_holder" name="payment[account_holder]" title="<?php echo $this->__('Account Holder') ?>" class="required-entry input-text" autocomplete="off" />
65
- </div>
66
- </li>
67
- <li>
68
- <div class="input-box">
69
- <label style="float:none;" for="<?php echo $code ?>_account_number"><?php echo $this->__('NnAccount number') ?><span class="required">*</span></label><br/>
70
- <input type="text" value="<?php echo $elvgermanError ? $assignDatahelper->_getCheckout()->getElvDeAccountNumber() : '';?>" id="<?php echo $code ?>_account_number" name="payment[account_number]" title="<?php echo $this->__('NnAccount Number') ?>" class="required-entry input-text" autocomplete="off" />
71
- </div>
72
- </li>
73
- <li>
74
- <div class="input-box">
75
- <label style="float:none;" for="<?php echo $code ?>_bank_sorting_code"><?php echo $this->__('Bank Sorting Code') ?><span class="required">*</span></label><br/>
76
- <input type="text" value="<?php echo $elvgermanError ? $assignDatahelper->_getCheckout()->getElvDeBankSortingCode() : '';?>" id="<?php echo $code ?>_bank_sorting_code" name="payment[bank_sorting_code]" title="<?php echo $this->__('Bank Sorting Code') ?>" class="required-entry input-text" autocomplete="off" />
77
- </div>
78
- </li>
79
- <!--{{{ ACDC check-->
80
- <?php if ($this->getAcdc()): ?>
81
- <li>
82
- <div class="input-box">
83
- <input type="checkbox" id="<?php echo $code ?>_acdc" name="payment[acdc]" title="<?php echo $this->__('acdc') ?>" class="required-entry" />
84
- <label style="float:none;" id="elvde_acdc" for="<?php echo $code ?>_acdc"><b><a><?php echo $this->__('Please enable ACDC Check.') ?></a></b>&nbsp;<span class="required">*</span></label>
85
- </div>
86
- </li>
87
- <script type="text/javascript">
88
- var showbaby;
89
-
90
- //ACDC Info
91
- $("elvde_acdc").observe('mouseover', function() {
92
- var url = parent.location.href;
93
- url = '<?php echo $helper->getNovalnetPaymentFormLogoUrl(); ?>acdc_info.png';w='550';h='300';x=screen.availWidth/2-w/2;y=screen.availHeight/2-h/2;
94
- showbaby = window.open(url,'showbaby','toolbar=0,location=0,directories=0,status=0,menubar=0,resizable=1,width='+w+',height='+h+',left='+x+',top='+y+',screenX='+x+',screenY='+y);
95
- showbaby.focus();
96
- });
97
-
98
- //Hide ACDC info
99
- function hide_acdc_info() { showbaby.close(); }
100
- </script>
101
- <?php endif ?>
102
- <!--}}} ACDC check-->
103
- <!--{{{ CallbackType-->
104
- <?php if ($this->isCallbackTypeCall()): ?>
105
- <!--{{{ PIN by Callback-->
106
- <?php if ($this->getCallbackConfigData() != 3): ?>
107
- <li>
108
- <div class="input-box">
109
- <label style="float:none;" for="<?php echo $code ?>_callback_tel">
110
- <?php if ($this->getCallbackConfigData() == 2): ?>
111
- <?php echo $this->__('Mobile phone number'); ?>
112
- <?php else: ?>
113
- <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
114
- <?php endif; ?>
115
- <span class="required">*</span></label><br/>
116
- <input type="text" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text" autocomplete="off" value="<?php echo $elvgermanError ? $assignDatahelper->_getCheckout()->getNnCallbackTelNovalnetElvgerman() : '';?>"/>
117
- </div>
118
- </li>
119
- <li>
120
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
121
- <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze eine PIN per Telefon-/Handyrückruf oder SMS.') ?>
122
- </div>
123
- <div class="input-box">
124
- <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
125
- <input onchange="document.getElementById('de_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" autocomplete="off" /><br/>
126
- <input id="de_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
127
- <label style="float:none;" for="de_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
128
- </div>
129
- </li>
130
- <!--}}} PIN by Callback-->
131
- <!--{{{ Reply by Email-->
132
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
133
- <li>
134
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
135
- <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze ein EMAIL, das Sie sofort ohne änderung des Mailtexts beantworten müssen.') ?>
136
- </div>
137
- <div class="input-box">
138
- <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
139
- <input type="text" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" autocomplete="off" value="<?php echo $elvgermanError ? $assignDatahelper->_getCheckout()->getNnCallbackEmailNovalnetElvgerman() : '';?>"/>
140
- </div>
141
- </li>
142
- <?php endif ?>
143
- <!--}}} Reply by Email-->
144
- <?php endif ?>
145
- <!--}}} CallbackType-->
146
- </ul>
147
- <!-- ELVDE Form -->
148
- </fieldset>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/novalnet/payment/method/form/Ideal.phtml CHANGED
@@ -33,9 +33,11 @@ $helper = Mage::helper('novalnet_payment');
33
  <!--{{{ Payment Logo -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
- <?php $image = "ideal_payment_small.png";
37
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image; ?>
38
- <img style="height:32px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
 
 
39
  </a>
40
  </div>
41
  <!--}}} Payment Logo -->
@@ -43,20 +45,20 @@ $helper = Mage::helper('novalnet_payment');
43
  <div>
44
  <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
45
  <li>
46
- <?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
47
  </li>
48
- <?php if ($this->getUserInfo()): ?>
49
  <li>
50
- <?php echo $this->getUserInfo() ?>
51
  </li>
52
  <?php endif; ?>
53
- <?php if ($this->getLiveMode() == 0): ?>
54
  <li>
55
  <div style="font-weight:bold;color:red;font-size:12px;">
56
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
57
  </div>
58
  </li>
59
- <?php endif ?>
60
  </ul>
61
  </div>
62
  <!--}}} Payment Description -->
33
  <!--{{{ Payment Logo -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
+ <?php
37
+ $image = "ideal_payment_small.png";
38
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
39
+ ?>
40
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
41
  </a>
42
  </div>
43
  <!--}}} Payment Logo -->
45
  <div>
46
  <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
47
  <li>
48
+ <?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
49
  </li>
50
+ <?php if ($this->getUserInfo()): ?>
51
  <li>
52
+ <?php echo $this->getUserInfo() ?>
53
  </li>
54
  <?php endif; ?>
55
+ <?php if ($this->getMethod()->_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
  </ul>
63
  </div>
64
  <!--}}} Payment Description -->
app/design/frontend/base/default/template/novalnet/payment/method/form/Invoice.phtml CHANGED
@@ -32,8 +32,8 @@ $helper = Mage::helper('novalnet_payment');
32
  <!-- PAYMENT LOGO -->
33
  <div>
34
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
35
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "kauf-auf-rechnung.jpg"; ?>
36
- <img style="height:30px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
  </a>
38
  </div>
39
  <!-- PAYMENT LOGO -->
@@ -47,7 +47,7 @@ $helper = Mage::helper('novalnet_payment');
47
  <?php echo $this->getUserInfo() ?>
48
  </li>
49
  <?php endif ?>
50
- <?php if ($this->getLiveMode() == 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') ?>
@@ -62,7 +62,9 @@ $helper = Mage::helper('novalnet_payment');
62
  <li>
63
  <div class="input-box">
64
  <label style="float:none;" for="<?php echo $code ?>_callback_tel">
65
- <?php if ($this->getCallbackConfigData() == 2): ?>
 
 
66
  <?php echo $this->__('Mobile phone number'); ?>
67
  <?php else: ?>
68
  <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
@@ -77,9 +79,9 @@ $helper = Mage::helper('novalnet_payment');
77
  </div>
78
  <div class="input-box">
79
  <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
80
- <input onchange="document.getElementById('inv_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="inv_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
82
- <label style="float:none;" for="inv_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
83
  </div>
84
  </li>
85
  <!--}}} PIN by Callback-->
32
  <!-- PAYMENT LOGO -->
33
  <div>
34
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
35
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "kauf-auf-rechnung.png"; ?>
36
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
  </a>
38
  </div>
39
  <!-- PAYMENT LOGO -->
47
  <?php echo $this->getUserInfo() ?>
48
  </li>
49
  <?php endif ?>
50
+ <?php if ($this->getMethod()->_getConfigData('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') ?>
62
  <li>
63
  <div class="input-box">
64
  <label style="float:none;" for="<?php echo $code ?>_callback_tel">
65
+ <?php
66
+ if ($this->getCallbackConfigData() == 2):
67
+ ?>
68
  <?php echo $this->__('Mobile phone number'); ?>
69
  <?php else: ?>
70
  <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
79
  </div>
80
  <div class="input-box">
81
  <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
82
+ <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/>
83
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
84
+ <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
85
  </div>
86
  </li>
87
  <!--}}} PIN by Callback-->
app/design/frontend/base/default/template/novalnet/payment/method/form/Paypal.phtml CHANGED
@@ -33,9 +33,11 @@ $helper = Mage::helper('novalnet_payment');
33
  <!--{{{ Payment Logo -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
- <?php $image = "paypal-small.png";
37
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image; ?>
38
- <img style="height:32px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
 
 
39
  </a>
40
  </div>
41
  <!--}}} Payment Logo -->
@@ -43,20 +45,20 @@ $helper = Mage::helper('novalnet_payment');
43
  <div>
44
  <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
45
  <li>
46
- <?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
47
  </li>
48
- <?php if ($this->getUserInfo()): ?>
49
  <li>
50
- <?php echo $this->getUserInfo() ?>
51
  </li>
52
  <?php endif; ?>
53
- <?php if ($this->getLiveMode() == 0): ?>
54
  <li>
55
  <div style="font-weight:bold;color:red;font-size:12px;">
56
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
57
  </div>
58
  </li>
59
- <?php endif ?>
60
  </ul>
61
  </div>
62
  <!--}}} Payment Description -->
33
  <!--{{{ Payment Logo -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
+ <?php
37
+ $image = "paypal-small.png";
38
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
39
+ ?>
40
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
41
  </a>
42
  </div>
43
  <!--}}} Payment Logo -->
45
  <div>
46
  <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
47
  <li>
48
+ <?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
49
  </li>
50
+ <?php if ($this->getUserInfo()): ?>
51
  <li>
52
+ <?php echo $this->getUserInfo() ?>
53
  </li>
54
  <?php endif; ?>
55
+ <?php if ($this->getMethod()->_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
  </ul>
63
  </div>
64
  <!--}}} Payment Description -->
app/design/frontend/base/default/template/novalnet/payment/method/form/Phonepayment.phtml CHANGED
@@ -33,7 +33,7 @@ $helper = Mage::helper('novalnet_payment');
33
  <div>
34
  <A HREF="<?php echo $helper->getNovalnetUrl() ?>" TARGET="_new" style="text-decoration:none;">
35
  <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "novaltel_reciever.png"; ?>
36
- <img style="height:32px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
  </A>
38
  </div>
39
  <!--}}} Payment Logo -->
@@ -48,7 +48,7 @@ $helper = Mage::helper('novalnet_payment');
48
  <?php echo $this->getUserInfo() ?>
49
  </li>
50
  <?php endif ?>
51
- <?php if ($this->getLiveMode() == 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') ?>
33
  <div>
34
  <A HREF="<?php echo $helper->getNovalnetUrl() ?>" TARGET="_new" style="text-decoration:none;">
35
  <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "novaltel_reciever.png"; ?>
36
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
  </A>
38
  </div>
39
  <!--}}} Payment Logo -->
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') ?>
app/design/frontend/base/default/template/novalnet/payment/method/form/Prepayment.phtml CHANGED
@@ -32,8 +32,8 @@ $helper = Mage::helper('novalnet_payment');
32
  <!-- PAYMENT LOGO -->
33
  <div>
34
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
35
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "vorauskasse.jpg"; ?>
36
- <img style="height:30px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
  </a>
38
  </div>
39
  <!-- PAYMENT LOGO -->
@@ -47,7 +47,7 @@ $helper = Mage::helper('novalnet_payment');
47
  <?php echo $this->getUserInfo() ?>
48
  </li>
49
  <?php endif ?>
50
- <?php if ($this->getLiveMode() == 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') ?>
32
  <!-- PAYMENT LOGO -->
33
  <div>
34
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
35
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "vorauskasse.png"; ?>
36
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
  </a>
38
  </div>
39
  <!-- PAYMENT LOGO -->
47
  <?php echo $this->getUserInfo() ?>
48
  </li>
49
  <?php endif ?>
50
+ <?php if ($this->getMethod()->_getConfigData('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') ?>
app/design/frontend/base/default/template/novalnet/payment/method/form/Sepa.phtml CHANGED
@@ -23,21 +23,23 @@
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
- include(MAGENTO_ROOT.'/novalnet_css_link.php');
27
 
28
  $code = $this->getMethodCode();
29
  $helper = Mage::helper('novalnet_payment');
30
-
31
  ?>
32
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
33
  <!--{{{ Payment Logo -->
34
- <div>
35
- <a HREF="<?php echo $helper->getNovalnetUrl();?>" TARGET="_new" style="text-decoration:none;">
36
- <?php $image = "sepa_logo.jpg";
37
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl().$image; ?>
38
- <img style="height:20px;" src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
39
- </a>
40
- </div>
 
 
41
  <!--}}} Payment Logo -->
42
  <!--{{{ Novalnet SEPA Form -->
43
  <div id="payment_form_<?php echo $code ?>" style="display:none;">
@@ -46,22 +48,78 @@ $helper = Mage::helper('novalnet_payment');
46
  <?php echo $this->__('Basic parameter not valid') . '!' ?>
47
  </div>
48
  <?php else: ?>
49
- <div id="nn_loading">
50
  <img src="<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif" alt="Loading" />
51
  </div>
52
  <iframe frameborder="0" scrolling="no" name="ifm_payment_form_<?php echo $code ?>" id="ifm_payment_form_<?php echo $code ?>"
53
- style="width: 603px; height: 480px; border: none; display: block; margin-top: 5px;" onload="document.getElementById('nn_loading').style.display = 'none'" src="<?php echo $helper->getUrl('novalnet_payment/NovalnetSepa') ?>" >
54
  </iframe>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
55
  <?php endif; ?>
56
  </div>
57
  <input type="hidden" id="original_sepa_customstyle_css" value="<?php echo NOVALNET_SEPA_CUSTOM_CSS; ?>" />
58
- <input type="hidden" id="original_sepa_customstyle_cssval" value="<?php echo NOVALNET_SEPA_CUSTOM_CSS_STYLE; ?>" />
59
- <input type="hidden" name="novalnet_sepa_owner" id="novalnet_sepa_owner" value="" />
60
  <input type="hidden" name="novalnet_sepa_pan_hash" id="novalnet_sepa_pan_hash" value="" />
61
  <input type="hidden" name="novalnet_sepa_unique_id" id="novalnet_sepa_unique_id" value="" />
62
- <input type="hidden" name="novalnet_sepa_mandate_ref" id="novalnet_sepa_mandate_ref" value="" />
63
- <input type="hidden" name="novalnet_sepa_mandate_date" id="novalnet_sepa_mandate_date" value="" />
64
  <input type="hidden" name="novalnet_sepa_iban_confirmed" id="novalnet_sepa_iban_confirmed" value="" />
65
  <input type="hidden" name="novalnet_sepa_field_validator" id="novalnet_sepa_field_validator" value="" />
66
  <!--}}} Novalnet SEPA Form -->
67
  </fieldset>
 
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ include(Mage::getBaseDir('base') . '/novalnet_css_link.php');
27
 
28
  $code = $this->getMethodCode();
29
  $helper = Mage::helper('novalnet_payment');
30
+ $sepaRefill = $this->getMethod()->getConfigData('sepa_refill');
31
  ?>
32
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
33
  <!--{{{ Payment Logo -->
34
+ <div>
35
+ <a HREF="<?php echo $helper->getNovalnetUrl(); ?>" TARGET="_new" style="text-decoration:none;">
36
+ <?php
37
+ $image = "sepa_logo.png";
38
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
39
+ ?>
40
+ <img src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
41
+ </a>
42
+ </div>
43
  <!--}}} Payment Logo -->
44
  <!--{{{ Novalnet SEPA Form -->
45
  <div id="payment_form_<?php echo $code ?>" style="display:none;">
48
  <?php echo $this->__('Basic parameter not valid') . '!' ?>
49
  </div>
50
  <?php else: ?>
51
+ <div id="nnsepa_loading">
52
  <img src="<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif" alt="Loading" />
53
  </div>
54
  <iframe frameborder="0" scrolling="no" name="ifm_payment_form_<?php echo $code ?>" id="ifm_payment_form_<?php echo $code ?>"
55
+ style="width: 603px; height: 490px; border: none; display: block; margin-top: 5px;" onload="novalnet_sepa_iframe(this)" src="<?php echo $helper->getUrl('novalnet_payment/NovalnetSepa') ?>" >
56
  </iframe>
57
+ <ul>
58
+ <!--{{{ CallbackType-->
59
+ <?php if ($this->isCallbackTypeCall()): ?>
60
+ <!--{{{ PIN by Callback-->
61
+ <?php
62
+ if ($this->getCallbackConfigData() != 3):
63
+ ?>
64
+ <li>
65
+ <div class="input-box">
66
+ <label style="float:none;" for="<?php echo $code ?>_callback_tel">
67
+ <?php
68
+ if ($this->getCallbackConfigData() == 2):
69
+ ?>
70
+ <?php echo $this->__('Mobile phone number'); ?>
71
+ <?php else: ?>
72
+ <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
73
+ <?php endif; ?>
74
+ <span class="required">*</span></label><br/>
75
+ <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" value="<?php
76
+ echo $sepaRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackTelNovalnetSepa()
77
+ : '';
78
+ ?>"/>
79
+ </div>
80
+ </li>
81
+ <li>
82
+ <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
83
+ <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze eine PIN per Telefon-/Handyrückruf oder SMS.') ?>
84
+ </div>
85
+ <div class="input-box">
86
+ <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
87
+ <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/>
88
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
89
+ <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
90
+ </div>
91
+ </li>
92
+ <!--}}} PIN by Callback-->
93
+ <!--{{{ Reply by Email-->
94
+ <?php
95
+ elseif ($this->getCallbackConfigData() == 3):
96
+ ?>
97
+ <li>
98
+ <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
99
+ <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze ein EMAIL, das Sie sofort ohne änderung des Mailtexts beantworten müssen.') ?>
100
+ </div>
101
+ <div class="input-box">
102
+ <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
103
+ <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
104
+ echo $sepaRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackEmailNovalnetSepa()
105
+ : '';
106
+ ?>"/>
107
+ </div>
108
+ </li>
109
+ <?php endif ?>
110
+ <!--}}} Reply by Email-->
111
+ <?php endif ?>
112
+ <!--}}} CallbackType-->
113
+ </ul>
114
  <?php endif; ?>
115
  </div>
116
  <input type="hidden" id="original_sepa_customstyle_css" value="<?php echo NOVALNET_SEPA_CUSTOM_CSS; ?>" />
117
+ <input type="hidden" id="original_sepa_customstyle_cssval" value="<?php echo NOVALNET_SEPA_CUSTOM_CSS_STYLE; ?>" />
118
+ <input type="hidden" name="novalnet_sepa_owner" id="novalnet_sepa_owner" value="" />
119
  <input type="hidden" name="novalnet_sepa_pan_hash" id="novalnet_sepa_pan_hash" value="" />
120
  <input type="hidden" name="novalnet_sepa_unique_id" id="novalnet_sepa_unique_id" value="" />
 
 
121
  <input type="hidden" name="novalnet_sepa_iban_confirmed" id="novalnet_sepa_iban_confirmed" value="" />
122
  <input type="hidden" name="novalnet_sepa_field_validator" id="novalnet_sepa_field_validator" value="" />
123
  <!--}}} Novalnet SEPA Form -->
124
  </fieldset>
125
+
app/design/frontend/base/default/template/novalnet/payment/method/form/Sepaform.phtml CHANGED
@@ -27,65 +27,18 @@
27
  <?php
28
  $_code = Novalnet_Payment_Model_Config::NN_SEPA;
29
  ?>
30
- <script type="text/javascript">
31
- function updateHiddenElements(elements) {
32
-
33
- var sepa_owner=0;var sepa_accountno=0;var sepa_bankcode=0;var sepa_iban=0;var sepa_swiftbic=0; var sepa_hash=0; var sepa_country=0;
34
- if(document.getElementById("novalnet_sepa_owner").value!= '')sepa_owner=1;
35
- if(document.getElementById("novalnet_sepa_accountno").value!= '')sepa_accountno=1;
36
- if(document.getElementById("novalnet_sepa_bankcode").value!= '')sepa_bankcode=1;
37
- if(document.getElementById("novalnet_sepa_iban").value!= '')sepa_iban=1;
38
- if(document.getElementById("novalnet_sepa_swiftbic").value!= '')sepa_swiftbic=1;
39
- if(document.getElementById("nnsepa_hash").value!= '')sepa_hash=1;
40
- if(document.getElementById("novalnet_sepa_country").value!= '') {
41
- var country = document.getElementById("novalnet_sepa_country");
42
- sepa_country = 1+'-'+country.options[country.selectedIndex].value;
43
- }
44
-
45
- var novalnet_sepa_field_validator = sepa_owner+','+sepa_accountno+','+sepa_bankcode+','+sepa_iban+','+sepa_swiftbic+','+sepa_hash+','+sepa_country;
46
-
47
- for (var i=0; i<elements.length; i++) {
48
- switch (elements[i].name) {
49
- case 'novalnet_sepa_field_validator':
50
- elements[i].value = novalnet_sepa_field_validator;
51
- break;
52
- case 'novalnet_sepa_owner':
53
- elements[i].value = document.getElementById('novalnet_sepa_owner').value;
54
- break;
55
- case 'novalnet_sepa_pan_hash':
56
- elements[i].value = document.getElementById('nnsepa_hash').value;
57
- break;
58
- case 'novalnet_sepa_unique_id':
59
- elements[i].value = document.getElementById('nnsepa_unique_id').value;
60
- break;
61
- case 'novalnet_sepa_mandate_ref':
62
- elements[i].value = document.getElementById('nnsepa_mandate_ref').value;
63
- break;
64
- case 'novalnet_sepa_mandate_date':
65
- elements[i].value = document.getElementById('nnsepa_mandate_date').value;
66
- break;
67
- case 'novalnet_sepa_iban_confirmed':
68
- elements[i].value = document.getElementById('nnsepa_iban_confirmed').value;
69
- break;
70
- }
71
- }
72
- return true;
73
- }
74
- </script>
75
  <!--{{{ Payment Description -->
76
  <ul>
77
  <li style="margin: 0 0 8px;">
78
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('sepatypes') == 'DD_SEPA') {
79
- echo $this->__('Your account will be debited upon delivery of goods.');
80
- } else {
81
- echo $this->__('Please note that your account will be debited after receiving the signed mandate from you.');
82
- }
83
- ?>
84
  </li>
85
  <li style="margin: 0 0 8px;">
86
  <?php echo Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('booking_reference') ?>
87
  </li>
88
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('live_mode', true) == 0): ?>
 
 
 
89
  <li style="margin: 0 0 8px;">
90
  <div style="font-weight:bold;color:red;font-size:12px;">
91
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
27
  <?php
28
  $_code = Novalnet_Payment_Model_Config::NN_SEPA;
29
  ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
30
  <!--{{{ Payment Description -->
31
  <ul>
32
  <li style="margin: 0 0 8px;">
33
+ <?php echo $this->__('Your account will be debited upon delivery of goods.'); ?>
 
 
 
 
 
34
  </li>
35
  <li style="margin: 0 0 8px;">
36
  <?php echo Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('booking_reference') ?>
37
  </li>
38
+ <?php
39
+ if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('live_mode', true)
40
+ == 0):
41
+ ?>
42
  <li style="margin: 0 0 8px;">
43
  <div style="font-weight:bold;color:red;font-size:12px;">
44
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
app/design/frontend/base/default/template/novalnet/payment/method/form/Sofortueberweisung.phtml CHANGED
@@ -33,9 +33,11 @@ $helper = Mage::helper('novalnet_payment');
33
  <!--{{{ Payment Logo -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
- <?php $image = "sofort_Logo.png";
37
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image; ?>
38
- <img style="height:32px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
 
 
39
  </a>
40
  </div>
41
  <!--}}} Payment Logo -->
@@ -43,20 +45,20 @@ $helper = Mage::helper('novalnet_payment');
43
  <div>
44
  <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
45
  <li>
46
- <?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
47
  </li>
48
- <?php if ($this->getUserInfo()): ?>
49
  <li>
50
- <?php echo $this->getUserInfo() ?>
51
  </li>
52
  <?php endif; ?>
53
- <?php if ($this->getLiveMode() == 0): ?>
54
  <li>
55
  <div style="font-weight:bold;color:red;font-size:12px;">
56
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
57
  </div>
58
  </li>
59
- <?php endif ?>
60
  </ul>
61
  </div>
62
  <!--}}} Payment Description -->
33
  <!--{{{ Payment Logo -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
+ <?php
37
+ $image = "sofort_Logo.png";
38
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
39
+ ?>
40
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
41
  </a>
42
  </div>
43
  <!--}}} Payment Logo -->
45
  <div>
46
  <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
47
  <li>
48
+ <?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
49
  </li>
50
+ <?php if ($this->getUserInfo()): ?>
51
  <li>
52
+ <?php echo $this->getUserInfo() ?>
53
  </li>
54
  <?php endif; ?>
55
+ <?php if ($this->getMethod()->_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
  </ul>
63
  </div>
64
  <!--}}} Payment Description -->
app/design/frontend/base/default/template/novalnet/payment/method/info/Cc.phtml CHANGED
@@ -13,25 +13,41 @@
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * Part of the Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
- *
21
- * @category Mage
22
- * @package Mage_Novalnet
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
  <?php
28
  $_info = $this->getInfo();
29
- if ($_info): ?>
30
- <?php if ($this->getAdditionalData('NnTestOrder'))
31
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!',$this->__('Testorder'),'!</div>' ?>
32
- <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
33
- <?php if ($_info->getLastTransId()!="") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())).'<br />' ?>
34
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments') ?>
35
- <?php else: ?>
36
- <?php echo $this->__('Error in getting payment method') ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
37
  <?php endif; ?>
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
  <?php
28
  $_info = $this->getInfo();
29
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
30
+ $helper = Mage::helper('novalnet_payment');
31
+ if ($_info):
32
+ ?>
33
+ <?php
34
+ if ($this->getAdditionalData('NnTestOrder'))
35
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
36
+ ?>
37
+ <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
38
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
39
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('Transaction deactivated successfully') . '<br><br>' ?>
40
+ <?php if ($this->getAdditionalData('refunded_tid')):
41
+ foreach($this->getAdditionalData('refunded_tid') as $key => $value):
42
+ if ($this->getAdditionalData('fullRefund') == true):
43
+ echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
44
+ else:
45
+ echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
46
+ endif;
47
+ endforeach;
48
+ endif;
49
+ ?>
50
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
51
+ <?php else: ?>
52
+ <?php echo $this->__('Error in getting payment method') ?>
53
  <?php endif; ?>
app/design/frontend/base/default/template/novalnet/payment/method/info/Elvaustria.phtml DELETED
@@ -1,40 +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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Mage
22
- * @package Mage_Novalnet
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- ?>
27
- <?php
28
- $_info = $this->getInfo();
29
- if ($_info): ?>
30
- <?php if ($this->getAdditionalData('NnTestOrder'))
31
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
32
- ?>
33
- <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
34
- <?php if ($_info->getLastTransId() != "") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())) . '<br />' ?>
35
- <!--<?php echo $this->__('Account Holder: %s', $this->htmlEscape($this->getAdditionalData('NnAccountHolder'))) ?><br />
36
- <?php echo $this->__('Account Number: %s', $this->htmlEscape($this->getAdditionalData('NnAccountNumber'))) ?><br />
37
- <?php echo $this->__('Bank Sorting Code: %s', $this->htmlEscape($this->getAdditionalData('NnBankSortingCode'))) ?><br />-->
38
- <?php else: ?>
39
- <?php echo $this->__('Error in getting payment method') ?>
40
- <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/novalnet/payment/method/info/Elvgerman.phtml 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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Mage
22
- * @package Mage_Novalnet
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- ?>
27
- <?php
28
- $_info = $this->getInfo();
29
- if ($_info): ?>
30
- <?php if ($this->getAdditionalData('NnTestOrder'))
31
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!',$this->__('Testorder'),'!</div>' ?>
32
- <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
33
- <?php if ($_info->getLastTransId()!="") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())).'<br />' ?>
34
- <!--<?php echo $this->__('Account Holder: %s', $this->htmlEscape($this->getAdditionalData('NnAccountHolder'))) ?><br />
35
- <?php echo $this->__('Account Number: %s', $this->htmlEscape($this->getAdditionalData('NnAccountNumber'))) ?><br />
36
- <?php echo $this->__('Bank Sorting Code: %s', $this->htmlEscape($this->getAdditionalData('NnBankSortingCode'))) ?><br />-->
37
- <?php else: ?>
38
- <?php echo $this->__('Error in getting payment method') ?>
39
- <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/novalnet/payment/method/info/Ideal.phtml CHANGED
@@ -28,11 +28,12 @@
28
  $_info = $this->getInfo();
29
  if ($_info):
30
  ?>
31
- <?php if ($this->getAdditionalData('NnTestOrder'))
32
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
 
33
  ?>
34
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
35
- <?php if ($_info->getLastTransId() != "") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())) . '<br />' ?>
36
  <?php if ($this->getAdditionalData('NnComments')) { ?>
37
  <?php echo $this->getAdditionalData('NnComments') ?><br />
38
  <?php } ?>
28
  $_info = $this->getInfo();
29
  if ($_info):
30
  ?>
31
+ <?php
32
+ if ($this->getAdditionalData('NnTestOrder'))
33
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
34
  ?>
35
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
36
+ <?php if ($_info->getLastTransId() != "") echo $this->__('Novalnet Transaction ID: %s', $this->htmlEscape($_info->getLastTransId())) . '<br />' ?>
37
  <?php if ($this->getAdditionalData('NnComments')) { ?>
38
  <?php echo $this->getAdditionalData('NnComments') ?><br />
39
  <?php } ?>
app/design/frontend/base/default/template/novalnet/payment/method/info/Invoice.phtml CHANGED
@@ -13,44 +13,61 @@
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * Part of the Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
- *
21
  * @category Mage
22
  * @package Mage_Novalnet
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
- ?>
27
- <?php
28
  $_info = $this->getInfo();
29
- if ($_info):
30
- ?>
31
- <?php if ($this->getAdditionalData('NnTestOrder'))
32
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
 
 
 
 
33
  ?>
34
  <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
35
- <?php if ($_info->getLastTransId() != "") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())) ?>
36
- <?php if (strlen($this->getAdditionalData('NnComments'))) {
37
- echo '<br>', nl2br($this->getAdditionalData('NnComments'));
38
- } ?>
39
- <?php if (strlen($this->getAdditionalData('NnNote'))) {
40
- echo '<br>', nl2br($this->getAdditionalData('NnNote'));
41
- } ?>
42
- <?php if (strlen($this->getAdditionalData('NnNoteAmount'))) {
 
 
 
 
 
 
 
 
 
 
 
 
43
  echo nl2br($this->getAdditionalData('NnNoteAmount'));
44
- } ?>
45
- <?php if (strlen($this->getAdditionalData('NnNoteTID'))) {
 
 
46
  echo nl2br($this->getAdditionalData('NnNoteTID'));
47
- } ?>
48
- <?php if (strlen($this->getAdditionalData('NnNoteTransfer'))) {
49
- echo nl2br($this->getAdditionalData('NnNoteTransfer'));
50
- } ?>
51
- <?php if (strlen($this->getAdditionalData('NnScript'))) {
52
- echo '<br>', nl2br($this->getAdditionalData('NnScript'));
53
- } ?>
 
54
  <?php else: ?>
55
  <?php echo $this->__('Error in getting payment method') ?>
56
  <?php endif; ?>
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
+ *
21
  * @category Mage
22
  * @package Mage_Novalnet
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
26
  $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
+ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
+ ?>
31
+ <?php if ($_info): ?>
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->getPaymentMethod()) ?><br />
37
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
38
+ <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('Transaction deactivated successfully') . '<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 '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
43
+ else:
44
+ echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
45
+ endif;
46
+ endforeach;
47
+ endif;
48
+ ?>
49
+ <?php if (!preg_match("/creditmemo|shipment|callback_novalnet2magento/i", $currentUrl)) { ?>
50
+ <?php
51
+ if (strlen($this->getAdditionalData('NnNote'))) {
52
+ echo ($this->getAdditionalData('NnNote'));
53
+ }
54
+ ?>
55
+ <?php
56
+ if (strlen($this->getAdditionalData('NnNoteAmount'))) {
57
  echo nl2br($this->getAdditionalData('NnNoteAmount'));
58
+ }
59
+ ?>
60
+ <?php
61
+ if (strlen($this->getAdditionalData('NnNoteTID'))) {
62
  echo nl2br($this->getAdditionalData('NnNoteTID'));
63
+ }
64
+ ?>
65
+ <?php
66
+ if (strlen($this->getAdditionalData('NnComments'))) {
67
+ echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
68
+ }
69
+ ?>
70
+ <?php } ?>
71
  <?php else: ?>
72
  <?php echo $this->__('Error in getting payment method') ?>
73
  <?php endif; ?>
app/design/frontend/base/default/template/novalnet/payment/method/info/Paypal.phtml CHANGED
@@ -23,15 +23,15 @@
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
-
27
- $_info = $this->getInfo();
28
  if ($_info):
29
  ?>
30
- <?php if ($this->getAdditionalData('NnTestOrder'))
31
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
 
32
  ?>
33
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
34
- <?php if ($_info->getLastTransId() != "") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())) . '<br />' ?>
35
  <?php if ($this->getAdditionalData('NnComments')) { ?>
36
  <?php echo $this->getAdditionalData('NnComments') ?><br />
37
  <?php } ?>
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ $_info = $this->getInfo();
 
27
  if ($_info):
28
  ?>
29
+ <?php
30
+ if ($this->getAdditionalData('NnTestOrder'))
31
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
32
  ?>
33
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
34
+ <?php if ($_info->getLastTransId() != "") echo $this->__('Novalnet Transaction ID: %s', $this->htmlEscape($_info->getLastTransId())) . '<br />' ?>
35
  <?php if ($this->getAdditionalData('NnComments')) { ?>
36
  <?php echo $this->getAdditionalData('NnComments') ?><br />
37
  <?php } ?>
app/design/frontend/base/default/template/novalnet/payment/method/info/Phonepayment.phtml CHANGED
@@ -28,11 +28,12 @@
28
  $_info = $this->getInfo();
29
  if ($_info):
30
  ?>
31
- <?php if ($this->getAdditionalData('NnTestOrder'))
32
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
 
33
  ?>
34
  <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
35
- <?php if ($_info->getLastTransId() != "") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())) . '<br />' ?>
36
  <?php if ($this->getAdditionalData('NnComments')) { ?>
37
  <?php echo $this->getAdditionalData('NnComments') ?><br />
38
  <?php } ?>
28
  $_info = $this->getInfo();
29
  if ($_info):
30
  ?>
31
+ <?php
32
+ if ($this->getAdditionalData('NnTestOrder'))
33
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
34
  ?>
35
  <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
36
+ <?php if ($_info->getLastTransId() != "") echo $this->__('Novalnet Transaction ID: %s', $this->htmlEscape($_info->getLastTransId())) . '<br />' ?>
37
  <?php if ($this->getAdditionalData('NnComments')) { ?>
38
  <?php echo $this->getAdditionalData('NnComments') ?><br />
39
  <?php } ?>
app/design/frontend/base/default/template/novalnet/payment/method/info/Prepayment.phtml CHANGED
@@ -13,43 +13,61 @@
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * Part of the Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
- *
21
  * @category Mage
22
  * @package Mage_Novalnet
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
- ?>
27
- <?php
28
  $_info = $this->getInfo();
29
- if ($_info): ?>
30
- <?php if ($this->getAdditionalData('NnTestOrder'))
31
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
 
 
 
 
 
32
  ?>
33
  <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
34
- <?php if ($_info->getLastTransId() != "") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())) ?>
35
- <?php if (strlen($this->getAdditionalData('NnComments'))) {
36
- echo '<br>', nl2br($this->getAdditionalData('NnComments'));
37
- } ?>
38
- <?php if (strlen($this->getAdditionalData('NnNote'))) {
39
- echo '<br>', nl2br($this->getAdditionalData('NnNote'));
40
- } ?>
41
- <?php if (strlen($this->getAdditionalData('NnNoteAmount'))) {
 
 
 
 
 
 
 
 
 
 
 
 
42
  echo nl2br($this->getAdditionalData('NnNoteAmount'));
43
- } ?>
44
- <?php if (strlen($this->getAdditionalData('NnNoteTID'))) {
 
 
45
  echo nl2br($this->getAdditionalData('NnNoteTID'));
46
- } ?>
47
- <?php if (strlen($this->getAdditionalData('NnNoteTransfer'))) {
48
- echo nl2br($this->getAdditionalData('NnNoteTransfer'));
49
- } ?>
50
- <?php if (strlen($this->getAdditionalData('NnScript'))) {
51
- echo '<br>', nl2br($this->getAdditionalData('NnScript'));
52
- } ?>
 
53
  <?php else: ?>
54
  <?php echo $this->__('Error in getting payment method') ?>
55
  <?php endif; ?>
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
+ *
21
  * @category Mage
22
  * @package Mage_Novalnet
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
26
  $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
+ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
+ ?>
31
+ <?php if ($_info): ?>
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->getPaymentMethod()) ?><br />
37
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
38
+ <?php if ($this->getAdditionalData('voidTid')) echo '<br>' . $this->__('Transaction deactivated successfully') . '<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 '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
43
+ else:
44
+ echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
45
+ endif;
46
+ endforeach;
47
+ endif;
48
+ ?>
49
+ <?php if (!preg_match("/invoice|creditmemo|shipment|callback_novalnet2magento/i", $currentUrl)) { ?>
50
+ <?php
51
+ if (strlen($this->getAdditionalData('NnNote'))) {
52
+ echo ($this->getAdditionalData('NnNote'));
53
+ }
54
+ ?>
55
+ <?php
56
+ if (strlen($this->getAdditionalData('NnNoteAmount'))) {
57
  echo nl2br($this->getAdditionalData('NnNoteAmount'));
58
+ }
59
+ ?>
60
+ <?php
61
+ if (strlen($this->getAdditionalData('NnNoteTID'))) {
62
  echo nl2br($this->getAdditionalData('NnNoteTID'));
63
+ }
64
+ ?>
65
+ <?php
66
+ if (strlen($this->getAdditionalData('NnComments'))) {
67
+ echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
68
+ }
69
+ ?>
70
+ <?php } ?>
71
  <?php else: ?>
72
  <?php echo $this->__('Error in getting payment method') ?>
73
  <?php endif; ?>
app/design/frontend/base/default/template/novalnet/payment/method/info/Sepa.phtml CHANGED
@@ -18,22 +18,38 @@
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
- * @category Mage
22
- * @package Mage_Novalnet
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
  <?php
28
  $_info = $this->getInfo();
29
- if ($_info): ?>
30
- <?php if ($this->getAdditionalData('NnTestOrder'))
31
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!',$this->__('Testorder'),'!</div>' ?>
32
- <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
33
- <?php if ($_info->getLastTransId()!="") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())).'<br />' ?>
34
- <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments') ?>
35
- <?php if ($this->getAdditionalData('NnSepaDueDate')) echo $this->__('Mandate Signature Date : '). $this->getAdditionalData('NnSepaDueDate') ?><br />
36
- <?php if ($_info->getLastTransId()!="" && $this->getAdditionalData('NnSepaMandateUrl')) echo $this->__('Download your mandate').'<a href="'.$this->getAdditionalData('NnSepaMandateUrl').'">'.$this->__('Click here').'</a>'; ?>
37
- <?php else: ?>
38
- <?php echo $this->__('Error in getting payment method') ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
39
  <?php endif; ?>
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
  <?php
28
  $_info = $this->getInfo();
29
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
30
+ $helper = Mage::helper('novalnet_payment');
31
+ if ($_info):
32
+ ?>
33
+ <?php
34
+ if ($this->getAdditionalData('NnTestOrder'))
35
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
36
+ ?>
37
+ <?php echo $this->htmlEscape($this->getPaymentMethod()) ?><br />
38
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
39
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('Transaction deactivated successfully') . '<br><br>' ?>
40
+ <?php if ($this->getAdditionalData('refunded_tid')):
41
+ foreach($this->getAdditionalData('refunded_tid') as $key => $value):
42
+ if ($this->getAdditionalData('fullRefund') == true):
43
+ echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
44
+ elseif(preg_match("/refund/i", $value['reftid'])):
45
+ echo $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br><br>';
46
+ else:
47
+ 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>';
48
+ endif;
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/info/Sofortueberweisung.phtml CHANGED
@@ -23,15 +23,15 @@
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
-
27
- $_info = $this->getInfo();
28
  if ($_info):
29
  ?>
30
- <?php if ($this->getAdditionalData('NnTestOrder'))
31
- echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
 
32
  ?>
33
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
34
- <?php if ($_info->getLastTransId() != "") echo $this->__('TID: %s', $this->htmlEscape($_info->getLastTransId())) . '<br />' ?>
35
  <?php if ($this->getAdditionalData('NnComments')) { ?>
36
  <?php echo $this->getAdditionalData('NnComments') ?><br />
37
  <?php } ?>
23
  * @copyright Novalnet AG
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ $_info = $this->getInfo();
 
27
  if ($_info):
28
  ?>
29
+ <?php
30
+ if ($this->getAdditionalData('NnTestOrder'))
31
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
32
  ?>
33
  <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
34
+ <?php if ($_info->getLastTransId() != "") echo $this->__('Novalnet Transaction ID: %s', $this->htmlEscape($_info->getLastTransId())) . '<br />' ?>
35
  <?php if ($this->getAdditionalData('NnComments')) { ?>
36
  <?php echo $this->getAdditionalData('NnComments') ?><br />
37
  <?php } ?>
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Cc.phtml ADDED
@@ -0,0 +1,43 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
+ ?>
30
+ <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
31
+ <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
32
+ <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br>'; ?>{{pdf_row_separator}}
33
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('Transaction deactivated successfully') . '<br><br>' ?>{{pdf_row_separator}}
34
+ <?php if ($this->getAdditionalData('refunded_tid')):
35
+ foreach($this->getAdditionalData('refunded_tid') as $key => $value):
36
+ if ($this->getAdditionalData('fullRefund') == true):
37
+ echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
38
+ else:
39
+ echo $this->__('New Tid: %s', $helper->makeValidNumber($value['reftid'])) . ' ' . $this->__('for the refunded amount %s', $value['refamount']) . '<br><br>';
40
+ endif;
41
+ endforeach;
42
+ endif;
43
+ ?>{{pdf_row_separator}}
app/design/{adminhtml/default/default/template/novalnet/payment/method/pdf/Ccsecure.phtml → frontend/base/default/template/novalnet/payment/method/pdf/Ideal.phtml} RENAMED
@@ -25,5 +25,5 @@
25
  */
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
- <strong><?php echo Mage::helper('novalnet_payment')->__('%s',$this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
- <?php echo Mage::helper('novalnet_payment')->__('TID: %s',$this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
25
  */
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
+ <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
+ <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Invoice.phtml ADDED
@@ -0,0 +1,66 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
+ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
+ ?>
31
+ <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
32
+ <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
33
+ <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br>'; ?>{{pdf_row_separator}}
34
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('Transaction deactivated successfully') ?>{{pdf_row_separator}}
35
+ <?php if ($this->getAdditionalData('refunded_tid')):
36
+ foreach($this->getAdditionalData('refunded_tid') as $key => $value):
37
+ if ($this->getAdditionalData('fullRefund') == true):
38
+ echo '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
39
+ else:
40
+ echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
41
+ endif;
42
+ endforeach;
43
+ endif;
44
+ ?>{{pdf_row_separator}}
45
+ <?php if (!preg_match("/creditmemo|shipment|callback_novalnet2magento/i", $currentUrl)) { ?>
46
+ <?php
47
+ if (strlen($this->getAdditionalData('NnNote'))) {
48
+ echo $this->getAdditionalData('NnNote');
49
+ }
50
+ ?>{{pdf_row_separator}}
51
+ <?php
52
+ if (strlen($this->getAdditionalData('NnNoteAmount'))) {
53
+ echo $this->getAdditionalData('NnNoteAmount');
54
+ }
55
+ ?>{{pdf_row_separator}}
56
+ <?php
57
+ if (strlen($this->getAdditionalData('NnNoteTID'))) {
58
+ echo $this->getAdditionalData('NnNoteTID');
59
+ }
60
+ ?>{{pdf_row_separator}}
61
+ <?php
62
+ if (strlen($this->getAdditionalData('NnComments'))) {
63
+ echo $this->getAdditionalData('NnComments');
64
+ }
65
+ ?>{{pdf_row_separator}}
66
+ <?php } ?>
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Paypal.phtml ADDED
@@ -0,0 +1,34 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ ?>
27
+ <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
+ <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
+ <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
30
+ <?php
31
+ if (strlen($this->getAdditionalData('NnComments'))) {
32
+ echo $this->getAdditionalData('NnComments');
33
+ }
34
+ ?>{{pdf_row_separator}}
app/design/{adminhtml/default/default/template/novalnet/payment/method/pdf/Elvaustria.phtml → frontend/base/default/template/novalnet/payment/method/pdf/Phonepayment.phtml} RENAMED
@@ -25,5 +25,5 @@
25
  */
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
- <strong><?php echo Mage::helper('novalnet_payment')->__('%s',$this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
- <?php echo Mage::helper('novalnet_payment')->__('TID: %s',$this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
25
  */
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
+ <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
+ <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Prepayment.phtml ADDED
@@ -0,0 +1,66 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
+ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
+ ?>
31
+ <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
32
+ <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
33
+ <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br>'; ?>{{pdf_row_separator}}
34
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('Transaction deactivated successfully') ?>{{pdf_row_separator}}
35
+ <?php if ($this->getAdditionalData('refunded_tid')):
36
+ foreach($this->getAdditionalData('refunded_tid') as $key => $value):
37
+ if ($this->getAdditionalData('fullRefund') == true):
38
+ echo '<br>' . $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reqtid'])) . '<br>';
39
+ else:
40
+ echo '<br>' . $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br>';
41
+ endif;
42
+ endforeach;
43
+ endif;
44
+ ?>{{pdf_row_separator}}
45
+ <?php if (!preg_match("/invoice|creditmemo|shipment|callback_novalnet2magento/i", $currentUrl)) { ?>
46
+ <?php
47
+ if (strlen($this->getAdditionalData('NnNote'))) {
48
+ echo $this->getAdditionalData('NnNote');
49
+ }
50
+ ?>{{pdf_row_separator}}
51
+ <?php
52
+ if (strlen($this->getAdditionalData('NnNoteAmount'))) {
53
+ echo $this->getAdditionalData('NnNoteAmount');
54
+ }
55
+ ?>{{pdf_row_separator}}
56
+ <?php
57
+ if (strlen($this->getAdditionalData('NnNoteTID'))) {
58
+ echo $this->getAdditionalData('NnNoteTID');
59
+ }
60
+ ?>{{pdf_row_separator}}
61
+ <?php
62
+ if (strlen($this->getAdditionalData('NnComments'))) {
63
+ echo $this->getAdditionalData('NnComments');
64
+ }
65
+ ?>{{pdf_row_separator}}
66
+ <?php } ?>
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Sepa.phtml ADDED
@@ -0,0 +1,45 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Mage
22
+ * @package Mage_Novalnet
23
+ * @copyright Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
+ ?>
30
+ <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
31
+ <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
32
+ <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br>'; ?>{{pdf_row_separator}}
33
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('Transaction deactivated successfully') . '<br><br>' ?>{{pdf_row_separator}}
34
+ <?php if ($this->getAdditionalData('refunded_tid')):
35
+ foreach($this->getAdditionalData('refunded_tid') as $key => $value):
36
+ if ($this->getAdditionalData('fullRefund') == true):
37
+ echo $this->__('Refunded Transaction ID: %s', $helper->makeValidNumber($value['reftid'])) . '<br><br>';
38
+ elseif(preg_match("/refund/i", $value['reftid'])):
39
+ echo $this->__('For Tid: %s', $helper->makeValidNumber($value['reqtid'])) . ' ' . $this->__('amount refunded is %s', $value['refamount']) . '<br><br>';
40
+ else:
41
+ 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>';
42
+ endif;
43
+ endforeach;
44
+ endif;
45
+ ?>{{pdf_row_separator}}
app/design/{adminhtml/default/default/template/novalnet/payment/method/pdf/Elvgerman.phtml → frontend/base/default/template/novalnet/payment/method/pdf/Sofortueberweisung.phtml} RENAMED
@@ -25,5 +25,5 @@
25
  */
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
- <strong><?php echo Mage::helper('novalnet_payment')->__('%s',$this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
- <?php echo Mage::helper('novalnet_payment')->__('TID: %s',$this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
25
  */
26
  ?>
27
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
28
+ <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
29
+ <?php echo Mage::helper('novalnet_payment')->__('Novalnet Transaction ID: %s', $this->getInfo()->getLastTransId()) ?>{{pdf_row_separator}}
app/design/frontend/default/default/template/novalnet/payment/method/form/Cc.phtml CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  /**
4
  * Magento
5
  *
@@ -28,22 +27,30 @@
28
  * For Custom Style
29
  */
30
 
31
- include(MAGENTO_ROOT.'/novalnet_css_link.php');
32
 
33
  $code = $this->getMethodCode();
34
  $helper = Mage::helper('novalnet_payment');
35
- $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
36
- $ccError = $this->getMethod()->getConfigData('cc_error');
37
  ?>
38
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
39
  <!--{{{ Payment Logo -->
40
- <div>
41
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
42
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "creditcard_small.jpg" ?>
43
- <img style="height:20px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->_getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
44
- </a>
45
- <!-- Amex Logo -->
46
- </div>
 
 
 
 
 
 
 
 
47
  <!--}}} Payment Logo -->
48
  <!--{{{ Novalnet Cc Form -->
49
  <div id="payment_form_<?php echo $code ?>" style="display:none;">
@@ -56,60 +63,72 @@ $ccError = $this->getMethod()->getConfigData('cc_error');
56
  <img src="<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif" alt="Loading" />
57
  </div>
58
  <iframe frameborder="0" name="ifm_payment_form_<?php echo $code ?>" id="ifm_payment_form_<?php echo $code ?>"
59
- style="width: 603px; height: 320px; border: none; display: block; margin-top: 5px;" onload="document.getElementById('nncc_loading').style.display = 'none'" src="<?php echo $helper->getUrl('novalnet_payment/NovalnetCc') ?>" >
60
  </iframe>
61
  <ul>
62
- <!--{{{ CallbackType-->
63
- <?php if ($this->isCallbackTypeCall()): ?>
64
- <!--{{{ PIN by Callback-->
65
- <?php if ($this->getCallbackConfigData() != 3): ?>
66
- <li>
67
- <div class="input-box">
68
- <label style="float:none;" for="<?php echo $code ?>_callback_tel">
69
- <?php if ($this->getCallbackConfigData() == 2): ?>
70
- <?php echo $this->__('Mobile phone number'); ?>
71
- <?php else: ?>
72
- <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
73
- <?php endif; ?>
74
- <span class="required">*</span></label><br/>
75
- <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" value="<?php echo $ccError ? $assignDatahelper->_getCheckout()->getNnCallbackTelNovalnetCc() : '';?>"/>
76
- </div>
77
- </li>
78
- <li>
79
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
80
- <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze eine PIN per Telefon-/Handyrückruf oder SMS.') ?>
81
- </div>
82
- <div class="input-box">
83
- <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
84
- <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/>
85
- <input id="new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
86
- <label style="float:none;" for="new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
87
- </div>
88
- </li>
89
- <!--}}} PIN by Callback-->
90
- <!--{{{ Reply by Email-->
91
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
92
- <li>
93
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
94
- <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze ein EMAIL, das Sie sofort ohne änderung des Mailtexts beantworten müssen.') ?>
95
- </div>
96
- <div class="input-box">
97
- <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
98
- <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 $ccError ? $assignDatahelper->_getCheckout()->getNnCallbackEmailNovalnetCc() : '';?>"/>
99
- </div>
100
- </li>
101
- <?php endif ?>
102
- <!--}}} Reply by Email-->
103
- <?php endif ?>
104
- <!--}}} CallbackType-->
105
- </ul>
 
 
 
 
 
 
 
 
 
 
 
 
106
  <?php endif; ?>
107
  </div>
108
 
109
  <input type="hidden" id="original_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>" />
110
  <input type="hidden" id="original_vendor_authcode" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>" />
111
- <input type="hidden" id="original_customstyle_css" value="<?php echo NOVALNET_CC_CUSTOM_CSS; ?>" />
112
- <input type="hidden" id="original_customstyle_cssval" value="<?php echo NOVALNET_CC_CUSTOM_CSS_STYLE; ?>" />
113
 
114
  <input type="hidden" name="novalnet_cc_owner" id="novalnet_cc_owner" value="" />
115
  <input type="hidden" name="novalnet_cc_type" id="novalnet_cc_type" value="" />
1
  <?php
 
2
  /**
3
  * Magento
4
  *
27
  * For Custom Style
28
  */
29
 
30
+ include(Mage::getBaseDir('base') . '/novalnet_css_link.php');
31
 
32
  $code = $this->getMethodCode();
33
  $helper = Mage::helper('novalnet_payment');
34
+ $ccRefill = $this->getMethod()->getConfigData('cc_refill');
35
+ $creditCardSecure = $this->getMethod()->getConfigData('active_cc3d');
36
  ?>
37
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
38
  <!--{{{ Payment Logo -->
39
+ <div>
40
+ <!-- Amex Logo -->
41
+ <?php if ($this->getMethod()->_getConfigData('enable_amex_logo')): ?>
42
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
43
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl()."creditcard_amex.png" ?>
44
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>"
45
+ title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
46
+ </a>
47
+ <?php else: ?>
48
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
49
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "creditcard_small.png" ?>
50
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->_getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
51
+ </a>
52
+ <?php endif; ?>
53
+ </div>
54
  <!--}}} Payment Logo -->
55
  <!--{{{ Novalnet Cc Form -->
56
  <div id="payment_form_<?php echo $code ?>" style="display:none;">
63
  <img src="<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif" alt="Loading" />
64
  </div>
65
  <iframe frameborder="0" name="ifm_payment_form_<?php echo $code ?>" id="ifm_payment_form_<?php echo $code ?>"
66
+ scrolling= "no" style="width: 603px; height: 270px; border: none; display: block; margin-top: 5px;" onload="novalnet_cc_iframe(this)" src="<?php echo $helper->getUrl('novalnet_payment/NovalnetCc') ?>" >
67
  </iframe>
68
  <ul>
69
+ <!--{{{ CallbackType-->
70
+ <?php if (!$creditCardSecure && $this->isCallbackTypeCall()): ?>
71
+ <!--{{{ PIN by Callback-->
72
+ <?php
73
+ if ($this->getCallbackConfigData() != 3):
74
+ ?>
75
+ <li>
76
+ <div class="input-box">
77
+ <label style="float:none;" for="<?php echo $code ?>_callback_tel">
78
+ <?php
79
+ if ($this->getCallbackConfigData() == 2):
80
+ ?>
81
+ <?php echo $this->__('Mobile phone number'); ?>
82
+ <?php else: ?>
83
+ <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
84
+ <?php endif; ?>
85
+ <span class="required">*</span></label><br/>
86
+ <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" value="<?php
87
+ echo $ccRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackTelNovalnetCc()
88
+ : '';
89
+ ?>"/>
90
+ </div>
91
+ </li>
92
+ <li>
93
+ <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
94
+ <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze eine PIN per Telefon-/Handyrückruf oder SMS.') ?>
95
+ </div>
96
+ <div class="input-box">
97
+ <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
98
+ <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/>
99
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
100
+ <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
101
+ </div>
102
+ </li>
103
+ <!--}}} PIN by Callback-->
104
+ <!--{{{ Reply by Email-->
105
+ <?php
106
+ elseif ($this->getCallbackConfigData() == 3):
107
+ ?>
108
+ <li>
109
+ <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
110
+ <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze ein EMAIL, das Sie sofort ohne änderung des Mailtexts beantworten müssen.') ?>
111
+ </div>
112
+ <div class="input-box">
113
+ <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
114
+ <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
115
+ echo $ccRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackEmailNovalnetCc()
116
+ : '';
117
+ ?>"/>
118
+ </div>
119
+ </li>
120
+ <?php endif ?>
121
+ <!--}}} Reply by Email-->
122
+ <?php endif ?>
123
+ <!--}}} CallbackType-->
124
+ </ul>
125
  <?php endif; ?>
126
  </div>
127
 
128
  <input type="hidden" id="original_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>" />
129
  <input type="hidden" id="original_vendor_authcode" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>" />
130
+ <input type="hidden" id="original_customstyle_css" value="<?php echo NOVALNET_CC_CUSTOM_CSS; ?>" />
131
+ <input type="hidden" id="original_customstyle_cssval" value="<?php echo NOVALNET_CC_CUSTOM_CSS_STYLE; ?>" />
132
 
133
  <input type="hidden" name="novalnet_cc_owner" id="novalnet_cc_owner" value="" />
134
  <input type="hidden" name="novalnet_cc_type" id="novalnet_cc_type" value="" />
app/design/frontend/default/default/template/novalnet/payment/method/form/Ccform.phtml CHANGED
@@ -27,50 +27,6 @@
27
  <?php
28
  $_code = Novalnet_Payment_Model_Config::NN_CC;
29
  ?>
30
- <script type="text/javascript">
31
- function updateHiddenElements(elements) {
32
-
33
- var cc_type=0; var cc_owner=0; var cc_no=0; var cc_hash=0; var cc_month=0; var cc_year=0; var cc_cid=0;
34
- if(document.getElementById("novalnetCc_cc_type").value!= '') cc_type=1;
35
- if(document.getElementById("novalnetCc_cc_owner").value!= '') cc_owner=1;
36
- if(document.getElementById("novalnetCc_cc_number").value!= '') cc_no=1;
37
- if(document.getElementById("novalnetCc_expiration").value!= '') cc_month = 1;
38
- if(document.getElementById("novalnetCc_expiration_yr").value!= '') cc_year = 1;
39
- if(document.getElementById("novalnetCc_cc_cid").value!= '') cc_cid=1;
40
-
41
- var novalnet_cc_field_validator = cc_type+','+cc_owner+','+cc_no+','+cc_month+','+cc_year+','+cc_cid;
42
-
43
- for (var i=0; i<elements.length; i++) {
44
- switch (elements[i].name) {
45
- case 'novalnet_cc_field_validator':
46
- elements[i].value = novalnet_cc_field_validator;
47
- break;
48
- case 'novalnet_cc_owner':
49
- elements[i].value = document.getElementById('<?php echo $_code ?>_cc_owner').value;
50
- break;
51
- case 'novalnet_cc_type':
52
- elements[i].value = document.getElementById('<?php echo $_code ?>_cc_type').value;
53
- break;
54
- case 'novalnet_cc_pan_hash':
55
- elements[i].value = document.getElementById('nncc_cardno_id').value;
56
- break;
57
- case 'novalnet_cc_unique_id':
58
- elements[i].value = document.getElementById('nncc_unique_id').value;
59
- break;
60
- case 'novalnet_cc_exp_month':
61
- elements[i].value = document.getElementById('<?php echo $_code ?>_expiration').value;
62
- break;
63
- case 'novalnet_cc_exp_year':
64
- elements[i].value = document.getElementById('<?php echo $_code ?>_expiration_yr').value;
65
- break;
66
- case 'novalnet_cc_cid':
67
- elements[i].value = document.getElementById('<?php echo $_code ?>_cc_cid').value;
68
- break;
69
- }
70
- }
71
- return true;
72
- }
73
- </script>
74
  <!--{{{ Payment Description -->
75
  <ul>
76
  <li style="margin: 0 0 8px;">
@@ -79,7 +35,10 @@ $_code = Novalnet_Payment_Model_Config::NN_CC;
79
  <li style="margin: 0 0 8px;">
80
  <?php echo Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('booking_reference') ?>
81
  </li>
82
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('live_mode', true) == 0): ?>
 
 
 
83
  <li style="margin: 0 0 8px;">
84
  <div style="font-weight:bold;color:red;font-size:12px;">
85
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
27
  <?php
28
  $_code = Novalnet_Payment_Model_Config::NN_CC;
29
  ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
30
  <!--{{{ Payment Description -->
31
  <ul>
32
  <li style="margin: 0 0 8px;">
35
  <li style="margin: 0 0 8px;">
36
  <?php echo Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('booking_reference') ?>
37
  </li>
38
+ <?php
39
+ if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('live_mode', true)
40
+ == 0):
41
+ ?>
42
  <li style="margin: 0 0 8px;">
43
  <div style="font-weight:bold;color:red;font-size:12px;">
44
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
app/design/frontend/default/default/template/novalnet/payment/method/form/Ccsecure.phtml DELETED
@@ -1,117 +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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- ?>
27
- <?php
28
- $code = $this->getMethodCode();
29
- $helper = Mage::helper('novalnet_payment');
30
- $novalnetSecureError = $this->getMethod()->getConfigData('novalnetSecure_error');
31
- ?>
32
- <fieldset class="form-list">
33
- <!--{{{ Payment Logo -->
34
- <div>
35
- <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
36
- <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
37
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $_typeCode . "_Logo.png"; ?>
38
- <img style="height:20px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
- <?php endforeach; ?>
40
- </a>
41
- </div>
42
- <!--}}} Payment Logo -->
43
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
44
- <li>
45
- <?php echo $helper->__('The amount will be booked immediately from your credit card.') ?>
46
- </li>
47
- <?php if ($this->getUserInfo()): ?>
48
- <li>
49
- <?php echo $this->getUserInfo() ?>
50
- </li>
51
- <?php endif ?>
52
- <?php if ($this->getLiveMode() == 0): ?>
53
- <li>
54
- <div style="font-weight:bold;color:red;font-size:12px;">
55
- <?php echo $helper->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
56
- </div>
57
- </li>
58
- <?php endif ?>
59
- <li>
60
- <div class="input-box">
61
- <label style="float:none;" for="<?php echo $code ?>_cc_type"><?php echo $this->__('Credit Card Type') ?><span class="required">*</span></label><br />
62
- <select id="<?php echo $code ?>_cc_type" name="payment[nn_cc_type]" class="required-entry validate-cc-type-select">
63
- <option value=""><?php echo $this->__('--Please Select--') ?></option>
64
- <?php $_ccType = Mage::helper('core')->decrypt($helper->_getCheckoutSession()->getNnCcType()) ?>
65
- <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
66
- <option value="<?php echo $_typeCode ?>"<?php if($_typeCode==$_ccType && $novalnetSecureError): ?> selected="selected"<?php endif ?>><?php echo $_typeName ?></option>
67
- <?php endforeach; ?>
68
- </select>
69
- </div>
70
- </li>
71
- <li>
72
- <div class="input-box">
73
- <label style="float:none;" for="<?php echo $code ?>_cc_owner"><?php echo $this->__('Credit card holder') ?><span class="required">*</span></label><br/>
74
- <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_cc_owner" name="payment[nn_cc_owner]" autocomplete="off" value="<?php echo $novalnetSecureError ? Mage::helper('core')->decrypt($helper->_getCheckoutSession()->getNnCcOwner()) : '';?>" />
75
- </div>
76
- </li>
77
- <li>
78
- <div class="input-box">
79
- <label style="float:none;" for="<?php echo $code ?>_cc_number"><?php echo $this->__('Card number') ?><span class="required">*</span></label><br/>
80
- <input type="text" id="<?php echo $code ?>_cc_number" name="payment[nn_cc_number]" title="<?php echo $this->__('Credit Card Number') ?>" class="required-entry input-text validate-cc-number validate-cc-type" autocomplete="off" value="<?php echo $novalnetSecureError ? Mage::helper('core')->decrypt($helper->_getCheckoutSession()->getNnCcNumber()) : '';?>" />
81
- </div>
82
- </li>
83
- <li>
84
- <div class="input-box">
85
- <label style="float:none;" for="<?php echo $code ?>_expiration"><?php echo $this->__('Cc Expiration Date') ?><span class="required">*</span></label><br />
86
- <div class="v-fix">
87
- <select id="<?php echo $code ?>_expiration" style="width:140px;" name="payment[nn_cc_exp_month]" class="required-entry">
88
- <option value=""><?php echo $this->__('Month'); ?></option>
89
- <?php $_ccExpMonth = Mage::helper('core')->decrypt($helper->_getCheckoutSession()->getNnCcExpMonth()) ?>
90
- <?php foreach ($this->getCcMonths() as $k => $v): ?>
91
- <option value="<?php echo $k ?>"<?php if($k==$_ccExpMonth && $novalnetSecureError): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
92
- <?php endforeach; ?>
93
- </select>
94
- </div>
95
- <div class="v-fix" style="padding-left:5px;">
96
- <select id="<?php echo $code ?>_expiration_yr" style="width:103px;" name="payment[nn_cc_exp_year]" class="required-entry">
97
- <option value=""><?php echo $this->__('Year'); ?></option>
98
- <?php $_ccExpYear = Mage::helper('core')->decrypt($helper->_getCheckoutSession()->getNnCcExpYear()) ?>
99
- <?php foreach ($this->getCcYears() as $k => $v): ?>
100
- <option value="<?php echo $k ?>"<?php if($k==$_ccExpYear && $novalnetSecureError): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
101
- <?php endforeach; ?>
102
- </select>
103
- </div>
104
- </div>
105
- </li>
106
- <?php if ($this->hasVerification()): ?>
107
- <li>
108
- <div class="input-box">
109
- <label style="float:none;" for="<?php echo $code ?>_cc_cid"><?php echo $this->__('Cc Card Verification Number') ?><span class="required">*</span></label><br />
110
- <div class="v-fix"><input type="text" title="<?php echo $this->__('Card Verification Number') ?>" class="required-entry input-text validate-cc-cvn" id="<?php echo $code ?>_cc_cid" name="payment[nn_cc_cid]" style="width:3em;" autocomplete="off" maxlength="4" /></div>
111
- &nbsp;
112
- <a href="#" class="cvv-what-is-this"><?php echo $this->__('What is this?') ?></a>
113
- </div>
114
- </li>
115
- <?php endif; ?>
116
- </ul>
117
- </fieldset>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/default/default/template/novalnet/payment/method/form/Elvaustria.phtml DELETED
@@ -1,124 +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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- ?>
27
- <?php
28
- $code = $this->getMethodCode();
29
- $helper = Mage::helper('novalnet_payment');
30
- $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
31
- $elvastriaError = $this->getMethod()->getConfigData('elvastria_error');
32
- ?>
33
- <fieldset class="form-list">
34
- <div>
35
- <!--{{{ Payment Logo -->
36
- <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
37
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "ELV_Logo.png"; ?>
38
- <img style="height:20px;" src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
39
- </a>
40
- <!--}}} Payment Logo -->
41
- </div>
42
- <!--{{{ ELVAT Form -->
43
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
44
- <!--{{{ Payment Description -->
45
- <li style="padding-top: 0.5em;">
46
- <?php echo $this->__('Your account will be debited upon delivery of goods.') ?>
47
- </li>
48
- <!--}}} Payment Description -->
49
- <?php if ($this->getUserInfo()): ?>
50
- <li>
51
- <?php echo $this->getUserInfo() ?>
52
- </li>
53
- <?php endif ?>
54
- <?php if ($this->getLiveMode() == 0): ?>
55
- <li>
56
- <div style="font-weight:bold;color:red;font-size:12px;">
57
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
58
- </div>
59
- </li>
60
- <?php endif ?>
61
- <li>
62
- <div class="input-box">
63
- <label style="float:none;" for="<?php echo $code ?>_account_holder"><?php echo $this->__('Account Holder') ?><span class="required">*</span></label><br/>
64
- <input type="text" value="<?php echo $elvastriaError ? $assignDatahelper->_getCheckout()->getElvAtAccountHolder(): '';?>"id="<?php echo $code ?>_account_holder" name="payment[account_holder_at]" title="<?php echo $this->__('Account Holder') ?>" class="required-entry input-text" autocomplete="off" />
65
- </div>
66
- </li>
67
- <li>
68
- <div class="input-box">
69
- <label style="float:none;" for="<?php echo $code ?>_account_number"><?php echo $this->__('NnAccount number') ?><span class="required">*</span></label><br/>
70
- <input type="text" value="<?php echo $elvastriaError ? $assignDatahelper->_getCheckout()->getElvAtAccountNumber(): '';?>"id="<?php echo $code ?>_account_number" name="payment[account_number_at]" title="<?php echo $this->__('NnAccount Number') ?>" class="required-entry input-text" autocomplete="off" />
71
- </div>
72
- </li>
73
- <li>
74
- <div class="input-box">
75
- <label style="float:none;" for="<?php echo $code ?>_bank_sorting_code"><?php echo $this->__('Bank Sorting Code') ?><span class="required">*</span></label><br/>
76
- <input type="text" value="<?php echo $elvastriaError ? $assignDatahelper->_getCheckout()->getElvAtBankSortingCode() : '';?>" id="<?php echo $code ?>_bank_sorting_code" name="payment[bank_sorting_code_at]" title="<?php echo $this->__('Bank Sorting Code') ?>" class="required-entry input-text" autocomplete="off" />
77
- </div>
78
- </li>
79
- <!--{{{ CallbackType-->
80
- <?php if ($this->isCallbackTypeCall()): ?>
81
- <!--{{{ PIN by Callback-->
82
- <?php if ($this->getCallbackConfigData() != 3): ?>
83
- <li>
84
- <div class="input-box">
85
- <label style="float:none;" for="<?php echo $code ?>_callback_tel">
86
- <?php if ($this->getCallbackConfigData() == 2): ?>
87
- <?php echo $this->__('Mobile phone number'); ?>
88
- <?php else: ?>
89
- <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
90
- <?php endif; ?>
91
- <span class="required">*</span></label><br/>
92
- <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" value="<?php echo $elvastriaError ? $assignDatahelper->_getCheckout()->getNnCallbackTelNovalnetElvaustria(): '';?>"/>
93
- </div>
94
- </li>
95
- <li>
96
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
97
- <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze eine PIN per Telefon-/Handyrückruf oder SMS.') ?>
98
- </div>
99
- <div class="input-box">
100
- <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
101
- <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/>
102
- <input id="new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
103
- <label style="float:none;" for="new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
104
- </div>
105
- </li>
106
- <!--}}} PIN by Callback-->
107
- <!--{{{ Reply by Email-->
108
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
109
- <li>
110
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
111
- <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze ein EMAIL, das Sie sofort ohne änderung des Mailtexts beantworten müssen.') ?>
112
- </div>
113
- <div class="input-box">
114
- <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
115
- <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 $elvastriaError ? $assignDatahelper->_getCheckout()->getNnCallbackEmailNovalnetElvaustria(): '';?>"/>
116
- </div>
117
- </li>
118
- <?php endif ?>
119
- <!--}}} Reply by Email-->
120
- <?php endif ?>
121
- <!--}}} CallbackType-->
122
- </ul>
123
- <!-- ELVAT Form -->
124
- </fieldset>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/default/default/template/novalnet/payment/method/form/Elvgerman.phtml DELETED
@@ -1,148 +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 Paymentmodule of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script usefull a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Novalnet AG
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- ?>
27
- <?php
28
- $code = $this->getMethodCode();
29
- $helper = Mage::helper('novalnet_payment');
30
- $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
31
- $elvgermanError = $this->getMethod()->getConfigData('elvgerman_error');
32
- ?>
33
- <fieldset class="form-list">
34
- <div>
35
- <!--{{{ Payment Logo -->
36
- <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
37
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "ELV_Logo.png"; ?>
38
- <img style="height:20px;" src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
39
- </a>
40
- <!--}}} Payment Logo -->
41
- </div>
42
- <!--{{{ ELVDE Form -->
43
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
44
- <!--{{{ Payment Description -->
45
- <li style="padding-top: 0.5em;">
46
- <?php echo $this->__('Your account will be debited upon delivery of goods.') ?>
47
- </li>
48
- <!--}}} Payment Description -->
49
- <?php if ($this->getUserInfo()): ?>
50
- <li>
51
- <?php echo $this->getUserInfo() ?>
52
- </li>
53
- <?php endif ?>
54
- <?php if ($this->getLiveMode() == 0): ?>
55
- <li>
56
- <div style="font-weight:bold;color:red;font-size:12px;">
57
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
58
- </div>
59
- </li>
60
- <?php endif ?>
61
- <li>
62
- <div class="input-box">
63
- <label style="float:none;" for="<?php echo $code ?>_account_holder"><?php echo $this->__('Account Holder') ?><span class="required">*</span></label><br/>
64
- <input type="text" value="<?php echo $elvgermanError ? $assignDatahelper->_getCheckout()->getElvDeAccountHolder() : '';?>" id="<?php echo $code ?>_account_holder" name="payment[account_holder]" title="<?php echo $this->__('Account Holder') ?>" class="required-entry input-text" autocomplete="off" />
65
- </div>
66
- </li>
67
- <li>
68
- <div class="input-box">
69
- <label style="float:none;" for="<?php echo $code ?>_account_number"><?php echo $this->__('NnAccount number') ?><span class="required">*</span></label><br/>
70
- <input type="text" value="<?php echo $elvgermanError ? $assignDatahelper->_getCheckout()->getElvDeAccountNumber() : '';?>" id="<?php echo $code ?>_account_number" name="payment[account_number]" title="<?php echo $this->__('NnAccount Number') ?>" class="required-entry input-text" autocomplete="off" />
71
- </div>
72
- </li>
73
- <li>
74
- <div class="input-box">
75
- <label style="float:none;" for="<?php echo $code ?>_bank_sorting_code"><?php echo $this->__('Bank Sorting Code') ?><span class="required">*</span></label><br/>
76
- <input type="text" value="<?php echo $elvgermanError ? $assignDatahelper->_getCheckout()->getElvDeBankSortingCode() : '';?>" id="<?php echo $code ?>_bank_sorting_code" name="payment[bank_sorting_code]" title="<?php echo $this->__('Bank Sorting Code') ?>" class="required-entry input-text" autocomplete="off" />
77
- </div>
78
- </li>
79
- <!--{{{ ACDC check-->
80
- <?php if ($this->getAcdc()): ?>
81
- <li>
82
- <div class="input-box">
83
- <input type="checkbox" id="<?php echo $code ?>_acdc" name="payment[acdc]" title="<?php echo $this->__('acdc') ?>" class="required-entry" />
84
- <label style="float:none;" id="elvde_acdc" for="<?php echo $code ?>_acdc"><b><a><?php echo $this->__('Please enable ACDC Check.') ?></a></b>&nbsp;<span class="required">*</span></label>
85
- </div>
86
- </li>
87
- <script type="text/javascript">
88
- var showbaby;
89
-
90
- //ACDC Info
91
- $("elvde_acdc").observe('mouseover', function() {
92
- var url = parent.location.href;
93
- url = '<?php echo $helper->getNovalnetPaymentFormLogoUrl(); ?>acdc_info.png';w='550';h='300';x=screen.availWidth/2-w/2;y=screen.availHeight/2-h/2;
94
- showbaby = window.open(url,'showbaby','toolbar=0,location=0,directories=0,status=0,menubar=0,resizable=1,width='+w+',height='+h+',left='+x+',top='+y+',screenX='+x+',screenY='+y);
95
- showbaby.focus();
96
- });
97
-
98
- //Hide ACDC info
99
- function hide_acdc_info() { showbaby.close(); }
100
- </script>
101
- <?php endif ?>
102
- <!--}}} ACDC check-->
103
- <!--{{{ CallbackType-->
104
- <?php if ($this->isCallbackTypeCall()): ?>
105
- <!--{{{ PIN by Callback-->
106
- <?php if ($this->getCallbackConfigData() != 3): ?>
107
- <li>
108
- <div class="input-box">
109
- <label style="float:none;" for="<?php echo $code ?>_callback_tel">
110
- <?php if ($this->getCallbackConfigData() == 2): ?>
111
- <?php echo $this->__('Mobile phone number'); ?>
112
- <?php else: ?>
113
- <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
114
- <?php endif; ?>
115
- <span class="required">*</span></label><br/>
116
- <input type="text" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text" autocomplete="off" value="<?php echo $elvgermanError ? $assignDatahelper->_getCheckout()->getNnCallbackTelNovalnetElvgerman() : '';?>"/>
117
- </div>
118
- </li>
119
- <li>
120
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
121
- <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze eine PIN per Telefon-/Handyrückruf oder SMS.') ?>
122
- </div>
123
- <div class="input-box">
124
- <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
125
- <input onchange="document.getElementById('de_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" autocomplete="off" /><br/>
126
- <input id="de_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
127
- <label style="float:none;" for="de_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
128
- </div>
129
- </li>
130
- <!--}}} PIN by Callback-->
131
- <!--{{{ Reply by Email-->
132
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
133
- <li>
134
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
135
- <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze ein EMAIL, das Sie sofort ohne änderung des Mailtexts beantworten müssen.') ?>
136
- </div>
137
- <div class="input-box">
138
- <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
139
- <input type="text" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" autocomplete="off" value="<?php echo $elvgermanError ? $assignDatahelper->_getCheckout()->getNnCallbackEmailNovalnetElvgerman() : '';?>"/>
140
- </div>
141
- </li>
142
- <?php endif ?>
143
- <!--}}} Reply by Email-->
144
- <?php endif ?>
145
- <!--}}} CallbackType-->
146
- </ul>
147
- <!-- ELVDE Form -->
148
- </fieldset>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/default/default/template/novalnet/payment/method/form/Ideal.phtml CHANGED
@@ -33,9 +33,11 @@ $helper = Mage::helper('novalnet_payment');
33
  <!--{{{ Payment Logo -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
- <?php $image = "ideal_payment_small.png";
37
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image; ?>
38
- <img style="height:32px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
 
 
39
  </a>
40
  </div>
41
  <!--}}} Payment Logo -->
@@ -43,20 +45,20 @@ $helper = Mage::helper('novalnet_payment');
43
  <div>
44
  <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
45
  <li>
46
- <?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
47
  </li>
48
- <?php if ($this->getUserInfo()): ?>
49
  <li>
50
- <?php echo $this->getUserInfo() ?>
51
  </li>
52
  <?php endif; ?>
53
- <?php if ($this->getLiveMode() == 0): ?>
54
  <li>
55
  <div style="font-weight:bold;color:red;font-size:12px;">
56
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
57
  </div>
58
  </li>
59
- <?php endif ?>
60
  </ul>
61
  </div>
62
  <!--}}} Payment Description -->
33
  <!--{{{ Payment Logo -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
+ <?php
37
+ $image = "ideal_payment_small.png";
38
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
39
+ ?>
40
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
41
  </a>
42
  </div>
43
  <!--}}} Payment Logo -->
45
  <div>
46
  <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
47
  <li>
48
+ <?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
49
  </li>
50
+ <?php if ($this->getUserInfo()): ?>
51
  <li>
52
+ <?php echo $this->getUserInfo() ?>
53
  </li>
54
  <?php endif; ?>
55
+ <?php if ($this->getMethod()->_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
  </ul>
63
  </div>
64
  <!--}}} Payment Description -->
app/design/frontend/default/default/template/novalnet/payment/method/form/Invoice.phtml CHANGED
@@ -32,8 +32,8 @@ $helper = Mage::helper('novalnet_payment');
32
  <!-- PAYMENT LOGO -->
33
  <div>
34
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
35
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "kauf-auf-rechnung.jpg"; ?>
36
- <img style="height:30px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
  </a>
38
  </div>
39
  <!-- PAYMENT LOGO -->
@@ -47,7 +47,7 @@ $helper = Mage::helper('novalnet_payment');
47
  <?php echo $this->getUserInfo() ?>
48
  </li>
49
  <?php endif ?>
50
- <?php if ($this->getLiveMode() == 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') ?>
@@ -62,7 +62,9 @@ $helper = Mage::helper('novalnet_payment');
62
  <li>
63
  <div class="input-box">
64
  <label style="float:none;" for="<?php echo $code ?>_callback_tel">
65
- <?php if ($this->getCallbackConfigData() == 2): ?>
 
 
66
  <?php echo $this->__('Mobile phone number'); ?>
67
  <?php else: ?>
68
  <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
@@ -77,9 +79,9 @@ $helper = Mage::helper('novalnet_payment');
77
  </div>
78
  <div class="input-box">
79
  <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
80
- <input onchange="document.getElementById('inv_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="inv_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
82
- <label style="float:none;" for="inv_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
83
  </div>
84
  </li>
85
  <!--}}} PIN by Callback-->
32
  <!-- PAYMENT LOGO -->
33
  <div>
34
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
35
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "kauf-auf-rechnung.png"; ?>
36
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
  </a>
38
  </div>
39
  <!-- PAYMENT LOGO -->
47
  <?php echo $this->getUserInfo() ?>
48
  </li>
49
  <?php endif ?>
50
+ <?php if ($this->getMethod()->_getConfigData('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') ?>
62
  <li>
63
  <div class="input-box">
64
  <label style="float:none;" for="<?php echo $code ?>_callback_tel">
65
+ <?php
66
+ if ($this->getCallbackConfigData() == 2):
67
+ ?>
68
  <?php echo $this->__('Mobile phone number'); ?>
69
  <?php else: ?>
70
  <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
79
  </div>
80
  <div class="input-box">
81
  <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
82
+ <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/>
83
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
84
+ <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
85
  </div>
86
  </li>
87
  <!--}}} PIN by Callback-->
app/design/frontend/default/default/template/novalnet/payment/method/form/Paypal.phtml CHANGED
@@ -33,9 +33,11 @@ $helper = Mage::helper('novalnet_payment');
33
  <!--{{{ Payment Logo -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
- <?php $image = "paypal-small.png";
37
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image; ?>
38
- <img style="height:32px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
 
 
39
  </a>
40
  </div>
41
  <!--}}} Payment Logo -->
@@ -43,20 +45,20 @@ $helper = Mage::helper('novalnet_payment');
43
  <div>
44
  <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
45
  <li>
46
- <?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
47
  </li>
48
- <?php if ($this->getUserInfo()): ?>
49
  <li>
50
- <?php echo $this->getUserInfo() ?>
51
  </li>
52
  <?php endif; ?>
53
- <?php if ($this->getLiveMode() == 0): ?>
54
  <li>
55
  <div style="font-weight:bold;color:red;font-size:12px;">
56
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
57
  </div>
58
  </li>
59
- <?php endif ?>
60
  </ul>
61
  </div>
62
  <!--}}} Payment Description -->
33
  <!--{{{ Payment Logo -->
34
  <div>
35
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
+ <?php
37
+ $image = "paypal-small.png";
38
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
39
+ ?>
40
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
41
  </a>
42
  </div>
43
  <!--}}} Payment Logo -->
45
  <div>
46
  <ul id="payment_form_<?php echo $_code ?>" style="display:none;">
47
  <li>
48
+ <?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
49
  </li>
50
+ <?php if ($this->getUserInfo()): ?>
51
  <li>
52
+ <?php echo $this->getUserInfo() ?>
53
  </li>
54
  <?php endif; ?>
55
+ <?php if ($this->getMethod()->_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
  </ul>
63
  </div>
64
  <!--}}} Payment Description -->
app/design/frontend/default/default/template/novalnet/payment/method/form/Phonepayment.phtml CHANGED
@@ -33,7 +33,7 @@ $helper = Mage::helper('novalnet_payment');
33
  <div>
34
  <A HREF="<?php echo $helper->getNovalnetUrl() ?>" TARGET="_new" style="text-decoration:none;">
35
  <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "novaltel_reciever.png"; ?>
36
- <img style="height:32px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
  </A>
38
  </div>
39
  <!--}}} Payment Logo -->
@@ -48,7 +48,7 @@ $helper = Mage::helper('novalnet_payment');
48
  <?php echo $this->getUserInfo() ?>
49
  </li>
50
  <?php endif ?>
51
- <?php if ($this->getLiveMode() == 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') ?>
33
  <div>
34
  <A HREF="<?php echo $helper->getNovalnetUrl() ?>" TARGET="_new" style="text-decoration:none;">
35
  <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "novaltel_reciever.png"; ?>
36
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
  </A>
38
  </div>
39
  <!--}}} Payment Logo -->
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') ?>
app/design/frontend/default/default/template/novalnet/payment/method/form/Prepayment.phtml CHANGED
@@ -32,8 +32,8 @@ $helper = Mage::helper('novalnet_payment');
32
  <!-- PAYMENT LOGO -->
33
  <div>
34
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
35
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "vorauskasse.jpg"; ?>
36
- <img style="height:30px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
  </a>
38
  </div>
39
  <!-- PAYMENT LOGO -->
@@ -47,7 +47,7 @@ $helper = Mage::helper('novalnet_payment');
47
  <?php echo $this->getUserInfo(
32
  <!-- PAYMENT LOGO -->
33
  <div>
34
  <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
35
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "vorauskasse.png"; ?>
36
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
  </a>
38
  </div>
39
  <!-- PAYMENT LOGO -->
47
  <?php echo $this->getUserInfo(