Novalnet - Version 5.0.4

Version Notes

- Code Optimization has been done.
- Compatibility has been checked for Magento latest version 1.9.1.0.

Download this release

Release Info

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


Code changes from version 5.0.3 to 5.0.4

Files changed (213) hide show
  1. app/code/community/Novalnet/Payment/Block/Adminhtml/Configuration/Wizard/Config/Form.php +31 -6
  2. app/code/community/Novalnet/Payment/Block/Adminhtml/Configuration/Wizard/Page/Edit.php +24 -3
  3. app/code/community/Novalnet/Payment/Block/Adminhtml/Configuration/Wizard/Page/View.php +34 -3
  4. app/code/community/Novalnet/Payment/Block/Adminhtml/Information.php +3 -3
  5. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order.php +3 -6
  6. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/Grid.php +13 -6
  7. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/Invoice/View.php +3 -3
  8. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View.php +13 -5
  9. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View/Tab/TransactionOverview.php +33 -3
  10. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View/Tab/TransactionStatus.php +62 -6
  11. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Sales.php +8 -3
  12. app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction.php +3 -7
  13. app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction/Grid.php +17 -7
  14. app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction/View.php +20 -3
  15. app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction/View/Form.php +3 -3
  16. app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview.php +3 -6
  17. app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview/Grid.php +18 -10
  18. app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview/View.php +18 -6
  19. app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview/View/Form.php +3 -3
  20. app/code/community/Novalnet/Payment/Block/Adminhtml/Widget.php +3 -3
  21. app/code/community/Novalnet/Payment/Block/Adminhtml/Widget/Grid/Container.php +3 -3
  22. app/code/community/Novalnet/Payment/Block/Adminhtml/Widget/View/Container.php +3 -3
  23. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Cc.php +78 -4
  24. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Ideal.php +3 -3
  25. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Invoice.php +3 -3
  26. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Paypal.php +3 -3
  27. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Prepayment.php +3 -3
  28. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Sepa.php +13 -4
  29. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Sofortueberweisung.php +3 -3
  30. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Cc.php +5 -11
  31. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Ideal.php +5 -3
  32. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Invoice.php +8 -22
  33. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Paypal.php +5 -3
  34. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Phonepayment.php +0 -84
  35. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Prepayment.php +8 -23
  36. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Sepa.php +5 -11
  37. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Sofortueberweisung.php +5 -3
  38. app/code/community/Novalnet/Payment/Block/Payment/Method/NovalnetRedirect.php +3 -3
  39. app/code/community/Novalnet/Payment/Helper/AssignData.php +69 -70
  40. app/code/community/Novalnet/Payment/Helper/Data.php +51 -43
  41. app/code/community/Novalnet/Payment/Model/Adminhtml/Sales/Order/Create.php +3 -3
  42. app/code/community/Novalnet/Payment/{Block/Payment/Method/Form/Phonepayment.php → Model/Affiliate.php} +53 -45
  43. app/code/community/Novalnet/Payment/Model/Affiliateuser.php +53 -0
  44. app/code/community/Novalnet/Payment/Model/Callback.php +14 -5
  45. app/code/community/Novalnet/Payment/Model/Callbackscript.php +67 -33
  46. app/code/community/Novalnet/Payment/Model/Config.php +32 -49
  47. app/code/community/Novalnet/Payment/Model/Novalnet/Source/Callbacktypes.php +8 -8
  48. app/{design/frontend/default/default/template/novalnet/payment/method/pdf/Phonepayment.phtml → code/community/Novalnet/Payment/Model/Novalnet/Source/Cctypes.php} +34 -29
  49. app/code/community/Novalnet/Payment/Model/Observer.php +27 -5
  50. app/code/community/Novalnet/Payment/Model/Payment/Method/Abstract.php +62 -266
  51. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetCc.php +3 -3
  52. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetIdeal.php +3 -3
  53. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetInvoice.php +3 -3
  54. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetPaypal.php +3 -3
  55. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetPhonepayment.php +0 -37
  56. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetPrepayment.php +3 -3
  57. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetSepa.php +3 -3
  58. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetSofortueberweisung.php +3 -3
  59. app/{design/adminhtml/default/default/template/novalnet/payment/method/pdf/Phonepayment.phtml → code/community/Novalnet/Payment/Model/Resource/Affiliate.php} +12 -7
  60. app/{design/frontend/base/default/template/novalnet/payment/method/pdf/Phonepayment.phtml → code/community/Novalnet/Payment/Model/Resource/Affiliate/Collection.php} +12 -7
  61. app/{design/frontend/default/default/template/novalnet/payment/method/pdf/Ideal.phtml → code/community/Novalnet/Payment/Model/Resource/Affiliateuser.php} +12 -7
  62. app/code/community/Novalnet/Payment/Model/Resource/Affiliateuser/Collection.php +34 -0
  63. app/code/community/Novalnet/Payment/Model/Resource/Callback.php +3 -6
  64. app/code/community/Novalnet/Payment/Model/Resource/Callback/Collection.php +3 -6
  65. app/code/community/Novalnet/Payment/Model/Resource/Transactionoverview.php +3 -6
  66. app/code/community/Novalnet/Payment/Model/Resource/Transactionoverview/Collection.php +3 -6
  67. app/code/community/Novalnet/Payment/Model/Resource/Transactionstatus.php +3 -6
  68. app/code/community/Novalnet/Payment/Model/Resource/Transactionstatus/Collection.php +3 -6
  69. app/code/community/Novalnet/Payment/Model/System/Config/Activemethods.php +3 -3
  70. app/code/community/Novalnet/Payment/Model/Transactionoverview.php +13 -4
  71. app/code/community/Novalnet/Payment/Model/Transactionstatus.php +12 -3
  72. app/code/community/Novalnet/Payment/controllers/Adminhtml/Configuration/Wizard/PageController.php +39 -3
  73. app/code/community/Novalnet/Payment/controllers/Adminhtml/InformationController.php +3 -7
  74. app/code/community/Novalnet/Payment/controllers/Adminhtml/NovalnetCcController.php +0 -46
  75. app/code/community/Novalnet/Payment/controllers/Adminhtml/NovalnetSepaController.php +0 -46
  76. app/code/community/Novalnet/Payment/controllers/Adminhtml/Sales/OrderController.php +23 -24
  77. app/code/community/Novalnet/Payment/controllers/Adminhtml/TransactionController.php +10 -4
  78. app/code/community/Novalnet/Payment/controllers/Adminhtml/TransactionoverviewController.php +10 -4
  79. app/code/community/Novalnet/Payment/controllers/GatewayController.php +23 -35
  80. app/code/community/Novalnet/Payment/controllers/NovalnetCcController.php +0 -46
  81. app/code/community/Novalnet/Payment/controllers/NovalnetSepaController.php +0 -46
  82. app/code/community/Novalnet/Payment/etc/adminhtml.xml +28 -2
  83. app/code/community/Novalnet/Payment/etc/config.xml +46 -22
  84. app/code/community/Novalnet/Payment/etc/system.xml +75 -206
  85. app/code/community/Novalnet/Payment/sql/novalnet_setup/{mysql4-install-5.0.3.php → mysql4-install-5.0.4.php} +42 -3
  86. app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-1.4.0-5.0.0.php +3 -3
  87. app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-5.0.0-5.0.1.php +3 -3
  88. app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-5.0.1-5.0.2.php +3 -3
  89. app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-5.0.2-5.0.3.php +3 -3
  90. app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-5.0.3-5.0.4.php +71 -0
  91. app/design/adminhtml/default/default/layout/novalnet/configuration.xml +0 -1
  92. app/design/adminhtml/default/default/template/novalnet/information/iframe.phtml +5 -8
  93. app/design/adminhtml/default/default/template/novalnet/payment/configuration/container.phtml +3 -5
  94. app/design/adminhtml/default/default/template/novalnet/payment/configuration/formcontainer.phtml +3 -3
  95. app/design/adminhtml/default/default/template/novalnet/payment/configuration/store_switcher.phtml +3 -3
  96. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Cc.phtml +94 -42
  97. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Ccform.phtml +0 -53
  98. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Ideal.phtml +0 -66
  99. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Invoice.phtml +3 -3
  100. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Paypal.phtml +0 -66
  101. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Phonepayment.phtml +0 -61
  102. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Prepayment.phtml +3 -3
  103. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Sepa.phtml +269 -24
  104. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Sepaform.phtml +0 -53
  105. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Sofortueberweisung.phtml +0 -66
  106. app/design/adminhtml/default/default/template/novalnet/payment/method/form/blank.phtml +0 -38
  107. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Cc.phtml +5 -5
  108. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Ideal.phtml +11 -8
  109. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Invoice.phtml +49 -23
  110. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Paypal.phtml +10 -9
  111. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Phonepayment.phtml +0 -39
  112. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Prepayment.phtml +48 -23
  113. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Sepa.phtml +4 -4
  114. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Sofortueberweisung.phtml +10 -9
  115. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Cc.phtml +3 -3
  116. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Ideal.phtml +3 -3
  117. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Invoice.phtml +42 -17
  118. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Paypal.phtml +3 -3
  119. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Prepayment.phtml +42 -17
  120. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Sepa.phtml +5 -5
  121. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Sofortueberweisung.phtml +3 -3
  122. app/design/adminhtml/default/default/template/novalnet/sales/order/transactionoverview.phtml +3 -3
  123. app/design/adminhtml/default/default/template/novalnet/transaction/overview/view/form.phtml +3 -3
  124. app/design/adminhtml/default/default/template/novalnet/transaction/view/form.phtml +4 -4
  125. app/design/frontend/base/default/template/novalnet/payment/method/form/Cc.phtml +169 -103
  126. app/design/frontend/base/default/template/novalnet/payment/method/form/Ccform.phtml +0 -53
  127. app/design/frontend/base/default/template/novalnet/payment/method/form/Ideal.phtml +3 -3
  128. app/design/frontend/base/default/template/novalnet/payment/method/form/Invoice.phtml +5 -8
  129. app/design/frontend/base/default/template/novalnet/payment/method/form/Paypal.phtml +3 -3
  130. app/design/frontend/base/default/template/novalnet/payment/method/form/Phonepayment.phtml +0 -61
  131. app/design/frontend/base/default/template/novalnet/payment/method/form/Prepayment.phtml +3 -3
  132. app/design/frontend/base/default/template/novalnet/payment/method/form/Sepa.phtml +321 -80
  133. app/design/frontend/base/default/template/novalnet/payment/method/form/Sepaform.phtml +0 -53
  134. app/design/frontend/base/default/template/novalnet/payment/method/form/Sofortueberweisung.phtml +3 -3
  135. app/design/frontend/base/default/template/novalnet/payment/method/form/blank.phtml +0 -38
  136. app/design/frontend/base/default/template/novalnet/payment/method/info/Cc.phtml +4 -4
  137. app/design/frontend/base/default/template/novalnet/payment/method/info/Ideal.phtml +6 -6
  138. app/design/frontend/base/default/template/novalnet/payment/method/info/Invoice.phtml +49 -23
  139. app/design/frontend/base/default/template/novalnet/payment/method/info/Paypal.phtml +6 -6
  140. app/design/frontend/base/default/template/novalnet/payment/method/info/Phonepayment.phtml +0 -42
  141. app/design/frontend/base/default/template/novalnet/payment/method/info/Prepayment.phtml +48 -23
  142. app/design/frontend/base/default/template/novalnet/payment/method/info/Sepa.phtml +4 -4
  143. app/design/frontend/base/default/template/novalnet/payment/method/info/Sofortueberweisung.phtml +6 -6
  144. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Cc.phtml +3 -3
  145. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Ideal.phtml +3 -3
  146. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Invoice.phtml +42 -17
  147. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Paypal.phtml +3 -3
  148. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Prepayment.phtml +42 -17
  149. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Sepa.phtml +5 -5
  150. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Sofortueberweisung.phtml +3 -3
  151. app/design/frontend/default/default/template/novalnet/payment/method/form/Cc.phtml +169 -103
  152. app/design/frontend/default/default/template/novalnet/payment/method/form/Ccform.phtml +0 -53
  153. app/design/frontend/default/default/template/novalnet/payment/method/form/Ideal.phtml +3 -3
  154. app/design/frontend/default/default/template/novalnet/payment/method/form/Invoice.phtml +5 -8
  155. app/design/frontend/default/default/template/novalnet/payment/method/form/Paypal.phtml +3 -3
  156. app/design/frontend/default/default/template/novalnet/payment/method/form/Phonepayment.phtml +0 -61
  157. app/design/frontend/default/default/template/novalnet/payment/method/form/Prepayment.phtml +3 -3
  158. app/design/frontend/default/default/template/novalnet/payment/method/form/Sepa.phtml +321 -80
  159. app/design/frontend/default/default/template/novalnet/payment/method/form/Sepaform.phtml +0 -53
  160. app/design/frontend/default/default/template/novalnet/payment/method/form/Sofortueberweisung.phtml +3 -3
  161. app/design/frontend/default/default/template/novalnet/payment/method/form/blank.phtml +0 -38
  162. app/design/frontend/default/default/template/novalnet/payment/method/info/Cc.phtml +4 -4
  163. app/design/frontend/default/default/template/novalnet/payment/method/info/Ideal.phtml +6 -6
  164. app/design/frontend/default/default/template/novalnet/payment/method/info/Invoice.phtml +49 -23
  165. app/design/frontend/default/default/template/novalnet/payment/method/info/Paypal.phtml +6 -6
  166. app/design/frontend/default/default/template/novalnet/payment/method/info/Phonepayment.phtml +0 -42
  167. app/design/frontend/default/default/template/novalnet/payment/method/info/Prepayment.phtml +48 -23
  168. app/design/frontend/default/default/template/novalnet/payment/method/info/Sepa.phtml +4 -4
  169. app/design/frontend/default/default/template/novalnet/payment/method/info/Sofortueberweisung.phtml +6 -6
  170. app/design/frontend/default/default/template/novalnet/payment/method/pdf/Cc.phtml +0 -43
  171. app/design/frontend/default/default/template/novalnet/payment/method/pdf/Invoice.phtml +0 -66
  172. app/design/frontend/default/default/template/novalnet/payment/method/pdf/Paypal.phtml +0 -34
  173. app/design/frontend/default/default/template/novalnet/payment/method/pdf/Prepayment.phtml +0 -66
  174. app/design/frontend/default/default/template/novalnet/payment/method/pdf/Sepa.phtml +0 -45
  175. app/design/frontend/default/default/template/novalnet/payment/method/pdf/Sofortueberweisung.phtml +0 -29
  176. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Cc.phtml +168 -103
  177. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Ccform.phtml +0 -53
  178. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Ideal.phtml +3 -3
  179. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Invoice.phtml +5 -8
  180. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Paypal.phtml +3 -3
  181. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Phonepayment.phtml +0 -61
  182. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Prepayment.phtml +3 -3
  183. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Sepa.phtml +321 -81
  184. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Sepaform.phtml +0 -53
  185. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Sofortueberweisung.phtml +3 -3
  186. app/design/frontend/rwd/default/template/novalnet/payment/method/form/blank.phtml +0 -38
  187. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Cc.phtml +4 -4
  188. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Ideal.phtml +5 -5
  189. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Invoice.phtml +49 -23
  190. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Paypal.phtml +5 -5
  191. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Phonepayment.phtml +0 -42
  192. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Prepayment.phtml +48 -23
  193. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Sepa.phtml +4 -4
  194. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Sofortueberweisung.phtml +5 -5
  195. app/etc/modules/Novalnet_Payment.xml +26 -0
  196. app/locale/de_DE/Novalnet_Payment.csv +39 -25
  197. app/locale/en_US/Novalnet_Payment.csv +33 -22
  198. callback_novalnet2magento.php +3 -6
  199. js/novalnet/jquery-1.10.2.min.js +2486 -0
  200. js/novalnet/novalnetcc.js +182 -82
  201. js/novalnet/novalnetsepa.js +369 -69
  202. novalnet_css_link.php +0 -40
  203. package.xml +6 -7
  204. skin/frontend/base/default/images/novalnet/AE_Logo.png +0 -0
  205. skin/frontend/base/default/images/novalnet/MC_Logo.png +0 -0
  206. skin/frontend/base/default/images/novalnet/VI_Logo.png +0 -0
  207. skin/frontend/base/default/images/novalnet/creditcard_amex.png +0 -0
  208. skin/frontend/base/default/images/novalnet/creditcard_cvc.jpg +0 -0
  209. skin/frontend/base/default/images/novalnet/creditcard_small.png +0 -0
  210. skin/frontend/base/default/images/novalnet/cvc_hint.png +0 -0
  211. skin/frontend/base/default/images/novalnet/logo.png +0 -0
  212. skin/frontend/base/default/images/novalnet/novalnet-loading-icon.gif +0 -0
  213. skin/frontend/base/default/images/novalnet/novaltel_reciever.png +0 -0
app/code/community/Novalnet/Payment/Block/Adminhtml/Configuration/Wizard/Config/Form.php CHANGED
@@ -12,25 +12,28 @@
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_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();
@@ -39,6 +42,7 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
39
  }
40
 
41
  /**
 
42
  *
43
  * @return Mage_Adminhtml_Block_System_Config_Form
44
  */
@@ -89,7 +93,9 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
89
  return $this;
90
  }
91
 
92
- /**
 
 
93
  * @return Varien_Data_Form
94
  */
95
  protected function _initForm()
@@ -105,12 +111,19 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
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()
@@ -119,6 +132,8 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
119
  }
120
 
121
  /**
 
 
122
  * @return string
123
  */
124
  public function getPageCode()
@@ -127,6 +142,8 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
127
  }
128
 
129
  /**
 
 
130
  * @return string
131
  */
132
  public function getSectionCode()
@@ -135,6 +152,8 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
135
  }
136
 
137
  /**
 
 
138
  * @return string
139
  */
140
  public function getStoreCode()
@@ -143,6 +162,8 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
143
  }
144
 
145
  /**
 
 
146
  * @return string
147
  */
148
  public function getWebsiteCode()
@@ -151,6 +172,8 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
151
  }
152
 
153
  /**
 
 
154
  * @param string $path
155
  * @return mixed
156
  */
@@ -161,7 +184,9 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends
161
  }
162
 
163
  /**
164
- * @return Novalnet_Payment_Helper_Wizard
 
 
165
  */
166
  public function helperWizard()
167
  {
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Config_Form extends Mage_Adminhtml_Block_System_Config_Form
27
  {
 
28
  /**
29
  * @var string
30
  */
31
  protected $_groupName = '';
32
 
33
+ /**
34
+ * prepare configuration wizard form layout
35
+ *
36
+ */
37
  protected function _prepareLayout()
38
  {
39
  $return = parent::_prepareLayout();
42
  }
43
 
44
  /**
45
+ * Initialize configuration wizard form
46
  *
47
  * @return Mage_Adminhtml_Block_System_Config_Form
48
  */
93
  return $this;
94
  }
95
 
96
+ /**
97
+ * Initialize configuration wizard form
98
+ *
99
  * @return Varien_Data_Form
100
  */
101
  protected function _initForm()
111
  return $form;
112
  }
113
 
114
+ /**
115
+ * Get save url
116
+ *
117
+ * @return string
118
+ */
119
  protected function getSaveUrl()
120
  {
121
  return $this->getUrl('*/*/save', array('_current' => true));
122
  }
123
 
124
  /**
125
+ * Get group name
126
+ *
127
  * @return string
128
  */
129
  public function getGroupName()
132
  }
133
 
134
  /**
135
+ * Get page code
136
+ *
137
  * @return string
138
  */
139
  public function getPageCode()
142
  }
143
 
144
  /**
145
+ * Get section code
146
+ *
147
  * @return string
148
  */
149
  public function getSectionCode()
152
  }
153
 
154
  /**
155
+ * Get store
156
+ *
157
  * @return string
158
  */
159
  public function getStoreCode()
162
  }
163
 
164
  /**
165
+ * Get website
166
+ *
167
  * @return string
168
  */
169
  public function getWebsiteCode()
172
  }
173
 
174
  /**
175
+ * Get configuration page path
176
+ *
177
  * @param string $path
178
  * @return mixed
179
  */
184
  }
185
 
186
  /**
187
+ * Get Novalnet payment helper
188
+ *
189
+ * @return Novalnet_Payment_Helper_Data
190
  */
191
  public function helperWizard()
192
  {
app/code/community/Novalnet/Payment/Block/Adminhtml/Configuration/Wizard/Page/Edit.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Configuration_Wizard_Page_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
@@ -50,6 +50,11 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Page_Edit extends Ma
50
  ));
51
  }
52
 
 
 
 
 
 
53
  public function getHeaderText()
54
  {
55
  $session = Mage::getSingleton('admin/session');
@@ -61,18 +66,34 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Page_Edit extends Ma
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');
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Page_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
50
  ));
51
  }
52
 
53
+ /**
54
+ * Get header text of configuration wizard page
55
+ *
56
+ * @return string
57
+ */
58
  public function getHeaderText()
59
  {
60
  $session = Mage::getSingleton('admin/session');
66
  return $text;
67
  }
68
 
69
+ /**
70
+ * Get configuration wizard page back url
71
+ *
72
+ * @return string
73
+ */
74
  public function getBackUrl()
75
  {
76
  $url = $this->helperWizard()->getPreviousPageUrlAsString();
77
  return $this->getUrl($url, array('_current' => true));
78
  }
79
 
80
+ /**
81
+ * Get configuration page path
82
+ *
83
+ * @param string $path
84
+ * @return mixed
85
+ */
86
  public function getConfigPage($path)
87
  {
88
  $config = $this->helperWizard()->getConfigPage();
89
  return $config->getData($path);
90
  }
91
 
92
+ /**
93
+ * Get Novalnet payment helper
94
+ *
95
+ * @return Novalnet_Payment_Helper_Data
96
+ */
97
  public function helperWizard()
98
  {
99
  return Mage::helper('novalnet_payment');
app/code/community/Novalnet/Payment/Block/Adminhtml/Configuration/Wizard/Page/View.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Configuration_Wizard_Page_View extends Mage_Adminhtml_Block_Widget_View_Container
@@ -42,6 +42,11 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Page_View extends Ma
42
  ));
43
  }
44
 
 
 
 
 
 
45
  public function getViewHtml()
46
  {
47
  $html = '';
@@ -54,12 +59,22 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Page_View extends Ma
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');
@@ -67,17 +82,33 @@ class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Page_View extends Ma
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('', '');
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Configuration_Wizard_Page_View extends Mage_Adminhtml_Block_Widget_View_Container
42
  ));
43
  }
44
 
45
+ /**
46
+ * Get configuration wizard page view
47
+ *
48
+ * @return mixed
49
+ */
50
  public function getViewHtml()
51
  {
52
  $html = '';
59
  return $html;
60
  }
61
 
62
+ /**
63
+ * Get configuration wizard next page url
64
+ *
65
+ * @return string
66
+ */
67
  protected function getNextUrl()
68
  {
69
  $url = $this->helperWizard()->getNextPageUrlAsString();
70
  return $this->getUrl($url, array('_current' => true));
71
  }
72
 
73
+ /**
74
+ * Get header text of configuration wizard page
75
+ *
76
+ * @return string
77
+ */
78
  public function getHeaderText()
79
  {
80
  $headerText = $this->getConfigPage('header_text');
82
  return $text;
83
  }
84
 
85
+ /**
86
+ * Get configuration page path
87
+ *
88
+ * @param string $path
89
+ * @return mixed
90
+ */
91
  public function getConfigPage($path)
92
  {
93
  $config = $this->helperWizard()->getConfigPage();
94
  return $config->getData($path);
95
  }
96
 
97
+ /**
98
+ * Get Novalnet payment helper
99
+ *
100
+ * @return Novalnet_Payment_Helper_Data
101
+ */
102
  public function helperWizard()
103
  {
104
  return Mage::helper('novalnet_payment');
105
  }
106
 
107
+ /**
108
+ * prepare layout
109
+ *
110
+ * @return
111
+ */
112
  protected function _prepareLayout()
113
  {
114
  $this->unsetChild('', '');
app/code/community/Novalnet/Payment/Block/Adminhtml/Information.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Information extends Mage_Adminhtml_Block_Template
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Information extends Mage_Adminhtml_Block_Template
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order.php CHANGED
@@ -12,23 +12,20 @@
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_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();
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Sales_Order extends Novalnet_Payment_Block_Adminhtml_Widget_Grid_Container
27
  {
28
 
 
 
 
29
  public function __construct()
30
  {
31
  parent::__construct();
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/Grid.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_Block_Widget_Grid
@@ -45,7 +45,6 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_B
45
  if (!$this->novalnetPayments) {
46
  foreach ($payments as $paymentCode => $paymentModel) {
47
  $paymentTitle = Mage::getStoreConfig('payment/' . $paymentCode . '/title');
48
- //$this->novalnetPayments[$paymentCode] = $paymentTitle;
49
  if (preg_match('/novalnet/i', $paymentCode)) {
50
  $this->novalnetPayments[$paymentCode] = $paymentTitle;
51
  }
@@ -65,6 +64,8 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_B
65
  }
66
 
67
  /**
 
 
68
  * @return Mage_Adminhtml_Block_Widget_Grid
69
  */
70
  protected function _prepareCollection()
@@ -78,12 +79,13 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_B
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();
84
  }
85
 
86
  /**
 
 
87
  * @return Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid
88
  */
89
  public function _prepareColumns()
@@ -182,6 +184,8 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_B
182
  }
183
 
184
  /**
 
 
185
  * @return Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid
186
  */
187
  protected function _prepareMassaction()
@@ -240,7 +244,8 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_B
240
  }
241
 
242
  /**
243
- * @param $row
 
244
  * @return string
245
  */
246
  public function getRowUrl($row)
@@ -249,6 +254,8 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_B
249
  }
250
 
251
  /**
 
 
252
  * @return string
253
  */
254
  public function getGridUrl()
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid extends Mage_Adminhtml_Block_Widget_Grid
45
  if (!$this->novalnetPayments) {
46
  foreach ($payments as $paymentCode => $paymentModel) {
47
  $paymentTitle = Mage::getStoreConfig('payment/' . $paymentCode . '/title');
 
48
  if (preg_match('/novalnet/i', $paymentCode)) {
49
  $this->novalnetPayments[$paymentCode] = $paymentTitle;
50
  }
64
  }
65
 
66
  /**
67
+ * Prepare order Collection for novalnet payments
68
+ *
69
  * @return Mage_Adminhtml_Block_Widget_Grid
70
  */
71
  protected function _prepareCollection()
79
  $collection->getSelect()->join(array('payment' => $flatOrderPayment), 'main_table.entity_id = payment.parent_id', 'method')
80
  ->where("`payment`.`method` like '%novalnet%'");
81
  }
 
82
  $this->setCollection($collection);
83
  return parent::_prepareCollection();
84
  }
85
 
86
  /**
87
+ * prepare column for order grid
88
+ *
89
  * @return Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid
90
  */
91
  public function _prepareColumns()
184
  }
185
 
186
  /**
187
+ * prepare column for massaction order grid
188
+ *
189
  * @return Novalnet_Payment_Block_Adminhtml_Sales_Order_Grid
190
  */
191
  protected function _prepareMassaction()
244
  }
245
 
246
  /**
247
+ * Return row url
248
+ *
249
  * @return string
250
  */
251
  public function getRowUrl($row)
254
  }
255
 
256
  /**
257
+ * Return grid url
258
+ *
259
  * @return string
260
  */
261
  public function getGridUrl()
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/Invoice/View.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Sales_Order_Invoice_View extends Mage_Adminhtml_Block_Sales_Order_Invoice_View
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Sales_Order_Invoice_View extends Mage_Adminhtml_Block_Sales_Order_Invoice_View
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Sales_Order_View extends Mage_Adminhtml_Block_Sales_Order_View
@@ -44,8 +44,7 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View extends Mage_Adminhtml_B
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
 
@@ -77,6 +76,15 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View extends Mage_Adminhtml_B
77
  'onclick' => "confirmSetLocation('{$message}', '{$this->getVoidPaymentUrl()}')",
78
  ));
79
  }
 
 
 
 
 
 
 
 
 
80
  }
81
  }
82
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Sales_Order_View extends Mage_Adminhtml_Block_Sales_Order_View
44
 
45
  $this->_updateButton('order_invoice', 'label', Mage::helper('novalnet_payment')->__('Capture'));
46
 
47
+ if ($paymentMethod == Novalnet_Payment_Model_Config::NN_PAYPAL) {
 
48
  $this->_removeButton('order_invoice');
49
  }
50
 
76
  'onclick' => "confirmSetLocation('{$message}', '{$this->getVoidPaymentUrl()}')",
77
  ));
78
  }
79
+
80
+ if ($this->_isAllowedAction('ship') && $order->canShip()
81
+ && !$order->getForcedDoShipmentWithInvoice()) {
82
+ $this->_addButton('order_ship', array(
83
+ 'label' => Mage::helper('sales')->__('Ship'),
84
+ 'onclick' => 'setLocation(\'' . $this->getShipUrl() . '\')',
85
+ 'class' => 'go'
86
+ ));
87
+ }
88
  }
89
  }
90
 
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View/Tab/TransactionOverview.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Sales_Order_View_Tab_TransactionOverview extends Mage_Adminhtml_Block_Widget
@@ -32,32 +32,59 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionOverview
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()
@@ -66,6 +93,8 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionOverview
66
  }
67
 
68
  /**
 
 
69
  * @return Novalnet_Payment_Model_TransactionOverview
70
  */
71
  public function getTransactionOverview()
@@ -82,6 +111,7 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionOverview
82
  }
83
 
84
  /**
 
85
  *
86
  * @return Novalnet_Payment_Helper_Data
87
  */
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionOverview extends Mage_Adminhtml_Block_Widget
32
  $this->setTemplate('novalnet/sales/order/transactionoverview.phtml');
33
  }
34
 
35
+ /**
36
+ * Return Tab label
37
+ *
38
+ * @return string
39
+ */
40
  public function getTabLabel()
41
  {
42
  return Mage::helper('novalnet_payment')->__('Novalnet - Transaction Log');
43
  }
44
 
45
+ /**
46
+ * Return Tab title
47
+ *
48
+ * @return string
49
+ */
50
  public function getTabTitle()
51
  {
52
  return Mage::helper('novalnet_payment')->__('Novalnet - Transaction Log');
53
  }
54
 
55
+ /**
56
+ * Can show tab in tabs
57
+ *
58
+ * @return boolean
59
+ */
60
  public function canShowTab()
61
  {
62
  return true;
63
  }
64
 
65
+ /**
66
+ * Tab is hidden
67
+ *
68
+ * @return boolean
69
+ */
70
  public function isHidden()
71
  {
72
  return false;
73
  }
74
 
75
+ /**
76
+ * Return Tab class
77
+ *
78
+ * @return string
79
+ */
80
  public function getTabClass()
81
  {
82
  return 'ajax novalnet-widget-tab';
83
  }
84
 
85
  /**
86
+ * get current order
87
+ *
88
  * @return Mage_Sales_Model_Order
89
  */
90
  public function getOrder()
93
  }
94
 
95
  /**
96
+ * Get transaction overview
97
+ *
98
  * @return Novalnet_Payment_Model_TransactionOverview
99
  */
100
  public function getTransactionOverview()
111
  }
112
 
113
  /**
114
+ * Get Novalnet payment helper
115
  *
116
  * @return Novalnet_Payment_Helper_Data
117
  */
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View/Tab/TransactionStatus.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus extends Mage_Adminhtml_Block_Widget_Grid
@@ -38,32 +38,59 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus ex
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()
@@ -72,8 +99,9 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus ex
72
  }
73
 
74
  /**
75
- * @return Novalnet_Payment_Tab
76
- * Order left column Tab
 
77
  */
78
  public function getTabUrl()
79
  {
@@ -83,6 +111,11 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus ex
83
  );
84
  }
85
 
 
 
 
 
 
86
  public function getGridUrl()
87
  {
88
  return $this->getUrl('novalnet_payment/adminhtml_sales_order/transactionStatusGrid', array(
@@ -91,6 +124,11 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus ex
91
  );
92
  }
93
 
 
 
 
 
 
94
  public function getRowUrl($row)
95
  {
96
  return $this->getUrl('novalnet_payment/adminhtml_transaction/view', array(
@@ -99,6 +137,11 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus ex
99
  );
100
  }
101
 
 
 
 
 
 
102
  protected function _prepareCollection()
103
  {
104
  $collection = $this->getTransactionStatusCollection();
@@ -107,7 +150,9 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus ex
107
  }
108
 
109
  /**
110
- * @return Novalnet_Payment_Model_TransactionStatus
 
 
111
  */
112
  public function getTransactionStatusCollection()
113
  {
@@ -119,6 +164,11 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus ex
119
  return $transStatCollection;
120
  }
121
 
 
 
 
 
 
122
  protected function _prepareColumns()
123
  {
124
  $helperNnPayment = $this->helperNovalnetPayment();
@@ -168,12 +218,18 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus ex
168
  return parent::_prepareColumns();
169
  }
170
 
 
 
 
 
 
171
  private function setColumn($field, $fieldColumnMap)
172
  {
173
  $this->addColumn($field, $fieldColumnMap);
174
  }
175
 
176
  /**
 
177
  *
178
  * @return Novalnet_Payment_Helper_Data
179
  */
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Sales_Order_View_Tab_TransactionStatus extends Mage_Adminhtml_Block_Widget_Grid
38
  $this->setSkipGenerateContent(true);
39
  }
40
 
41
+ /**
42
+ * Return Tab label
43
+ *
44
+ * @return string
45
+ */
46
  public function getTabLabel()
47
  {
48
  return Mage::helper('novalnet_payment')->__('Novalnet - Transaction Overview');
49
  }
50
 
51
+ /**
52
+ * Return Tab title
53
+ *
54
+ * @return string
55
+ */
56
  public function getTabTitle()
57
  {
58
  return Mage::helper('novalnet_payment')->__('Novalnet - Transaction Overview');
59
  }
60
 
61
+ /**
62
+ * Can show tab in tabs
63
+ *
64
+ * @return boolean
65
+ */
66
  public function canShowTab()
67
  {
68
  return true;
69
  }
70
 
71
+ /**
72
+ * Tab is hidden
73
+ *
74
+ * @return boolean
75
+ */
76
  public function isHidden()
77
  {
78
  return false;
79
  }
80
 
81
+ /**
82
+ * Return Tab class
83
+ *
84
+ * @return string
85
+ */
86
  public function getTabClass()
87
  {
88
  return 'ajax novalnet-widget-tab';
89
  }
90
 
91
  /**
92
+ * get current order
93
+ *
94
  * @return Mage_Sales_Model_Order
95
  */
96
  public function getOrder()
99
  }
100
 
101
  /**
102
+ * Return tab url
103
+ *
104
+ * @return string
105
  */
106
  public function getTabUrl()
107
  {
111
  );
112
  }
113
 
114
+ /**
115
+ * Return grid url
116
+ *
117
+ * @return string
118
+ */
119
  public function getGridUrl()
120
  {
121
  return $this->getUrl('novalnet_payment/adminhtml_sales_order/transactionStatusGrid', array(
124
  );
125
  }
126
 
127
+ /**
128
+ * Return row url
129
+ *
130
+ * @return string
131
+ */
132
  public function getRowUrl($row)
133
  {
134
  return $this->getUrl('novalnet_payment/adminhtml_transaction/view', array(
137
  );
138
  }
139
 
140
+ /**
141
+ * Prepare order Collection for transaction status
142
+ *
143
+ * @return Novalnet_Payment_Model_TransactionStatus
144
+ */
145
  protected function _prepareCollection()
146
  {
147
  $collection = $this->getTransactionStatusCollection();
150
  }
151
 
152
  /**
153
+ * Prepare order Collection for transaction status
154
+ *
155
+ * @return mixed
156
  */
157
  public function getTransactionStatusCollection()
158
  {
164
  return $transStatCollection;
165
  }
166
 
167
+ /**
168
+ * Define transaction status grid
169
+ *
170
+ * @return Novalnet_Payment_Model_TransactionStatus
171
+ */
172
  protected function _prepareColumns()
173
  {
174
  $helperNnPayment = $this->helperNovalnetPayment();
218
  return parent::_prepareColumns();
219
  }
220
 
221
+ /**
222
+ * Add coumn
223
+ *
224
+ * @return
225
+ */
226
  private function setColumn($field, $fieldColumnMap)
227
  {
228
  $this->addColumn($field, $fieldColumnMap);
229
  }
230
 
231
  /**
232
+ * Get Novalnet payment helper
233
  *
234
  * @return Novalnet_Payment_Helper_Data
235
  */
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Sales.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Sales_Sales extends Mage_Adminhtml_Block_Widget_Grid_Container
@@ -39,6 +39,11 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Sales extends Mage_Adminhtml_Block_
39
  ));
40
  }
41
 
 
 
 
 
 
42
  public function getFilterUrl()
43
  {
44
  $this->getRequest()->setParam('filter', null);
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Sales_Sales extends Mage_Adminhtml_Block_Widget_Grid_Container
39
  ));
40
  }
41
 
42
+ /**
43
+ * Get filter url
44
+ *
45
+ * @return string
46
+ */
47
  public function getFilterUrl()
48
  {
49
  $this->getRequest()->setParam('filter', null);
app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction.php CHANGED
@@ -12,24 +12,20 @@
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_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';
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Transaction extends Mage_Adminhtml_Block_Widget_Grid_Container
27
  {
28
 
 
 
 
 
29
  public function __construct()
30
  {
31
  $this->_blockGroup = 'novalnet_payment';
app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction/Grid.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Transaction_Grid extends Mage_Adminhtml_Block_Widget_Grid
@@ -42,7 +42,9 @@ class Novalnet_Payment_Block_Adminhtml_Transaction_Grid extends Mage_Adminhtml_B
42
  }
43
 
44
  /**
45
- * @return Mage_Adminhtml_Block_Widget_Grid
 
 
46
  */
47
  protected function _prepareCollection()
48
  {
@@ -52,7 +54,9 @@ class Novalnet_Payment_Block_Adminhtml_Transaction_Grid extends Mage_Adminhtml_B
52
  }
53
 
54
  /**
55
- * @return
 
 
56
  */
57
  public function _prepareColumns()
58
  {
@@ -91,8 +95,9 @@ class Novalnet_Payment_Block_Adminhtml_Transaction_Grid extends Mage_Adminhtml_B
91
  }
92
 
93
  /**
94
- * @param $row
95
- * @return bool|string
 
96
  */
97
  public function getRowUrl($row)
98
  {
@@ -102,6 +107,11 @@ class Novalnet_Payment_Block_Adminhtml_Transaction_Grid extends Mage_Adminhtml_B
102
  );
103
  }
104
 
 
 
 
 
 
105
  public function getGridUrl()
106
  {
107
  return $this->getUrl('*/*/grid', array('_current' => true));
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Transaction_Grid extends Mage_Adminhtml_Block_Widget_Grid
42
  }
43
 
44
  /**
45
+ * Prepare order Collection for novalnet transaction status
46
+ *
47
+ * @return Novalnet_Payment_Block_Adminhtml_Transaction_Grid
48
  */
49
  protected function _prepareCollection()
50
  {
54
  }
55
 
56
  /**
57
+ * prepare column for massaction order grid
58
+ *
59
+ * @return Novalnet_Payment_Block_Adminhtml_Transaction_Grid
60
  */
61
  public function _prepareColumns()
62
  {
95
  }
96
 
97
  /**
98
+ * Return row url
99
+ *
100
+ * @return string
101
  */
102
  public function getRowUrl($row)
103
  {
107
  );
108
  }
109
 
110
+ /**
111
+ * Return grid url
112
+ *
113
+ * @return string
114
+ */
115
  public function getGridUrl()
116
  {
117
  return $this->getUrl('*/*/grid', array('_current' => true));
app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction/View.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Transaction_View extends Mage_Adminhtml_Block_Widget_Form_Container
@@ -52,17 +52,32 @@ class Novalnet_Payment_Block_Adminhtml_Transaction_View extends Mage_Adminhtml_B
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();
@@ -71,6 +86,8 @@ class Novalnet_Payment_Block_Adminhtml_Transaction_View extends Mage_Adminhtml_B
71
  }
72
 
73
  /**
 
 
74
  * @return string
75
  */
76
  public function getHeaderText()
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Transaction_View extends Mage_Adminhtml_Block_Widget_Form_Container
52
  return Mage::registry('current_order');
53
  }
54
 
55
+ /**
56
+ * get Novalnet transaction status
57
+ *
58
+ * @return string
59
+ */
60
  public function getNovalnetTransactionStatus()
61
  {
62
  return Mage::registry('novalnet_payment_transactionstatus');
63
  }
64
 
65
+ /**
66
+ * Get order currency code
67
+ *
68
+ * @return string
69
+ */
70
  public function getCurrencyCode()
71
  {
72
  $order = Mage::getModel("sales/order")->loadByIncrementId(trim($this->getNovalnetTransactionStatus()->getOrderId()));
73
  return $order->getOrderCurrencyCode();
74
  }
75
 
76
+ /**
77
+ * get payment method title
78
+ *
79
+ * @return string
80
+ */
81
  public function getPaymentTitle()
82
  {
83
  $transactionStatus = $this->getNovalnetTransactionStatus();
86
  }
87
 
88
  /**
89
+ * Get header text of transaction status
90
+ *
91
  * @return string
92
  */
93
  public function getHeaderText()
app/code/community/Novalnet/Payment/Block/Adminhtml/Transaction/View/Form.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Transaction_View_Form extends Mage_Adminhtml_Block_Widget
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Transaction_View_Form extends Mage_Adminhtml_Block_Widget
app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview.php CHANGED
@@ -12,23 +12,20 @@
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_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';
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Transactionoverview extends Mage_Adminhtml_Block_Widget_Grid_Container
27
  {
28
 
 
 
 
29
  public function __construct()
30
  {
31
  $this->_blockGroup = 'novalnet_payment';
app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview/Grid.php CHANGED
@@ -12,34 +12,33 @@
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_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);
37
  $this->setDefaultSort('order_id');
38
  $this->setDefaultDir('DESC');
39
  }
40
 
41
  /**
42
- * @return Mage_Adminhtml_Block_Widget_Grid
 
 
43
  */
44
  protected function _prepareCollection()
45
  {
@@ -49,7 +48,9 @@ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_Grid extends Mage_Adm
49
  }
50
 
51
  /**
52
- * @return
 
 
53
  */
54
  protected function _prepareColumns()
55
  {
@@ -78,6 +79,7 @@ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_Grid extends Mage_Adm
78
  }
79
 
80
  /**
 
81
  *
82
  * @return Novalnet_Payment_Helper_Data
83
  */
@@ -87,7 +89,8 @@ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_Grid extends Mage_Adm
87
  }
88
 
89
  /**
90
- * @param $row
 
91
  * @return string
92
  */
93
  public function getRowUrl($row)
@@ -98,6 +101,11 @@ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_Grid extends Mage_Adm
98
  );
99
  }
100
 
 
 
 
 
 
101
  public function getGridUrl()
102
  {
103
  return $this->getUrl('*/*/grid', array('_current' => true));
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Transactionoverview_Grid extends Mage_Adminhtml_Block_Widget_Grid
27
  {
28
 
 
 
 
29
  public function __construct()
30
  {
31
  parent::__construct();
32
+ $this->setId('novalnet_transactionoverview_grid');
33
  $this->setUseAjax(true);
34
  $this->setDefaultSort('order_id');
35
  $this->setDefaultDir('DESC');
36
  }
37
 
38
  /**
39
+ * Prepare order Collection for novalnet transaction overview
40
+ *
41
+ * @return Novalnet_Payment_Block_Adminhtml_Transactionoverview_Grid
42
  */
43
  protected function _prepareCollection()
44
  {
48
  }
49
 
50
  /**
51
+ * prepare column for transaction overview grid
52
+ *
53
+ * @return Novalnet_Payment_Block_Adminhtml_Transactionoverview_Grid
54
  */
55
  protected function _prepareColumns()
56
  {
79
  }
80
 
81
  /**
82
+ * Get Novalnet payment helper
83
  *
84
  * @return Novalnet_Payment_Helper_Data
85
  */
89
  }
90
 
91
  /**
92
+ * Return row url
93
+ *
94
  * @return string
95
  */
96
  public function getRowUrl($row)
101
  );
102
  }
103
 
104
+ /**
105
+ * Return grid url
106
+ *
107
+ * @return string
108
+ */
109
  public function getGridUrl()
110
  {
111
  return $this->getUrl('*/*/grid', array('_current' => true));
app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview/View.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Transactionoverview_View extends Mage_Adminhtml_Block_Widget_Form_Container
@@ -28,9 +28,6 @@ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_View extends Mage_Adm
28
 
29
  var $novalnetPayments = array();
30
 
31
- /**
32
- *
33
- */
34
  public function __construct()
35
  {
36
  $this->_objectId = 'nnlog_id';
@@ -50,12 +47,22 @@ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_View extends Mage_Adm
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()));
@@ -68,6 +75,11 @@ class Novalnet_Payment_Block_Adminhtml_Transactionoverview_View extends Mage_Adm
68
  return $title;
69
  }
70
 
 
 
 
 
 
71
  public function getHeaderText()
72
  {
73
  $transStatus = $this->getNovalnetTransactionOverview();
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Transactionoverview_View extends Mage_Adminhtml_Block_Widget_Form_Container
28
 
29
  var $novalnetPayments = array();
30
 
 
 
 
31
  public function __construct()
32
  {
33
  $this->_objectId = 'nnlog_id';
47
  $this->_removeButton('save');
48
  }
49
 
50
+ /**
51
+ * get Novalnet transaction overview
52
+ *
53
+ * @return string
54
+ */
55
  public function getNovalnetTransactionOverview()
56
  {
57
  return Mage::registry('novalnet_payment_transactionoverview');
58
  ;
59
  }
60
 
61
+ /**
62
+ * get payment method title
63
+ *
64
+ * @return string
65
+ */
66
  public function getPaymentTitle()
67
  {
68
  $order = Mage::getModel("sales/order")->loadByIncrementId(trim($this->getNovalnetTransactionOverview()->getOrderId()));
75
  return $title;
76
  }
77
 
78
+ /**
79
+ * Get header text of transaction overview
80
+ *
81
+ * @return string
82
+ */
83
  public function getHeaderText()
84
  {
85
  $transStatus = $this->getNovalnetTransactionOverview();
app/code/community/Novalnet/Payment/Block/Adminhtml/Transactionoverview/View/Form.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Transactionoverview_View_Form extends Mage_Adminhtml_Block_Widget
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Transactionoverview_View_Form extends Mage_Adminhtml_Block_Widget
app/code/community/Novalnet/Payment/Block/Adminhtml/Widget.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Widget extends Mage_Adminhtml_Block_Widget_Form_Container
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Widget extends Mage_Adminhtml_Block_Widget_Form_Container
app/code/community/Novalnet/Payment/Block/Adminhtml/Widget/Grid/Container.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Widget_Grid_Container extends Mage_Adminhtml_Block_Widget_Grid_Container
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Widget_Grid_Container extends Mage_Adminhtml_Block_Widget_Grid_Container
app/code/community/Novalnet/Payment/Block/Adminhtml/Widget/View/Container.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Adminhtml_Widget_View_Container extends Mage_Adminhtml_Block_Widget_View_Container
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Adminhtml_Widget_View_Container extends Mage_Adminhtml_Block_Widget_View_Container
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Cc.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Payment_Method_Form_Cc extends Mage_Payment_Block_Form
@@ -40,7 +40,6 @@ class Novalnet_Payment_Block_Payment_Method_Form_Cc extends Mage_Payment_Block_F
40
  public function isCallbackTypeCall()
41
  {
42
  return $this->getMethod()->isCallbackTypeCall();
43
- //return false;
44
  }
45
 
46
  /**
@@ -53,4 +52,79 @@ class Novalnet_Payment_Block_Payment_Method_Form_Cc extends Mage_Payment_Block_F
53
  return $this->getMethod()->_getConfigData('callback');
54
  }
55
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
56
  }
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Payment_Method_Form_Cc extends Mage_Payment_Block_Form
40
  public function isCallbackTypeCall()
41
  {
42
  return $this->getMethod()->isCallbackTypeCall();
 
43
  }
44
 
45
  /**
52
  return $this->getMethod()->_getConfigData('callback');
53
  }
54
 
55
+ /**
56
+ * Retrieve availables credit card types
57
+ *
58
+ * @return array
59
+ */
60
+ public function getCcAvailableTypes()
61
+ {
62
+ $types = $this->_getConfig()->getCcTypes();
63
+ $method = $this->getMethod();
64
+ if ($method) {
65
+ $availableTypes = $method->getConfigData('cctypes');
66
+ if ($availableTypes) {
67
+ $availableTypes = explode(',', $availableTypes);
68
+ foreach ($types as $code => $name) {
69
+ if (!in_array($code, $availableTypes)) {
70
+ unset($types[$code]);
71
+ }
72
+ }
73
+ }
74
+ }
75
+ return $types;
76
+ }
77
+
78
+ /**
79
+ * Retrieve payment configuration object
80
+ *
81
+ * @return Mage_Payment_Model_Config
82
+ */
83
+ protected function _getConfig()
84
+ {
85
+ if (!$this->_localConfig) {
86
+ $this->_localConfig = Mage::getModel('payment/config');
87
+ }
88
+ return $this->_localConfig;
89
+ }
90
+
91
+ /**
92
+ * Retrieve credit card expire months
93
+ *
94
+ * @return array
95
+ */
96
+ public function getCcMonths()
97
+ {
98
+ $months = $this->getData('cc_months');
99
+ if (is_null($months)) {
100
+ $months = $this->_getConfig()->getMonths();
101
+ $this->setData('cc_months', $months);
102
+ }
103
+ return $months;
104
+ }
105
+
106
+ /**
107
+ * Retrieve credit card expire years
108
+ *
109
+ * @return array
110
+ */
111
+ public function getCcYears()
112
+ {
113
+ $years = $this->getData('cc_years');
114
+ if (is_null($years)) {
115
+ $years = $this->_getConfig()->getYears();
116
+ $this->setData('cc_years', $years);
117
+ }
118
+ return $years;
119
+ }
120
+
121
+ /**
122
+ * Get information to end user from config
123
+ *
124
+ * @return string
125
+ */
126
+ public function getUserInfo()
127
+ {
128
+ return $this->getMethod()->getConfigData('booking_reference');
129
+ }
130
  }
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Ideal.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Payment_Method_Form_Ideal extends Mage_Payment_Block_Form
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Payment_Method_Form_Ideal extends Mage_Payment_Block_Form
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Invoice.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Payment_Method_Form_Invoice extends Mage_Payment_Block_Form
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Payment_Method_Form_Invoice extends Mage_Payment_Block_Form
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Paypal.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Payment_Method_Form_Paypal extends Mage_Payment_Block_Form
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Payment_Method_Form_Paypal extends Mage_Payment_Block_Form
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Prepayment.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Payment_Method_Form_Prepayment extends Mage_Payment_Block_Form
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Payment_Method_Form_Prepayment extends Mage_Payment_Block_Form
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Sepa.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Payment_Method_Form_Sepa extends Mage_Payment_Block_Form
@@ -40,7 +40,6 @@ class Novalnet_Payment_Block_Payment_Method_Form_Sepa extends Mage_Payment_Block
40
  public function isCallbackTypeCall()
41
  {
42
  return $this->getMethod()->isCallbackTypeCall();
43
- //return false;
44
  }
45
 
46
  /**
@@ -53,4 +52,14 @@ class Novalnet_Payment_Block_Payment_Method_Form_Sepa extends Mage_Payment_Block
53
  return $this->getMethod()->_getConfigData('callback');
54
  }
55
 
 
 
 
 
 
 
 
 
 
 
56
  }
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Payment_Method_Form_Sepa extends Mage_Payment_Block_Form
40
  public function isCallbackTypeCall()
41
  {
42
  return $this->getMethod()->isCallbackTypeCall();
 
43
  }
44
 
45
  /**
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/Sofortueberweisung.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Payment_Method_Form_Sofortueberweisung extends Mage_Payment_Block_Form
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Payment_Method_Form_Sofortueberweisung extends Mage_Payment_Block_Form
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Cc.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Payment_Method_Info_Cc extends Mage_Payment_Block_Info
@@ -28,6 +28,7 @@ class Novalnet_Payment_Block_Payment_Method_Info_Cc extends Mage_Payment_Block_I
28
 
29
  /**
30
  * Init default template for block
 
31
  */
32
  protected function _construct()
33
  {
@@ -37,6 +38,7 @@ class Novalnet_Payment_Block_Payment_Method_Info_Cc extends Mage_Payment_Block_I
37
 
38
  /**
39
  * Render as PDF
 
40
  * @return string
41
  */
42
  public function toPdf()
@@ -65,12 +67,4 @@ class Novalnet_Payment_Block_Payment_Method_Info_Cc extends Mage_Payment_Block_I
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
-
76
  }
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Payment_Method_Info_Cc extends Mage_Payment_Block_Info
28
 
29
  /**
30
  * Init default template for block
31
+ *
32
  */
33
  protected function _construct()
34
  {
38
 
39
  /**
40
  * Render as PDF
41
+ *
42
  * @return string
43
  */
44
  public function toPdf()
67
  return $this->getInfo()->getMethodInstance();
68
  }
69
 
 
 
 
 
 
 
 
 
70
  }
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Ideal.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Payment_Method_Info_Ideal extends Mage_Payment_Block_Info
@@ -28,6 +28,7 @@ class Novalnet_Payment_Block_Payment_Method_Info_Ideal extends Mage_Payment_Bloc
28
 
29
  /**
30
  * Init default template for block
 
31
  */
32
  protected function _construct()
33
  {
@@ -47,6 +48,7 @@ class Novalnet_Payment_Block_Payment_Method_Info_Ideal extends Mage_Payment_Bloc
47
 
48
  /**
49
  * Render as PDF
 
50
  * @return string
51
  */
52
  public function toPdf()
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Payment_Method_Info_Ideal extends Mage_Payment_Block_Info
28
 
29
  /**
30
  * Init default template for block
31
+ *
32
  */
33
  protected function _construct()
34
  {
48
 
49
  /**
50
  * Render as PDF
51
+ *
52
  * @return string
53
  */
54
  public function toPdf()
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Invoice.php CHANGED
@@ -12,20 +12,24 @@
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_Block_Payment_Method_Info_Invoice extends Mage_Payment_Block_Info
27
  {
28
 
 
 
 
 
29
  protected function _construct()
30
  {
31
  parent::_construct();
@@ -34,6 +38,7 @@ class Novalnet_Payment_Block_Payment_Method_Info_Invoice extends Mage_Payment_Bl
34
 
35
  /**
36
  * Render as PDF
 
37
  * @return string
38
  */
39
  public function toPdf()
@@ -52,25 +57,6 @@ class Novalnet_Payment_Block_Payment_Method_Info_Invoice extends Mage_Payment_Bl
52
  return $this->getInfo()->getMethodInstance();
53
  }
54
 
55
- /**
56
- * Retrieve field value data from payment info object
57
- *
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
-
74
  /**
75
  * Get some specific information
76
  *
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Payment_Method_Info_Invoice extends Mage_Payment_Block_Info
27
  {
28
 
29
+ /**
30
+ * Init default template for block
31
+ *
32
+ */
33
  protected function _construct()
34
  {
35
  parent::_construct();
38
 
39
  /**
40
  * Render as PDF
41
+ *
42
  * @return string
43
  */
44
  public function toPdf()
57
  return $this->getInfo()->getMethodInstance();
58
  }
59
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
60
  /**
61
  * Get some specific information
62
  *
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Paypal.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Payment_Method_Info_Paypal extends Mage_Payment_Block_Info
@@ -28,6 +28,7 @@ class Novalnet_Payment_Block_Payment_Method_Info_Paypal extends Mage_Payment_Blo
28
 
29
  /**
30
  * Init default template for block
 
31
  */
32
  protected function _construct()
33
  {
@@ -47,6 +48,7 @@ class Novalnet_Payment_Block_Payment_Method_Info_Paypal extends Mage_Payment_Blo
47
 
48
  /**
49
  * Render as PDF
 
50
  * @return string
51
  */
52
  public function toPdf()
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Payment_Method_Info_Paypal extends Mage_Payment_Block_Info
28
 
29
  /**
30
  * Init default template for block
31
+ *
32
  */
33
  protected function _construct()
34
  {
48
 
49
  /**
50
  * Render as PDF
51
+ *
52
  * @return string
53
  */
54
  public function toPdf()
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Phonepayment.php DELETED
@@ -1,84 +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
- 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
- }
34
-
35
- /**
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
- }
44
-
45
- /**
46
- * Retrieve payment method model
47
- *
48
- * @return Mage_Payment_Model_Method_Abstract
49
- */
50
- public function getMethod()
51
- {
52
- return $this->getInfo()->getMethodInstance();
53
- }
54
-
55
- /**
56
- * Retrieve field value data from payment info object
57
- *
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
-
74
- /**
75
- * Get some specific information
76
- *
77
- * @return array
78
- */
79
- public function getAdditionalData($key)
80
- {
81
- return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
82
- }
83
-
84
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Prepayment.php CHANGED
@@ -12,20 +12,23 @@
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_Block_Payment_Method_Info_Prepayment extends Mage_Payment_Block_Info
27
  {
28
-
 
 
 
29
  protected function _construct()
30
  {
31
  parent::_construct();
@@ -34,6 +37,7 @@ class Novalnet_Payment_Block_Payment_Method_Info_Prepayment extends Mage_Payment
34
 
35
  /**
36
  * Render as PDF
 
37
  * @return string
38
  */
39
  public function toPdf()
@@ -52,25 +56,6 @@ class Novalnet_Payment_Block_Payment_Method_Info_Prepayment extends Mage_Payment
52
  return $this->getInfo()->getMethodInstance();
53
  }
54
 
55
- /**
56
- * Retrieve field value data from payment info object
57
- *
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
-
74
  /**
75
  * Get some specific information
76
  *
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Payment_Method_Info_Prepayment extends Mage_Payment_Block_Info
27
  {
28
+ /**
29
+ * Init default template for block
30
+ *
31
+ */
32
  protected function _construct()
33
  {
34
  parent::_construct();
37
 
38
  /**
39
  * Render as PDF
40
+ *
41
  * @return string
42
  */
43
  public function toPdf()
56
  return $this->getInfo()->getMethodInstance();
57
  }
58
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
59
  /**
60
  * Get some specific information
61
  *
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Sepa.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Payment_Method_Info_Sepa extends Mage_Payment_Block_Info
@@ -28,6 +28,7 @@ class Novalnet_Payment_Block_Payment_Method_Info_Sepa extends Mage_Payment_Block
28
 
29
  /**
30
  * Init default template for block
 
31
  */
32
  protected function _construct()
33
  {
@@ -37,6 +38,7 @@ class Novalnet_Payment_Block_Payment_Method_Info_Sepa extends Mage_Payment_Block
37
 
38
  /**
39
  * Render as PDF
 
40
  * @return string
41
  */
42
  public function toPdf()
@@ -65,12 +67,4 @@ class Novalnet_Payment_Block_Payment_Method_Info_Sepa extends Mage_Payment_Block
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
-
76
  }
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Payment_Method_Info_Sepa extends Mage_Payment_Block_Info
28
 
29
  /**
30
  * Init default template for block
31
+ *
32
  */
33
  protected function _construct()
34
  {
38
 
39
  /**
40
  * Render as PDF
41
+ *
42
  * @return string
43
  */
44
  public function toPdf()
67
  return $this->getInfo()->getMethodInstance();
68
  }
69
 
 
 
 
 
 
 
 
 
70
  }
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Sofortueberweisung.php CHANGED
@@ -12,15 +12,15 @@
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_Block_Payment_Method_Info_Sofortueberweisung extends Mage_Payment_Block_Info
@@ -28,6 +28,7 @@ class Novalnet_Payment_Block_Payment_Method_Info_Sofortueberweisung extends Mage
28
 
29
  /**
30
  * Init default template for block
 
31
  */
32
  protected function _construct()
33
  {
@@ -47,6 +48,7 @@ class Novalnet_Payment_Block_Payment_Method_Info_Sofortueberweisung extends Mage
47
 
48
  /**
49
  * Render as PDF
 
50
  * @return string
51
  */
52
  public function toPdf()
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Payment_Method_Info_Sofortueberweisung extends Mage_Payment_Block_Info
28
 
29
  /**
30
  * Init default template for block
31
+ *
32
  */
33
  protected function _construct()
34
  {
48
 
49
  /**
50
  * Render as PDF
51
+ *
52
  * @return string
53
  */
54
  public function toPdf()
app/code/community/Novalnet/Payment/Block/Payment/Method/NovalnetRedirect.php CHANGED
@@ -12,15 +12,15 @@
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 Paymentmodul of Novalnet AG
16
  * http://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 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
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
  * http://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Block_Payment_Method_NovalnetRedirect extends Mage_Core_Block_Abstract
app/code/community/Novalnet/Payment/Helper/AssignData.php CHANGED
@@ -12,15 +12,15 @@
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_Helper_AssignData extends Novalnet_Payment_Helper_Data
@@ -37,6 +37,7 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
37
  * @var array
38
  */
39
  protected $_files = array(
 
40
  'novalnetcc.js',
41
  'novalnetsepa.js',
42
  );
@@ -45,7 +46,6 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
45
  * Return path file.
46
  *
47
  * @param $file
48
- *
49
  * @return string
50
  */
51
  public function getJQueryPath($file)
@@ -66,6 +66,9 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
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)
@@ -78,14 +81,11 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
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);
@@ -100,12 +100,12 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
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);
@@ -135,6 +135,8 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
135
  /**
136
  * validate novalnet form data
137
  *
 
 
138
  * throw Mage Exception
139
  */
140
  public function validateNovalnetData($paymentCode, $infoInstance)
@@ -148,16 +150,15 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
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
  }
@@ -177,12 +178,12 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
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
  }
@@ -208,6 +209,8 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
208
  /**
209
  * Assign novalnet return params for redirect payments
210
  *
 
 
211
  * @return Mage_Payment_Model_Abstract Object
212
  */
213
  public function assignNovalnetReturnData(Varien_Object $request, $paymentCode)
@@ -225,15 +228,15 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
225
  /**
226
  * To get encode data
227
  *
228
- * @param Varien_Object $dataObj
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!');
237
  $url = Mage::getModel('core/url')->getUrl("checkout/onepage/failure");
238
  Mage::app()->getResponse()->setRedirect($url);
239
  Mage::app()->getResponse()->sendResponse();
@@ -246,15 +249,15 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
246
  /**
247
  * To get Hash data
248
  *
249
- * @param Varien_Object $dataObj
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!');
258
  $url = Mage::getModel('core/url')->getUrl("checkout/onepage/failure");
259
  Mage::app()->getResponse()->setRedirect($url);
260
  Mage::app()->getResponse()->sendResponse();
@@ -278,25 +281,26 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
278
  /**
279
  * remove sensitive data form novalnet log
280
  *
281
- * @param Varien_Object $request
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:
@@ -304,31 +308,14 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
304
  ->unsBankAccount()
305
  ->unsBankCode()
306
  ->unsBic()
307
- ->unsIban();
 
308
  break;
309
  }
310
  }
311
  return $request;
312
  }
313
 
314
- /**
315
- * validate credit card expiry date and month
316
- *
317
- * @param integer $expYear
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
  *
@@ -339,13 +326,14 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
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
  }
351
 
@@ -357,23 +345,34 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
357
  */
358
  public function getBankDetailsAmount($amount)
359
  {
360
- return $this->__('NN_Amount') . " : <b>" . Mage::helper('core')->currency($amount, true, false) . "</b><br />";
361
  }
362
 
363
  /**
364
  * Return bank details transaction id
365
  *
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
  {
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
37
  * @var array
38
  */
39
  protected $_files = array(
40
+ 'jquery-1.10.2.min.js',
41
  'novalnetcc.js',
42
  'novalnetsepa.js',
43
  );
46
  * Return path file.
47
  *
48
  * @param $file
 
49
  * @return string
50
  */
51
  public function getJQueryPath($file)
66
  /**
67
  * Assign Form Data in quote instance based on payment method
68
  *
69
+ * $param string $paymentCode
70
+ * $param varien_object $data
71
+ * $param instance $infoInstance
72
  * @return Mage_Payment_Model_Abstract Object
73
  */
74
  public function assignNovalnetData($paymentCode, $data, $infoInstance)
81
 
82
  switch ($paymentCode) {
83
  case Novalnet_Payment_Model_Config::NN_CC:
84
+
85
+ $paymentInfo = $this->novalnetCardDetails('payment');
86
+ $methodSession->setCcPanHash($this->novalnetCardDetails('novalnet_cc_hash'))
87
  ->setCcUniqueId($this->novalnetCardDetails('novalnet_cc_unique_id'))
88
+ ->setNnCcCvc($paymentInfo['nn_cc_cid'])
 
 
 
 
89
  ->setNnCallbackTelNovalnetCc($data->getCallbackTel())
90
  ->setNnCallbackEmailNovalnetCc($data->getCallbackEmail());
91
  $this->_getCheckout()->setNnPaymentCode($paymentCode);
100
  break;
101
  case Novalnet_Payment_Model_Config::NN_SEPA:
102
 
103
+ $paymentInfo = $this->novalnetCardDetails('payment');
104
+ $methodSession->setSepaHash($this->novalnetCardDetails('result_sepa_hash'))
105
+ ->setSepaUniqueId($this->novalnetCardDetails('result_mandate_unique'))
106
+ ->setSepaHolder($paymentInfo['account_holder'])
107
+ ->setIbanConfirmed($this->novalnetCardDetails('nnsepa_iban_confirmed'))
108
  ->setSepaDuedate($this->getModel($paymentCode)->_getConfigData('sepa_due_date'))
 
109
  ->setNnCallbackTelNovalnetSepa($data->getCallbackTel())
110
  ->setNnCallbackEmailNovalnetSepa($data->getCallbackEmail());
111
  $this->_getCheckout()->setNnPaymentCode($paymentCode);
135
  /**
136
  * validate novalnet form data
137
  *
138
+ * $param string $paymentCode
139
+ * $param instance $infoInstance
140
  * throw Mage Exception
141
  */
142
  public function validateNovalnetData($paymentCode, $infoInstance)
150
  Mage::throwException($this->__('Basic parameter not valid') . '!');
151
  } elseif (!$getCardValues->getCcPanHash() || !$getCardValues->getCcUniqueId()) {
152
  Mage::throwException($this->__('Please enter valid credit card details') . '!');
153
+ } elseif (!$this->checkIsNumeric($getCardValues->getNnCcCvc())) {
 
154
  Mage::throwException($this->__('Please enter valid credit card details') . '!');
155
  } elseif (!$creditCardSecure && $this->checkCallbackAmount($paymentCode)
156
+ && $this->getModel($paymentCode)->_getConfigData('callback') == '1'
157
+ && !$infoInstance->getNnCallbackTelNovalnetCc() && !$this->checkIsAdmin()) {
158
  Mage::throwException($this->__('Please enter the Telephone / Mobilenumber') . '!');
159
  } elseif (!$creditCardSecure && $this->checkCallbackAmount($paymentCode)
160
+ && $this->getModel($paymentCode)->_getConfigData('callback') == '3'
161
+ && !$this->validateEmail($infoInstance->getNnCallbackEmailNovalnetCc())
162
  && !$this->checkIsAdmin()) {
163
  Mage::throwException($this->__('Please enter the E-Mail Address') . '!');
164
  }
178
  } elseif (!$sepaHolder || preg_match('/[#%\^<>@$=*!]/', $sepaHolder)) {
179
  Mage::throwException($this->__('Please enter valid account details') . '!');
180
  } elseif ($this->checkCallbackAmount($paymentCode)
181
+ && $this->getModel($paymentCode)->_getConfigData('callback') == '1'
182
+ && !$infoInstance->getNnCallbackTelNovalnetSepa() && !$this->checkIsAdmin()) {
183
  Mage::throwException($this->__('Please enter the Telephone / Mobilenumber') . '!');
184
  } elseif ($this->checkCallbackAmount($paymentCode)
185
+ && $this->getModel($paymentCode)->_getConfigData('callback') == '3'
186
+ && !$this->validateEmail($infoInstance->getNnCallbackEmailNovalnetSepa())
187
  && !$this->checkIsAdmin()) {
188
  Mage::throwException($this->__('Please enter the E-Mail Address') . '!');
189
  }
209
  /**
210
  * Assign novalnet return params for redirect payments
211
  *
212
+ * $param varien_object $request
213
+ * $param string $paymentCode
214
  * @return Mage_Payment_Model_Abstract Object
215
  */
216
  public function assignNovalnetReturnData(Varien_Object $request, $paymentCode)
228
  /**
229
  * To get encode data
230
  *
231
+ * @param varien_object $dataObj
232
+ * @param string $key
233
+ * @return mixed
234
  */
235
  public function importNovalnetEncodeData(Varien_Object $dataObj, $key)
236
  {
237
  $encoding = $this->getPciEncodedParam($dataObj, $key);
238
  if ($encoding != true) {
239
+ Mage::getSingleton('core/session')->addError($this->__('The methods for the handling of character sets are not available!'));
240
  $url = Mage::getModel('core/url')->getUrl("checkout/onepage/failure");
241
  Mage::app()->getResponse()->setRedirect($url);
242
  Mage::app()->getResponse()->sendResponse();
249
  /**
250
  * To get Hash data
251
  *
252
+ * @param varien_object $dataObj
253
+ * @param string $key
254
+ * @return mixed
255
  */
256
  public function importNovalnetHashData(Varien_Object $dataObj, $key)
257
  {
258
  $hash = $this->generateHash($dataObj, $key);
259
  if ($hash == false) {
260
+ Mage::getSingleton('core/session')->addError($this->__('The hash functions are not available!'));
261
  $url = Mage::getModel('core/url')->getUrl("checkout/onepage/failure");
262
  Mage::app()->getResponse()->setRedirect($url);
263
  Mage::app()->getResponse()->sendResponse();
281
  /**
282
  * remove sensitive data form novalnet log
283
  *
284
+ * @param varien_object $request
285
+ * @param string $paymentCode
286
+ * @return mixed
287
  */
288
+ public function doRemoveSensitiveData($request = NULL, $paymentCode)
289
  {
290
  if ($paymentCode) {
291
  switch ($paymentCode) {
292
  case Novalnet_Payment_Model_Config::NN_CC:
293
  if ($this->getModel($paymentCode)->_getConfigData('active_cc3d')
294
  == 1) {
295
+ unset($request['cc_holder'], $request['cc_exp_month'], $request['cc_exp_year'], $request['cc_cvc2'], $request['cc_type'], $request['cc_no'], $request['pan_hash']);
296
  } else {
297
  $request->unsCcHolder()
298
  ->unsCcNo()
299
  ->unsCcExpMonth()
300
  ->unsCcExpYear()
301
  ->unsCcCvc2()
302
+ ->unsCcType()
303
+ ->unsPanHash();
304
  }
305
  break;
306
  case Novalnet_Payment_Model_Config::NN_SEPA:
308
  ->unsBankAccount()
309
  ->unsBankCode()
310
  ->unsBic()
311
+ ->unsIban()
312
+ ->unsSepaHash();
313
  break;
314
  }
315
  }
316
  return $request;
317
  }
318
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
319
  /**
320
  * Get Novalnet Bank Account Details
321
  *
326
  {
327
  $dueDate = $result->getDueDate();
328
  $note = NULL;
329
+ if ($dueDate) {
330
+ $note .= 'Due Date: <b>' . Mage::helper('core')->formatDate($dueDate) . '</b>|NN Account Holder: <b>NOVALNET AG</b>';
331
+ } else {
332
+ $note .= 'NN Account Holder: <b>NOVALNET AG</b>';
333
+ }
334
+ $note .= '|IBAN: <b> ' . $result->getInvoiceIban() . '</b>';
335
+ $note .= '|BIC: <b>' . $result->getInvoiceBic() . '</b>';
336
+ $note .= '|NN_Bank: <b>' . $result->getInvoiceBankname() . ' ' . trim($result->getInvoiceBankplace()) . '</b>';
337
  return $note;
338
  }
339
 
345
  */
346
  public function getBankDetailsAmount($amount)
347
  {
348
+ return 'NN_Amount: <b>' . Mage::helper('core')->currency($amount, true, false) . '</b>';
349
  }
350
 
351
  /**
352
  * Return bank details transaction id
353
  *
354
+ * @param int $tid
355
+ * @param array $data
356
  * @return string
357
  */
358
+ public function getBankDetailsTID($tid, $data)
359
  {
360
+ $productId = $data['product'] ? $data['product'] : '';
361
+ $orderNo = $data['orderNo'] ? $data['orderNo'] : '';
362
+
363
+ $note = NULL;
364
+ $note .= "NN_Reference1:<b>BNR-$productId-$orderNo</b>";
365
+ $note .= "|NN_Reference2:<b>TID $tid</b>";
366
+ $note .= "|NN_Reference3:Order No&$orderNo";
367
+
368
+ return $note;
369
  }
370
 
371
  /**
372
  * Check whether callback option is enabled
373
  *
374
+ * @param string $paymentCode
375
+ * @return boolean
376
  */
377
  public function checkCallbackAmount($paymentCode)
378
  {
app/code/community/Novalnet/Payment/Helper/Data.php CHANGED
@@ -12,15 +12,15 @@
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_Helper_Data extends Mage_Core_Helper_Abstract
@@ -51,7 +51,7 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
51
  *
52
  * @param $actionName
53
  * @param $request
54
- * @return Varien_Object
55
  */
56
  public function initConfig($actionName, $request)
57
  {
@@ -75,7 +75,7 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
75
  /**
76
  * Get novalnet configure wizard details
77
  *
78
- * @return Varien_Object
79
  */
80
  public function getConfig()
81
  {
@@ -205,7 +205,7 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
205
  /**
206
  * Retrieve Magento version
207
  *
208
- * @return mixed
209
  */
210
  public function getMagentoVersion()
211
  {
@@ -356,18 +356,9 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
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
  {
@@ -376,12 +367,12 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
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
@@ -400,6 +391,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
400
  /**
401
  * Check whether payment method can be used
402
  * for Zero subtotal Checkout
 
 
403
  * @return bool
404
  */
405
  public function isModuleActive($grandTotal = NULL)
@@ -413,6 +406,7 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
413
  /**
414
  * Check whether the CallbackTypeCall can be used
415
  *
 
416
  * @return bool
417
  */
418
  public function isCallbackTypeAllowed($countryCode)
@@ -425,6 +419,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
425
  }
426
 
427
  /**
 
 
428
  * @return string
429
  */
430
  public function getDefaultLanguage()
@@ -463,9 +459,9 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
463
  /**
464
  * Set secure url checkout is secure for current store.
465
  *
466
- * @param string $route
467
- * @param array $params
468
- * @return string
469
  */
470
  public function getUrl($route, $params = array())
471
  {
@@ -483,7 +479,7 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
483
  *
484
  * @param string $info
485
  * @param string $key
486
- * @return array
487
  */
488
  public function getAdditionalData($info, $key = null)
489
  {
@@ -501,7 +497,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
501
  /**
502
  * Check whether current user have access to the payment method
503
  *
504
- * @return bool
 
505
  */
506
  public function checkCustomerAccess($userGroupId = NULL)
507
  {
@@ -514,20 +511,6 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
514
  return true;
515
  }
516
 
517
- /**
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))
526
- ->setTestMode($this->getEncodedParam($request->getTestMode(), $key))
527
- ->setAmount($this->getEncodedParam($request->getAmount(), $key))
528
- ->setUniqid($this->getEncodedParam(uniqid(), $key));
529
- }
530
-
531
  /**
532
  * Function to Encode Novalnet data
533
  *
@@ -559,7 +542,6 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
559
  * Function to Encode Novalnet PCI data
560
  *
561
  * @param string $data
562
- *
563
  * @param string $key
564
  * @return string
565
  */
@@ -744,7 +726,6 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
744
  * Novalnet Payment Key, is a fixed value, DO NOT CHANGE!!!!!
745
  *
746
  * @param string $code
747
- *
748
  * @return int
749
  */
750
  public function getPaymentId($code)
@@ -753,6 +734,12 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
753
  return $arrPaymentId[$code];
754
  }
755
 
 
 
 
 
 
 
756
  public function checkOrdersCount($minOrderCount)
757
  {
758
  $customerId = $this->getCustomerId();
@@ -768,7 +755,8 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
768
  /**
769
  * set due date for invoice payment
770
  *
771
- * @return bool
 
772
  */
773
  public function setDueDate($paymentDuration)
774
  {
@@ -784,6 +772,7 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
784
  /**
785
  * Get novalnet model class
786
  *
 
787
  * @return Novalnet_Payment_Model_Payment_Method_Abstract
788
  */
789
  public function getModel($modelclass)
@@ -801,6 +790,16 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
801
  return Mage::getModel('novalnet_payment/transactionstatus');
802
  }
803
 
 
 
 
 
 
 
 
 
 
 
804
  /**
805
  * Get novalnet callback model
806
  *
@@ -812,13 +811,13 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
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
 
824
  /**
@@ -923,6 +922,11 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
923
  /**
924
  * Log novalnet transaction status data
925
  *
 
 
 
 
 
926
  */
927
  public function doTransactionStatusSave($response, $transactionStatus, $payment,
928
  $amount = NULL, $customerNo = NULL
@@ -951,6 +955,10 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
951
  /**
952
  * Log novalnet payment response data
953
  *
 
 
 
 
954
  */
955
  public function doTransactionOrderLog($response, $orderId, $storeId = NULL, $customerId = NULL)
956
  {
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
51
  *
52
  * @param $actionName
53
  * @param $request
54
+ * @return varien_object
55
  */
56
  public function initConfig($actionName, $request)
57
  {
75
  /**
76
  * Get novalnet configure wizard details
77
  *
78
+ * @return varien_object
79
  */
80
  public function getConfig()
81
  {
205
  /**
206
  * Retrieve Magento version
207
  *
208
+ * @return int
209
  */
210
  public function getMagentoVersion()
211
  {
356
  return Mage::getSingleton('customer/session');
357
  }
358
 
 
 
 
 
 
 
 
 
359
  /**
360
  * Check customerNo for Logged in user
361
  *
 
362
  */
363
  public function customerNumberValidation()
364
  {
367
  $getCustomerSession = $this->getCustomerSession();
368
  $orderDetails = Mage::getModel('checkout/cart')->getQuote()->getData();
369
 
370
+ //Checking customer login status
371
  $loginCheck = $getCustomerSession->isLoggedIn();
372
  if ($loginCheck) {
373
  $customerNo = $getCustomerSession->getCustomer()->getId();
374
  if (empty($customerNo)) {
375
+ $coreSession = Mage::getSingleton('core/session');
376
  $customerNo = $coreSession['customer_id']; // Used Only customer id is not assigned in mage session
377
  }
378
  //Log customer Order details
391
  /**
392
  * Check whether payment method can be used
393
  * for Zero subtotal Checkout
394
+ *
395
+ * $param int $grandTotal
396
  * @return bool
397
  */
398
  public function isModuleActive($grandTotal = NULL)
406
  /**
407
  * Check whether the CallbackTypeCall can be used
408
  *
409
+ * $param string $countryCode
410
  * @return bool
411
  */
412
  public function isCallbackTypeAllowed($countryCode)
419
  }
420
 
421
  /**
422
+ * Get shop default language
423
+ *
424
  * @return string
425
  */
426
  public function getDefaultLanguage()
459
  /**
460
  * Set secure url checkout is secure for current store.
461
  *
462
+ * @param string $route
463
+ * @param array $params
464
+ * @return string
465
  */
466
  public function getUrl($route, $params = array())
467
  {
479
  *
480
  * @param string $info
481
  * @param string $key
482
+ * @return mixed
483
  */
484
  public function getAdditionalData($info, $key = null)
485
  {
497
  /**
498
  * Check whether current user have access to the payment method
499
  *
500
+ * @param int $userGroupId
501
+ * @return boolean
502
  */
503
  public function checkCustomerAccess($userGroupId = NULL)
504
  {
511
  return true;
512
  }
513
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
514
  /**
515
  * Function to Encode Novalnet data
516
  *
542
  * Function to Encode Novalnet PCI data
543
  *
544
  * @param string $data
 
545
  * @param string $key
546
  * @return string
547
  */
726
  * Novalnet Payment Key, is a fixed value, DO NOT CHANGE!!!!!
727
  *
728
  * @param string $code
 
729
  * @return int
730
  */
731
  public function getPaymentId($code)
734
  return $arrPaymentId[$code];
735
  }
736
 
737
+ /**
738
+ * Check orders count by customer id
739
+ *
740
+ * @param int $minOrderCount
741
+ * @return boolean
742
+ */
743
  public function checkOrdersCount($minOrderCount)
744
  {
745
  $customerId = $this->getCustomerId();
755
  /**
756
  * set due date for invoice payment
757
  *
758
+ * @param int $paymentDuration
759
+ * @return int
760
  */
761
  public function setDueDate($paymentDuration)
762
  {
772
  /**
773
  * Get novalnet model class
774
  *
775
+ * @param string $modelclass
776
  * @return Novalnet_Payment_Model_Payment_Method_Abstract
777
  */
778
  public function getModel($modelclass)
790
  return Mage::getModel('novalnet_payment/transactionstatus');
791
  }
792
 
793
+ /**
794
+ * Get novalnet transaction overview model
795
+ *
796
+ * @return Novalnet_Payment_Model_Transactionoverview_Collection
797
+ */
798
+ public function getModelTransactionOverview()
799
+ {
800
+ return Mage::getModel('novalnet_payment/transactionoverview');
801
+ }
802
+
803
  /**
804
  * Get novalnet callback model
805
  *
811
  }
812
 
813
  /**
814
+ * Get novalnet Affiliate model
815
  *
816
+ * @return Novalnet_Payment_Model_Affiliate_Collection
817
  */
818
+ public function getModelAffiliate()
819
  {
820
+ return Mage::getModel('novalnet_payment/affiliate');
821
  }
822
 
823
  /**
922
  /**
923
  * Log novalnet transaction status data
924
  *
925
+ * @param varien_object $response
926
+ * @param varien_object $transactionStatus
927
+ * @param varien_object $payment
928
+ * @param float $amount
929
+ * @param int $customerNo
930
  */
931
  public function doTransactionStatusSave($response, $transactionStatus, $payment,
932
  $amount = NULL, $customerNo = NULL
955
  /**
956
  * Log novalnet payment response data
957
  *
958
+ * @param varien_object $response
959
+ * @param int $orderId
960
+ * @param int $storeId
961
+ * @param int $customerId
962
  */
963
  public function doTransactionOrderLog($response, $orderId, $storeId = NULL, $customerId = NULL)
964
  {
app/code/community/Novalnet/Payment/Model/Adminhtml/Sales/Order/Create.php CHANGED
@@ -12,15 +12,15 @@
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
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Adminhtml_Sales_Order_Create extends Mage_Adminhtml_Model_Sales_Order_Create
app/code/community/Novalnet/Payment/{Block/Payment/Method/Form/Phonepayment.php → Model/Affiliate.php} RENAMED
@@ -1,45 +1,53 @@
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_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
- }
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ class Novalnet_Payment_Model_Affiliate extends Mage_Core_Model_Abstract
27
+ {
28
+ /**
29
+ * Constructor
30
+ *
31
+ * @see lib/Varien/Varien_Object#_construct()
32
+ * @return Novalnet_Payment_Model_Affiliate
33
+ */
34
+ public function _construct()
35
+ {
36
+ parent::_construct();
37
+ $this->_init('novalnet_payment/affiliate');
38
+ }
39
+
40
+ /**
41
+ * Load order transaction status by custom attribute value. Attribute value should be unique
42
+ *
43
+ * @param string $attribute
44
+ * @param string $value
45
+ * @return Novalnet_Payment_Model_Source_Affiliate
46
+ */
47
+ public function loadByAttribute($attribute, $value)
48
+ {
49
+ $this->load($value, $attribute);
50
+ return $this;
51
+ }
52
+
53
+ }
app/code/community/Novalnet/Payment/Model/Affiliateuser.php ADDED
@@ -0,0 +1,53 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ class Novalnet_Payment_Model_Affiliateuser extends Mage_Core_Model_Abstract
27
+ {
28
+ /**
29
+ * Constructor
30
+ *
31
+ * @see lib/Varien/Varien_Object#_construct()
32
+ * @return Novalnet_Payment_Model_Affiliateuser
33
+ */
34
+ public function _construct()
35
+ {
36
+ parent::_construct();
37
+ $this->_init('novalnet_payment/affiliateuser');
38
+ }
39
+
40
+ /**
41
+ * Load affiliate user information by custom attribute value. Attribute value should be unique
42
+ *
43
+ * @param string $attribute
44
+ * @param string $value
45
+ * @return Novalnet_Payment_Model_Source_Affiliateuser
46
+ */
47
+ public function loadByAttribute($attribute, $value)
48
+ {
49
+ $this->load($value, $attribute);
50
+ return $this;
51
+ }
52
+
53
+ }
app/code/community/Novalnet/Payment/Model/Callback.php CHANGED
@@ -12,22 +12,25 @@
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_Callback extends Mage_Core_Model_Abstract
27
  {
28
 
29
  /**
 
30
  *
 
 
31
  */
32
  public function _construct()
33
  {
@@ -36,11 +39,11 @@ class Novalnet_Payment_Model_Callback extends Mage_Core_Model_Abstract
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
  {
@@ -48,6 +51,12 @@ class Novalnet_Payment_Model_Callback extends Mage_Core_Model_Abstract
48
  return $this;
49
  }
50
 
 
 
 
 
 
 
51
  public function loadLogByOrderId($orderId)
52
  {
53
  $this->load($orderId, 'order_id');
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Callback extends Mage_Core_Model_Abstract
27
  {
28
 
29
  /**
30
+ * Constructor
31
  *
32
+ * @see lib/Varien/Varien_Object#_construct()
33
+ * @return Novalnet_Payment_Model_Callback
34
  */
35
  public function _construct()
36
  {
39
  }
40
 
41
  /**
42
+ * Load callback details by custom attribute value. Attribute value should be unique
43
  *
44
  * @param string $attribute
45
  * @param string $value
46
+ * @return Novalnet_Payment_Model_Callback
47
  */
48
  public function loadByAttribute($attribute, $value)
49
  {
51
  return $this;
52
  }
53
 
54
+ /**
55
+ * Load order callback status by order id
56
+ *
57
+ * @param $orderId
58
+ * @return Novalnet_Payment_Model_Callback
59
+ */
60
  public function loadLogByOrderId($orderId)
61
  {
62
  $this->load($orderId, 'order_id');
app/code/community/Novalnet/Payment/Model/Callbackscript.php CHANGED
@@ -33,7 +33,7 @@ class Novalnet_Payment_Model_Callbackscript
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
  {
@@ -47,22 +47,19 @@ class Novalnet_Payment_Model_Callbackscript
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();
@@ -87,9 +84,15 @@ class Novalnet_Payment_Model_Callbackscript
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' => '',
@@ -98,7 +101,8 @@ class Novalnet_Payment_Model_Callbackscript
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']);
@@ -156,14 +160,12 @@ class Novalnet_Payment_Model_Callbackscript
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)) {
@@ -174,7 +176,6 @@ class Novalnet_Payment_Model_Callbackscript
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
@@ -252,7 +253,18 @@ class Novalnet_Payment_Model_Callbackscript
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) {
@@ -267,7 +279,6 @@ class Novalnet_Payment_Model_Callbackscript
267
  }
268
  }
269
 
270
- // ############## Sub Routines #####################
271
  /**
272
  * Send callback notification E-mail
273
  *
@@ -550,14 +561,14 @@ class Novalnet_Payment_Model_Callbackscript
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
@@ -598,7 +609,7 @@ class Novalnet_Payment_Model_Callbackscript
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
@@ -623,20 +634,24 @@ class Novalnet_Payment_Model_Callbackscript
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);
@@ -746,6 +761,28 @@ class Novalnet_Payment_Model_Callbackscript
746
  ->save();
747
  }
748
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
749
  /**
750
  * Get order object for specific order id
751
  *
@@ -789,14 +826,7 @@ class Novalnet_Payment_Model_Callbackscript
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
  }
@@ -847,6 +877,10 @@ class Novalnet_Payment_Model_Callbackscript
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';
@@ -861,16 +895,16 @@ class Novalnet_Payment_Model_Callbackscript
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
 
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 = array('195.143.189.210', '195.143.189.214'); //Novalnet IP, is a fixed value, DO NOT CHANGE!!!!!
37
 
38
  public function Callback()
39
  {
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
  $this->invoiceAllowed = array('INVOICE_CREDIT', 'INVOICE_START');
52
 
53
  /** @Array Type of payment available - Level : 0 */
54
  $this->paymentTypes = array('INVOICE_START', 'PAYPAL', 'ONLINE_TRANSFER',
55
+ 'CREDITCARD', 'IDEAL', 'DIRECT_DEBIT_SEPA', 'PAYSAFECARD', 'EPS', 'GUARANTEED_INVOICE_START');
56
+ /** @Array Type of Charge backs available - Level : 1 */
 
57
  $this->chargeBackPayments = array('CREDITCARD_CHARGEBACK', 'RETURN_DEBIT_SEPA',
58
+ 'CREDITCARD_BOOKBACK', 'REFUND_BY_BANK_TRANSFER_EU');
59
  /** @Array Type of CreditEntry payment and Collections available - Level : 2 */
60
  $this->aryCollection = array('INVOICE_CREDIT', 'GUARANTEED_INVOICE_CREDIT',
61
  'CREDIT_ENTRY_CREDITCARD', 'CREDIT_ENTRY_SEPA', 'DEBT_COLLECTION_SEPA',
62
+ 'DEBT_COLLECTION_CREDITCARD');
63
  $this->arySubscription = array('SUBSCRIPTION_STOP');
64
 
65
  $this->request = $this->getParams();
84
  $this->test = true;
85
  $this->emailFromAddr = 'testadmin@novalnet.de';
86
  $this->emailFromName = 'Novalnet';
87
+ $this->emailToAddr = 'test@novalnet.de';
88
  $this->emailToName = 'Novalnet';
89
  }
90
+
91
+
92
+ if (isset($this->request['vendor_activation']) && $this->request['vendor_activation'] == 1) {
93
+ $this->doNovalnetAffAccInfoLog();
94
+ return false;
95
+ }
96
  //Parameters Settings
97
  $this->hParamsRequired = array(
98
  'vendor_id' => '',
101
  'status' => '',
102
  'amount' => '',
103
  'tid_payment' => '',
104
+ 'tid' => ''
105
+ );
106
 
107
  if (!in_array($this->request['payment_type'], array_merge($this->invoiceAllowed, $this->chargeBackPayments))) {
108
  unset($this->hParamsRequired['tid_payment']);
160
  ? 1 : 0 );
161
  $data = array('NnTestOrder' => $this->testMode);
162
  $additionalData = unserialize($payment->getAdditionalData());
 
163
  $data = $additionalData ? array_merge($additionalData, $data)
164
  : $data;
165
  $payment->setStatus(Novalnet_Payment_Model_Payment_Method_Abstract::STATUS_SUCCESS)
166
  ->setStatusDescription($this->helper->__('Payment was successful.'))
167
  ->setAdditionalData(serialize($data))
168
  ->save();
 
169
  // save the order transaction information
170
  $dataObj = new Varien_Object($request);
171
  if (in_array($paymentObj->getCode(), $this->redirectPayment)) {
176
  } else {
177
  $amount = $this->helper->getFormatedAmount($request['amount'], 'RAW');
178
  }
 
179
  $this->helper->doTransactionStatusSave($dataObj, $this->getAdminTransaction, $payment, $amount);
180
 
181
  // Payment process based on response status
253
  } catch (Exception $e) {
254
  $this->emailBody .= "Exception catched: $this->lineBreak\$e:" . $e->getMessage() . $this->lineBreak;
255
  }
256
+ // Callback E-mail Notification
257
+ $this->callbackMail();
258
+ }
259
 
260
+ // ############## Sub Routines #####################
261
+
262
+ /**
263
+ * Callback E-mail Notification
264
+ *
265
+ */
266
+ private function callbackMail()
267
+ {
268
  if ($this->emailBody && $this->emailFromAddr && ($this->emailToAddr && $this->validateEmail())) {
269
  if (!$this->sendMail()) {
270
  if ($this->debug) {
279
  }
280
  }
281
 
 
282
  /**
283
  * Send callback notification E-mail
284
  *
561
  $transaction = $payment->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE, null, false);
562
  $transaction->setParentTxnId(null)
563
  ->save();
564
+ $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'] . ". ";
565
  } else {
566
  if ($request['payment_type'] == 'PAYPAL') {
567
  $loadTransaction = $this->helper->loadTransactionStatus(trim($request['tid']));
568
  $loadTransaction->setTransactionStatus($this->getAdminTransaction->getStatus())
569
  ->save();
570
  }
571
+ $script = "Novalnet Callback Script executed successfully for the TID: " . $request['tid'] . " with amount " . $amount ." ". $currency . " on " . date('d-m-Y H:i:s');
572
  }
573
 
574
  $data['NnComments'] = empty($data['NnComments']) ? '<br>' . $script
609
 
610
  $this->doNovalnetCallbackLog($modNovalCallback, $sum);
611
 
612
+ $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";
613
 
614
  $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;
615
  $data['NnComments'] = empty($data['NnComments']) ? '<br>' . $callbackComments
634
  ->save();
635
 
636
  if (in_array($request['payment_type'], $this->invoiceAllowed)) {
637
+ $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'] . ". ";
638
  $this->emailBody = ($sum > $grandTotal) ? $emailText . "Customer paid amount is greater than the order total amount. $this->lineBreak$this->lineBreak"
639
  : $emailText . "$this->lineBreak$this->lineBreak";
640
  } else {
641
+ $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";
642
  }
643
  } else {
644
+ if ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_INVOICE &&
645
+ $payment->getAdditionalInformation($paymentObj->getCode() . '_callbackSuccess') != 1) {
646
  $currency = $this->getAdminTransaction->getCurrency();
647
+ $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'] . ". ";
648
  $data['NnComments'] = empty($data['NnComments']) ? '<br>' . $script
649
  : $data['NnComments'] . '<br>' . $script;
650
+ $payment->setAdditionalInformation($paymentObj->getCode() . '_callbackSuccess', 1);
651
  $this->saveAdditionalInfo($payment, $data);
652
  $this->saveOrderStatus($order);
653
+ $this->emailBody = $script;
654
+ $this->callbackMail();
655
  }
656
 
657
  $invoicePayments = array(Novalnet_Payment_Model_Config::NN_PREPAYMENT, Novalnet_Payment_Model_Config::NN_INVOICE);
761
  ->save();
762
  }
763
 
764
+ /**
765
+ * Log Affiliate account details
766
+ *
767
+ */
768
+ private function doNovalnetAffAccInfoLog()
769
+ {
770
+ $request = $this->request;
771
+ $affiliateAccInfo = $this->helper->getModelAffiliate();
772
+ $affiliateAccInfo->setVendorId($request['vendor_id'])
773
+ ->setVendorAuthcode($request['vendor_authcode'])
774
+ ->setProductId($request['product_id'])
775
+ ->setProductUrl($request['product_url'])
776
+ ->setActivationDate($request['activation_date'])
777
+ ->setAffId($request['aff_id'])
778
+ ->setAffAuthcode($request['aff_authcode'])
779
+ ->setAffAccesskey($request['aff_accesskey'])
780
+ ->save();
781
+ //Send notification mail to Merchant
782
+ $this->emailBody = 'Novalnet callback script executed successfully with Novalnet account activation information.';
783
+ $this->callbackMail();
784
+ }
785
+
786
  /**
787
  * Get order object for specific order id
788
  *
826
  {
827
  $callerIp = $this->helper->getRealIpAddr();
828
 
829
+ if (!in_array($callerIp, $this->ipAllowed) && !$this->test) {
 
 
 
 
 
 
 
830
  echo 'Unauthorised access from the IP [' . $callerIp . ']' . $this->lineBreak . $this->lineBreak;
831
  exit;
832
  }
877
  $orgTid = $request['tid'];
878
  }
879
 
880
+ if ($orgTid == '') {
881
+ return false;
882
+ }
883
+
884
  $tablePrefix = Mage::getConfig()->getTablePrefix();
885
  if (in_array($request['payment_type'], $this->chargeBackPayments)) {
886
  $orderPayment = $tablePrefix.'sales_payment_transaction';
895
  ->addFieldToFilter('last_trans_id', array('like' => "%$orgTid%"))
896
  ->addFieldToSelect('increment_id');
897
  }
898
+
899
  $orderCollection->getSelect()->join($orderPayment,$onCondition);
900
+ $count = $orderCollection->count();
901
  if ($count > 0) {
902
  foreach ($orderCollection as $order) {
903
  $orderid = $order->getIncrementId();
904
  }
905
  }
906
  $orderId = (isset($orderid) && $orderid != NULL) ? $orderid : '';
907
+
908
  return $orderId;
909
  }
910
 
app/code/community/Novalnet/Payment/Model/Config.php CHANGED
@@ -12,30 +12,26 @@
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_Config
27
  {
28
-
29
- /** * ****************************************** */
30
- /* NOVALNET GLOBAL PARAMS STARTS */
31
- /* * ******************************************* */
32
-
33
  const CALLBACK_PIN_LENGTH = 4; //PIN Length
34
  const RESPONSE_CODE_APPROVED = 100; //On Payment Success
35
  const PAYMENT_VOID_STATUS = 103; //On Payment void
36
  const CVV_MIN_LENGTH = 3; //MIN CVV No
37
- const PHONE_PAYMENT_AMOUNT_MIN = 99; //Min amt in cents
38
- const PHONE_PAYMENT_AMOUNT_MAX = 1000; //Max amt in cents
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';
@@ -48,7 +44,6 @@ class Novalnet_Payment_Model_Config
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';
52
  const NOVALTEL_STATUS = 'NOVALTEL_STATUS';
53
  const TRANS_STATUS = 'TRANSACTION_STATUS';
54
  const TRANSMIT_PIN_AGAIN = 'TRANSMIT_PIN_AGAIN';
@@ -61,14 +56,14 @@ class Novalnet_Payment_Model_Config
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',
@@ -79,10 +74,9 @@ class Novalnet_Payment_Model_Config
79
  'test_mode', 'uniqid');
80
  protected $_fraudCheckPayment = array('novalnetInvoice', 'novalnetSepa');
81
 
82
- /* * ******************************************* */
83
- /* NOVALNET CC PARAMS */
84
- /* * ******************************************* */
85
-
86
  const NN_CC = 'novalnetCc';
87
  const NN_CC_CAN_CAPTURE = true;
88
  const NN_CC_CAN_USE_INTERNAL = true;
@@ -90,9 +84,9 @@ class Novalnet_Payment_Model_Config
90
  const NN_CC_FORM_BLOCK = 'novalnet_payment/payment_method_form_Cc';
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;
@@ -100,27 +94,27 @@ class Novalnet_Payment_Model_Config
100
  const NN_SEPA_FORM_BLOCK = 'novalnet_payment/payment_method_form_Sepa';
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;
108
  const NN_INVOICE_CAN_USE_MULTISHIPPING = true;
109
  const NN_INVOICE_FORM_BLOCK = 'novalnet_payment/payment_method_form_Invoice';
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;
117
  const NN_PREPAYMENT_CAN_USE_MULTISHIPPING = true;
118
  const NN_PREPAYMENT_FORM_BLOCK = 'novalnet_payment/payment_method_form_Prepayment';
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;
126
  const NN_IDEAL_CAN_USE_INTERNAL = false;
@@ -129,9 +123,9 @@ class Novalnet_Payment_Model_Config
129
  const NN_IDEAL_FORM_BLOCK = 'novalnet_payment/payment_method_form_Ideal';
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;
137
  const NN_PAYPAL_CAN_USE_INTERNAL = false;
@@ -140,9 +134,9 @@ class Novalnet_Payment_Model_Config
140
  const NN_PAYPAL_FORM_BLOCK = 'novalnet_payment/payment_method_form_Paypal';
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;
148
  const NN_SOFORT_CAN_USE_INTERNAL = false;
@@ -151,20 +145,9 @@ class Novalnet_Payment_Model_Config
151
  const NN_SOFORT_FORM_BLOCK = 'novalnet_payment/payment_method_form_Sofortueberweisung';
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;
159
- const NN_TELEPHONE_CAN_USE_INTERNAL = false;
160
- const NN_TELEPHONE_CAN_REFUND = false;
161
- const NN_TELEPHONE_CAN_USE_MULTISHIPPING = true;
162
- const NN_TELEPHONE_FORM_BLOCK = 'novalnet_payment/payment_method_form_Phonepayment';
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
  {
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Config
27
  {
28
+ /* ******************************************** */
29
+ /* NOVALNET GLOBAL PARAMS STARTS */
30
+ /* ******************************************* */
 
 
31
  const CALLBACK_PIN_LENGTH = 4; //PIN Length
32
  const RESPONSE_CODE_APPROVED = 100; //On Payment Success
33
  const PAYMENT_VOID_STATUS = 103; //On Payment void
34
  const CVV_MIN_LENGTH = 3; //MIN CVV No
 
 
35
  const NOVALNET_RETURN_METHOD = 'POST';
36
  const NOVALNET_REDIRECT_BLOCK = 'novalnet_payment/payment_method_novalnetRedirect';
37
  const GATEWAY_REDIRECT_URL = 'novalnet_payment/gateway/redirect';
44
  const SEPA_URL = '://payport.novalnet.de/direct_form_sepa.jsp';
45
  const INVOICE_PAYMENT_METHOD = 'Invoice';
46
  const PREPAYMENT_PAYMENT_METHOD = 'Prepayment';
 
47
  const NOVALTEL_STATUS = 'NOVALTEL_STATUS';
48
  const TRANS_STATUS = 'TRANSACTION_STATUS';
49
  const TRANSMIT_PIN_AGAIN = 'TRANSMIT_PIN_AGAIN';
56
 
57
  static protected $_instance;
58
  protected $_novalnetPaymentKey = array('novalnetCc' => 6, 'novalnetInvoice' => 27,
59
+ 'novalnetPrepayment' => 27, 'novalnetPaypal' => 34,
60
  'novalnetSofortueberweisung' => 33, 'novalnetIdeal' => 49, 'novalnetSepa' => 37);
61
  protected $_redirectPayportUrl = array('novalnetPaypal' => '://payport.novalnet.de/paypal_payport',
62
  'novalnetSofortueberweisung' => '://payport.novalnet.de/online_transfer_payport',
63
  'novalnetIdeal' => '://payport.novalnet.de/online_transfer_payport',
64
  'novalnetCc' => '://payport.novalnet.de/global_pci_payport');
65
  protected $_novalnetPaymentMethods = array('novalnetCc' => 'Novalnet Credit Card', 'novalnetInvoice' => 'Novalnet Invoice',
66
+ 'novalnetPrepayment' => 'Novalnet Prepayment', 'novalnetPaypal' => 'Novalnet PayPal', 'novalnetSofortueberweisung' => 'Novalnet Instant Bank Transfer', 'novalnetIdeal' => 'Novalnet iDEAL', 'novalnetSepa' => 'Novalnet Direct Debit SEPA');
67
  protected $_callbackAllowed = array('AT', 'DE', 'CH');
68
  protected $_paymentOnholdStaus = array('91', '98', '99');
69
  protected $_redirectPayments = array('novalnetPaypal', 'novalnetSofortueberweisung',
74
  'test_mode', 'uniqid');
75
  protected $_fraudCheckPayment = array('novalnetInvoice', 'novalnetSepa');
76
 
77
+ /* ******************************************** */
78
+ /* NOVALNET CC PARAMS */
79
+ /* ******************************************* */
 
80
  const NN_CC = 'novalnetCc';
81
  const NN_CC_CAN_CAPTURE = true;
82
  const NN_CC_CAN_USE_INTERNAL = true;
84
  const NN_CC_FORM_BLOCK = 'novalnet_payment/payment_method_form_Cc';
85
  const NN_CC_INFO_BLOCK = 'novalnet_payment/payment_method_info_Cc';
86
 
87
+ /* ******************************************** */
88
+ /* NOVALNET SEPA PARAMS */
89
+ /* ******************************************* */
90
  const NN_SEPA = 'novalnetSepa';
91
  const NN_SEPA_CAN_CAPTURE = true;
92
  const NN_SEPA_CAN_USE_INTERNAL = true;
94
  const NN_SEPA_FORM_BLOCK = 'novalnet_payment/payment_method_form_Sepa';
95
  const NN_SEPA_INFO_BLOCK = 'novalnet_payment/payment_method_info_Sepa';
96
 
97
+ /* ******************************************** */
98
+ /* NOVALNET INVOICE PARAMS */
99
+ /* ******************************************* */
100
  const NN_INVOICE = 'novalnetInvoice';
101
  const NN_INVOICE_CAN_CAPTURE = true;
102
  const NN_INVOICE_CAN_USE_MULTISHIPPING = true;
103
  const NN_INVOICE_FORM_BLOCK = 'novalnet_payment/payment_method_form_Invoice';
104
  const NN_INVOICE_INFO_BLOCK = 'novalnet_payment/payment_method_info_Invoice';
105
 
106
+ /* ******************************************** */
107
+ /* NOVALNET PREPAYMENT PARAMS */
108
+ /* ******************************************* */
109
  const NN_PREPAYMENT = 'novalnetPrepayment';
110
  const NN_PREPAYMENT_CAN_CAPTURE = true;
111
  const NN_PREPAYMENT_CAN_USE_MULTISHIPPING = true;
112
  const NN_PREPAYMENT_FORM_BLOCK = 'novalnet_payment/payment_method_form_Prepayment';
113
  const NN_PREPAYMENT_INFO_BLOCK = 'novalnet_payment/payment_method_info_Prepayment';
114
 
115
+ /* ******************************************** */
116
+ /* NOVALNET IDEAL PARAMS */
117
+ /* ******************************************* */
118
  const NN_IDEAL = 'novalnetIdeal';
119
  const NN_IDEAL_CAN_CAPTURE = true;
120
  const NN_IDEAL_CAN_USE_INTERNAL = false;
123
  const NN_IDEAL_FORM_BLOCK = 'novalnet_payment/payment_method_form_Ideal';
124
  const NN_IDEAL_INFO_BLOCK = 'novalnet_payment/payment_method_info_Ideal';
125
 
126
+ /* ******************************************** */
127
+ /* NOVALNET PAYPAL PARAMS */
128
+ /* ******************************************* */
129
  const NN_PAYPAL = 'novalnetPaypal';
130
  const NN_PAYPAL_CAN_CAPTURE = true;
131
  const NN_PAYPAL_CAN_USE_INTERNAL = false;
134
  const NN_PAYPAL_FORM_BLOCK = 'novalnet_payment/payment_method_form_Paypal';
135
  const NN_PAYPAL_INFO_BLOCK = 'novalnet_payment/payment_method_info_Paypal';
136
 
137
+ /* ******************************************** */
138
+ /* NOVALNET SOFORT PARAMS */
139
+ /* ******************************************* */
140
  const NN_SOFORT = 'novalnetSofortueberweisung';
141
  const NN_SOFORT_CAN_CAPTURE = true;
142
  const NN_SOFORT_CAN_USE_INTERNAL = false;
145
  const NN_SOFORT_FORM_BLOCK = 'novalnet_payment/payment_method_form_Sofortueberweisung';
146
  const NN_SOFORT_INFO_BLOCK = 'novalnet_payment/payment_method_info_Sofortueberweisung';
147
 
148
+ /* ******************************************** */
149
+ /* NOVALNET ABSTRACT FUNCTIONS */
150
+ /* ******************************************* */
 
 
 
 
 
 
 
 
 
 
 
151
 
152
  static public function getInstance()
153
  {
app/code/community/Novalnet/Payment/Model/Novalnet/Source/Callbacktypes.php CHANGED
@@ -12,15 +12,15 @@
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_Callbacktypes
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Novalnet_Source_Callbacktypes
app/{design/frontend/default/default/template/novalnet/payment/method/pdf/Phonepayment.phtml → code/community/Novalnet/Payment/Model/Novalnet/Source/Cctypes.php} RENAMED
@@ -1,29 +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}}
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ class Novalnet_Payment_Model_Novalnet_Source_Cctypes extends Mage_Payment_Model_Source_Cctype
27
+ {
28
+
29
+ public function getAllowedTypes()
30
+ {
31
+ return array('VI', 'MC', 'AE');
32
+ }
33
+
34
+ }
app/code/community/Novalnet/Payment/Model/Observer.php CHANGED
@@ -12,21 +12,25 @@
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 {
@@ -51,6 +55,12 @@ class Novalnet_Payment_Model_Observer
51
  return $this;
52
  }
53
 
 
 
 
 
 
 
54
  public function sendCreditmemoEmail($observer)
55
  {
56
  try {
@@ -65,6 +75,12 @@ class Novalnet_Payment_Model_Observer
65
  return $this;
66
  }
67
 
 
 
 
 
 
 
68
  public function prepareLayoutBefore(Varien_Event_Observer $observer)
69
  {
70
  /* @var $block Mage_Page_Block_Html_Head */
@@ -84,6 +100,12 @@ class Novalnet_Payment_Model_Observer
84
  return $this;
85
  }
86
 
 
 
 
 
 
 
87
  public function customerLogin()
88
  {
89
  Mage::getSingleton('core/session')->setGuestloginvalue('');
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Observer
27
  {
28
+ /**
29
+ * Send order invoice mail
30
+ *
31
+ * @param varien_object $observer
32
+ * @return Novalnet_Payment_Model_Observer
33
+ */
34
  public function sendInvoiceEmail($observer)
35
  {
36
  try {
55
  return $this;
56
  }
57
 
58
+ /**
59
+ * Send order creditmemo mail
60
+ *
61
+ * @param varien_object $observer
62
+ * @return Novalnet_Payment_Model_Observer
63
+ */
64
  public function sendCreditmemoEmail($observer)
65
  {
66
  try {
75
  return $this;
76
  }
77
 
78
+ /**
79
+ * Load novalnet script files while prpareing layout
80
+ *
81
+ * @param varien_object $observer
82
+ * @return Novalnet_Payment_Model_Observer
83
+ */
84
  public function prepareLayoutBefore(Varien_Event_Observer $observer)
85
  {
86
  /* @var $block Mage_Page_Block_Html_Head */
100
  return $this;
101
  }
102
 
103
+ /**
104
+ * Set customer login session
105
+ *
106
+ * @param varien_object $observer
107
+ * @return Novalnet_Payment_Model_Observer
108
+ */
109
  public function customerLogin()
110
  {
111
  Mage::getSingleton('core/session')->setGuestloginvalue('');
app/code/community/Novalnet/Payment/Model/Payment/Method/Abstract.php CHANGED
@@ -79,9 +79,11 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
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();
@@ -99,23 +101,12 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
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');
@@ -141,7 +132,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
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');
@@ -160,6 +151,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
160
  /**
161
  * Assign Form Data in quote instance
162
  *
 
163
  * @return Mage_Payment_Model_Abstract Object
164
  */
165
  public function assignData($data)
@@ -181,7 +173,6 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
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()
@@ -206,7 +197,6 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
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)) {
@@ -249,6 +239,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
249
  * Prepare request to gateway
250
  *
251
  * @param string $type
 
252
  * @return Mage_Novalnet_Model_Novalnet_Request
253
  */
254
  public function buildRequest($type = Novalnet_Payment_Model_Config::POST_NORMAL,
@@ -290,25 +281,23 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
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
  }
@@ -334,7 +323,6 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
334
  * Post request to gateway and return response
335
  *
336
  * @param Varien_Object $request
337
- * @param string $type
338
  * @return Varien_Object
339
  */
340
  public function postRequest($request)
@@ -379,8 +367,8 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
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
  {
@@ -529,6 +517,8 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
529
  /**
530
  * refund validation for InvoicePayment
531
  *
 
 
532
  * @return boolean
533
  */
534
  private function _refundValidation($payment, $refundAmount)
@@ -553,8 +543,11 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
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
@@ -596,7 +589,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
596
  /**
597
  * Void payment
598
  *
599
- * @param Varien_Object $payment
600
  * @return Mage_Payment_Model_Abstract
601
  */
602
  public function void(Varien_Object $payment)
@@ -618,7 +611,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
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)
@@ -644,6 +637,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
644
  /**
645
  * Get Method Session
646
  *
 
647
  * @return Checkout session
648
  */
649
  private function _getMethodSession($paymentCode = NULL)
@@ -659,6 +653,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
659
  /**
660
  * Unset method session
661
  *
 
662
  * @return method session
663
  */
664
  public function unsetMethodSession($paymentCode = NULL)
@@ -675,7 +670,10 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
675
  /**
676
  * Get the novalnet configuration data
677
  *
678
- * @return mixed
 
 
 
679
  */
680
  public function _getConfigData($field, $globalMode = false, $storeId = NULL)
681
  {
@@ -734,7 +732,6 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
734
  * @param array $requestData
735
  * @param string $requestUrl
736
  * @param string $type
737
- *
738
  * @return mixed
739
  */
740
  private function _setNovalnetRequestCall($requestData, $requestUrl, $type = "")
@@ -769,10 +766,9 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
769
  /**
770
  * Set the novalnet parameter based on payment code
771
  *
772
- * @param Varien object $request
773
  * @param string $paymentCode
774
- *
775
- * @return object
776
  */
777
  private function _setNovalnetParam(Varien_Object $request, $paymentCode)
778
  {
@@ -812,12 +808,12 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
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()
@@ -855,9 +851,9 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
855
  /**
856
  * Validate the novalnet response
857
  *
858
- * @param object $payment
859
- *
860
- * @return mixed
861
  */
862
  public function validateNovalnetResponse($payment, $result = NULL)
863
  {
@@ -931,6 +927,8 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
931
  /**
932
  * payment method cancellation process
933
  *
 
 
934
  */
935
  public function saveCancelledOrder($result, $payment)
936
  {
@@ -961,6 +959,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
961
  /**
962
  * Set Payment method additional informations
963
  *
 
964
  * @return array
965
  */
966
  private function _setPaymentAddtionaldata($result)
@@ -974,6 +973,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
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,
@@ -984,124 +984,23 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
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
-
1046
- /**
1047
- * Validate the novalnet second call response
1048
- *
1049
- * @param object $result
1050
- * @param object $payment
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
  /**
1092
  * Validate the transaction status
1093
  *
1094
  * @param integer $tid
1095
- * @param integer $storeId
1096
  * @param string $reqType
1097
- * @param object $extraOption
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) {
@@ -1130,22 +1029,6 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1130
  }
1131
  }
1132
 
1133
- /**
1134
- * Check whether the cart amount and response server API amount is valid
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
- }
1148
-
1149
  /**
1150
  * Get checkout session
1151
  *
@@ -1160,83 +1043,6 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1160
  }
1161
  }
1162
 
1163
- /**
1164
- * Check whether the cart amount allowed for this payment
1165
- * Amount between 0.99 & 10.00 EUR
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
-
1180
- /**
1181
- * Post request to gateway to Load CC Iframe
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
- }
1239
-
1240
  /**
1241
  * validate novalnet params to proceed checkout
1242
  *
@@ -1304,6 +1110,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1304
  /**
1305
  * Check whether callback option is enabled
1306
  *
 
1307
  */
1308
  public function isCallbackTypeCall()
1309
  {
@@ -1319,6 +1126,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1319
  /**
1320
  * Initiate callback process after selecting payment method
1321
  *
 
1322
  * @return bool
1323
  */
1324
  private function _initiateCallbackProcess($paymentCode)
@@ -1383,8 +1191,10 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
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();
@@ -1402,7 +1212,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1402
  /**
1403
  * Get increment id for callback process
1404
  *
1405
- * @return mixed
1406
  */
1407
  private function _getIncrementId()
1408
  {
@@ -1499,7 +1309,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1499
  $methodSession->setNnCallbackSuccessState(false);
1500
  } else {
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())
@@ -1512,6 +1322,11 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1512
  /**
1513
  * Log novalnet transaction data
1514
  *
 
 
 
 
 
1515
  */
1516
  public function logNovalnetTransactionData($request, $response, $txnId,
1517
  $customerId = NULL, $storeId = NULL
@@ -1533,26 +1348,6 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
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
  *
@@ -1599,7 +1394,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1599
  /**
1600
  * Grand total getter
1601
  *
1602
- * @return string
1603
  */
1604
  private function _getAmount()
1605
  {
@@ -1614,7 +1409,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1614
  /**
1615
  * Order increment ID getter (either real from order or a reserved from quote)
1616
  *
1617
- * @return string
1618
  */
1619
  private function _getOrderId()
1620
  {
@@ -1647,9 +1442,9 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1647
  }
1648
 
1649
  /**
1650
- * Show exception
1651
  *
1652
- * @param $string
1653
  * @param $lang
1654
  * @return Mage::throwException
1655
  */
@@ -1665,6 +1460,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1665
  /**
1666
  * Assign helper utilities needed for the payment process
1667
  *
 
1668
  */
1669
  public function assignUtilities()
1670
  {
79
  return false;
80
  } else if (!$this->helper->checkCustomerAccess($userGroupId)) {
81
  return false;
82
+ } else if ($this->helper->checkIsAdmin() && $this->_getConfigData('active_cc3d') == 1) {
83
+ return false;
84
  } else if (!empty($quote) && !$this->helper->isModuleActive($quote->getGrandTotal())) {
85
  return false;
86
+ } else if (time() < $this->_getCheckout()->$getNnDisableTime()) {
87
  return false;
88
  }
89
  $this->paymentRefillValidate();
101
  parent::validate();
102
  $infoInstance = $this->_getInfoInstance();
103
  if (!$this->_isPlaceOrder()) {
 
104
  // validate the Novalnet basic params and billing informations
105
  $this->validateNovalnetParams();
106
  //customer_no verification
107
  $this->helper->customerNumberValidation();
108
  // validate the form payment method values
109
  $this->dataHelper->validateNovalnetData($this->_code, $infoInstance);
 
 
 
 
 
 
 
 
 
 
110
  }
111
 
112
  $callbackPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('fraudCheckPayment');
132
  $prevPaymentCode = $this->_getCheckout()->getNnPaymentCode();
133
  // check the users (guest or login)
134
  $customerSession = $this->helper->getCustomerSession();
135
+ $coreSession = Mage::getSingleton('core/session');
136
  if (!$customerSession->isLoggedIn() && $coreSession->getGuestloginvalue()
137
  == '') {
138
  $coreSession->setGuestloginvalue('1');
151
  /**
152
  * Assign Form Data in quote instance
153
  *
154
+ * @param varien_object $data
155
  * @return Mage_Payment_Model_Abstract Object
156
  */
157
  public function assignData($data)
173
  private function _sendRequestToNovalnet()
174
  {
175
  $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
 
176
  if ($this->_code && !in_array($this->_code, $redirectPayment)) {
177
 
178
  if ($this->_code == Novalnet_Payment_Model_Config::NN_CC && !$this->helper->checkIsAdmin()
197
  public function capture(Varien_Object $payment, $amount)
198
  {
199
  $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
 
200
  $responseCodeApproved = Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED;
201
 
202
  if ($this->canCapture() && $this->_code && !in_array($this->_code, $redirectPayment)) {
239
  * Prepare request to gateway
240
  *
241
  * @param string $type
242
+ * @param int $storeId
243
  * @return Mage_Novalnet_Model_Novalnet_Request
244
  */
245
  public function buildRequest($type = Novalnet_Payment_Model_Config::POST_NORMAL,
281
  ->setSystemUrl(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB))
282
  ->setSystemIp($helper->getServerAddr())
283
  ->setSystemName('magento')
284
+ ->setSystemVersion($helper->getMagentoVersion() . '-' . $helper->getNovalnetVersion());
 
 
285
 
286
  if ($this->_referrerId) {
287
  $request->setReferrerId($this->_referrerId);
288
  }
289
  if ($refernceOne) {
290
+ $request->setInput1('reference1')
291
+ ->setInputval1($refernceOne);
292
  }
293
  if ($refernceTwo) {
294
+ $request->setInput2('reference2')
295
+ ->setInputval2($refernceTwo);
296
  }
297
  if ($helper->checkIsAdmin()) {
298
  $adminUserId = Mage::getSingleton('admin/session')->getUser()->getUserId();
299
+ $request->setInput3('admin_user')
300
+ ->setInputval3($adminUserId);
301
  }
302
  $this->_setNovalnetParam($request, $this->_code);
303
  }
323
  * Post request to gateway and return response
324
  *
325
  * @param Varien_Object $request
 
326
  * @return Varien_Object
327
  */
328
  public function postRequest($request)
367
  /**
368
  * Assign Novalnet Authentication Data
369
  *
 
370
  * @param int $storeId
371
+ * @param varien_object $request
372
  */
373
  public function assignNnAuthData(Varien_Object $request, $storeId = NULL)
374
  {
517
  /**
518
  * refund validation for InvoicePayment
519
  *
520
+ * @param varien_object $payment
521
+ * @param float $refundAmount
522
  * @return boolean
523
  */
524
  private function _refundValidation($payment, $refundAmount)
543
  /**
544
  * Perform Novalnet request for Void, Capture, Refund
545
  *
546
+ * @param varien_Object $payment
547
+ * @param string $requestType
548
+ * @param float $refundAmount
549
+ * @param int $refundTid
550
+ * @return mixed
551
  */
552
  private function _performPayportRequest($payment, $requestType,
553
  $refundAmount = NULL, $refundTid = NULL
589
  /**
590
  * Void payment
591
  *
592
+ * @param varien_object $payment
593
  * @return Mage_Payment_Model_Abstract
594
  */
595
  public function void(Varien_Object $payment)
611
  $data['voidTid'] = $voidTid;
612
  if ($invoicePayment) {
613
  $bankVoidTid = !empty($txnid) ? $txnid : $payment->getLastTransId();
614
+ $data['NnNoteTID'] = $this->dataHelper->getBankDetailsTID($bankVoidTid, $data);
615
  }
616
 
617
  $payment->setTransactionId($voidTid)
637
  /**
638
  * Get Method Session
639
  *
640
+ * @param string $paymentCode
641
  * @return Checkout session
642
  */
643
  private function _getMethodSession($paymentCode = NULL)
653
  /**
654
  * Unset method session
655
  *
656
+ * @param string $paymentCode
657
  * @return method session
658
  */
659
  public function unsetMethodSession($paymentCode = NULL)
670
  /**
671
  * Get the novalnet configuration data
672
  *
673
+ * @param string $field
674
+ * @param boolean $globalMode
675
+ * @param int $storeId
676
+ * @return boolean | null
677
  */
678
  public function _getConfigData($field, $globalMode = false, $storeId = NULL)
679
  {
732
  * @param array $requestData
733
  * @param string $requestUrl
734
  * @param string $type
 
735
  * @return mixed
736
  */
737
  private function _setNovalnetRequestCall($requestData, $requestUrl, $type = "")
766
  /**
767
  * Set the novalnet parameter based on payment code
768
  *
769
+ * @param varien_object $request
770
  * @param string $paymentCode
771
+ * @return mixed
 
772
  */
773
  private function _setNovalnetParam(Varien_Object $request, $paymentCode)
774
  {
808
  $this->dataHelper->importNovalnetEncodeData($request, $this->_password);
809
  break;
810
  case Novalnet_Payment_Model_Config::NN_CC:
811
+ $request->setCcHolder()
812
  ->setCcNo()
813
+ ->setCcExpMonth()
814
+ ->setCcExpYear()
815
+ ->setCcType()
816
  ->setCcCvc2($methodSession->getNnCcCvc())
 
817
  ->setPanHash($methodSession->getCcPanHash())
818
  ->setUniqueId($methodSession->getCcUniqueId());
819
  if ($this->_code == Novalnet_Payment_Model_Config::NN_CC && !$helper->checkIsAdmin()
851
  /**
852
  * Validate the novalnet response
853
  *
854
+ * @param varien_object $payment
855
+ * @param varien_object $result
856
+ * @return boolean
857
  */
858
  public function validateNovalnetResponse($payment, $result = NULL)
859
  {
927
  /**
928
  * payment method cancellation process
929
  *
930
+ * @param varien_object $result
931
+ * @param varien_object $payment
932
  */
933
  public function saveCancelledOrder($result, $payment)
934
  {
959
  /**
960
  * Set Payment method additional informations
961
  *
962
+ * @param varien_object $result
963
  * @return array
964
  */
965
  private function _setPaymentAddtionaldata($result)
973
  && $shopMode == 0)) ? 1 : 0 );
974
  $data = array('NnTestOrder' => $testMode,
975
  'NnTid' => $txnId,
976
+ 'orderNo' => $request->getOrderNo(),
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,
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, $data);
988
  }
989
  return $data;
990
  }
991
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
992
  /**
993
  * Validate the transaction status
994
  *
995
  * @param integer $tid
996
+ * @param varien_object $payment
997
  * @param string $reqType
998
+ * @param varien_object $extraOption
 
999
  * @return mixed
1000
  */
1001
  public function doNovalnetStatusCall($tid, $payment = NULL, $reqType = Novalnet_Payment_Model_Config::TRANS_STATUS,
1002
  $extraOption = NULL, $requestData = NULL
1003
  ) {
 
1004
  $requestType = ($reqType == Novalnet_Payment_Model_Config::TRANS_STATUS)
1005
  ? Novalnet_Payment_Model_Config::TRANS_STATUS : $reqType;
1006
  if ($payment != NULL) {
1029
  }
1030
  }
1031
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1032
  /**
1033
  * Get checkout session
1034
  *
1043
  }
1044
  }
1045
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1046
  /**
1047
  * validate novalnet params to proceed checkout
1048
  *
1110
  /**
1111
  * Check whether callback option is enabled
1112
  *
1113
+ * @return boolean
1114
  */
1115
  public function isCallbackTypeCall()
1116
  {
1126
  /**
1127
  * Initiate callback process after selecting payment method
1128
  *
1129
+ * $param string $paymentCode
1130
  * @return bool
1131
  */
1132
  private function _initiateCallbackProcess($paymentCode)
1191
  $callbackTid = "hasNnCallbackTid" . $payCode;
1192
  $getNnDisableTime = "getNnDisableTime" . $payCode;
1193
  $methodSession = $this->_getMethodSession();
1194
+ $checkoutSession = $this->_getCheckout();
1195
+
1196
  if ($methodSession->$callbackTid()) {
1197
+ if ($checkoutSession->$getNnDisableTime() && time() > $checkoutSession->$getNnDisableTime()) {
1198
  $this->unsetMethodSession();
1199
  } elseif ($methodSession->getOrderAmount() != $this->helper->getFormatedAmount($this->_getAmount())) {
1200
  $this->unsetMethodSession();
1212
  /**
1213
  * Get increment id for callback process
1214
  *
1215
+ * @return int
1216
  */
1217
  private function _getIncrementId()
1218
  {
1309
  $methodSession->setNnCallbackSuccessState(false);
1310
  } else {
1311
  if ($result->getStatus() == Novalnet_Payment_Model_Config::METHOD_DISABLE_CODE) {
1312
+ $this->_getCheckout()->$setNnDisableTime(time() + (30 * 60));
1313
  }
1314
  $error = ($result->getStatusDesc() || $result->getStatusMessage())
1315
  ? $this->helper->htmlEscape($result->getStatusMessage() . $result->getStatusDesc())
1322
  /**
1323
  * Log novalnet transaction data
1324
  *
1325
+ * @param varien_object $request
1326
+ * @param varien_object $response
1327
+ * @param int $txnId
1328
+ * @param int $customerId
1329
+ * @param int $storeId
1330
  */
1331
  public function logNovalnetTransactionData($request, $response, $txnId,
1332
  $customerId = NULL, $storeId = NULL
1348
  ->save();
1349
  }
1350
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1351
  /**
1352
  * Get current info-instance
1353
  *
1394
  /**
1395
  * Grand total getter
1396
  *
1397
+ * @return float
1398
  */
1399
  private function _getAmount()
1400
  {
1409
  /**
1410
  * Order increment ID getter (either real from order or a reserved from quote)
1411
  *
1412
+ * @return int
1413
  */
1414
  private function _getOrderId()
1415
  {
1442
  }
1443
 
1444
  /**
1445
+ * Show expection
1446
  *
1447
+ * @param string $text
1448
  * @param $lang
1449
  * @return Mage::throwException
1450
  */
1460
  /**
1461
  * Assign helper utilities needed for the payment process
1462
  *
1463
+ * @return Novalnet helper
1464
  */
1465
  public function assignUtilities()
1466
  {
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetCc.php CHANGED
@@ -12,15 +12,15 @@
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_Payment_Method_NovalnetCc extends Novalnet_Payment_Model_Payment_Method_Abstract
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Payment_Method_NovalnetCc extends Novalnet_Payment_Model_Payment_Method_Abstract
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetIdeal.php CHANGED
@@ -12,15 +12,15 @@
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_Payment_Method_NovalnetIdeal extends Novalnet_Payment_Model_Payment_Method_Abstract
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Payment_Method_NovalnetIdeal extends Novalnet_Payment_Model_Payment_Method_Abstract
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetInvoice.php CHANGED
@@ -12,15 +12,15 @@
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_Payment_Method_NovalnetInvoice extends Novalnet_Payment_Model_Payment_Method_Abstract
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Payment_Method_NovalnetInvoice extends Novalnet_Payment_Model_Payment_Method_Abstract
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetPaypal.php CHANGED
@@ -12,15 +12,15 @@
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_Payment_Method_NovalnetPaypal extends Novalnet_Payment_Model_Payment_Method_Abstract
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Payment_Method_NovalnetPaypal extends Novalnet_Payment_Model_Payment_Method_Abstract
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetPhonepayment.php 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
- 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;
31
- protected $_canRefund = Novalnet_Payment_Model_Config::NN_TELEPHONE_CAN_REFUND;
32
- protected $_canUseInternal = Novalnet_Payment_Model_Config::NN_TELEPHONE_CAN_USE_INTERNAL;
33
- protected $_canUseForMultishipping = Novalnet_Payment_Model_Config::NN_TELEPHONE_CAN_USE_MULTISHIPPING;
34
- protected $_formBlockType = Novalnet_Payment_Model_Config::NN_TELEPHONE_FORM_BLOCK;
35
- protected $_infoBlockType = Novalnet_Payment_Model_Config::NN_TELEPHONE_INFO_BLOCK;
36
-
37
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetPrepayment.php CHANGED
@@ -12,15 +12,15 @@
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_Payment_Method_NovalnetPrepayment extends Novalnet_Payment_Model_Payment_Method_Abstract
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Payment_Method_NovalnetPrepayment extends Novalnet_Payment_Model_Payment_Method_Abstract
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetSepa.php CHANGED
@@ -12,15 +12,15 @@
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_Payment_Method_NovalnetSepa extends Novalnet_Payment_Model_Payment_Method_Abstract
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Payment_Method_NovalnetSepa extends Novalnet_Payment_Model_Payment_Method_Abstract
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetSofortueberweisung.php CHANGED
@@ -12,15 +12,15 @@
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_Payment_Method_NovalnetSofortueberweisung extends Novalnet_Payment_Model_Payment_Method_Abstract
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Payment_Method_NovalnetSofortueberweisung extends Novalnet_Payment_Model_Payment_Method_Abstract
app/{design/adminhtml/default/default/template/novalnet/payment/method/pdf/Phonepayment.phtml → code/community/Novalnet/Payment/Model/Resource/Affiliate.php} RENAMED
@@ -12,18 +12,23 @@
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}}
 
 
 
 
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Resource_Affiliate extends Mage_Core_Model_Mysql4_Abstract
27
+ {
28
+
29
+ public function _construct()
30
+ {
31
+ $this->_init('novalnet_payment/aff_account_detail', 'id');
32
+ }
33
+
34
+ }
app/{design/frontend/base/default/template/novalnet/payment/method/pdf/Phonepayment.phtml → code/community/Novalnet/Payment/Model/Resource/Affiliate/Collection.php} RENAMED
@@ -12,18 +12,23 @@
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}}
 
 
 
 
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Resource_Affiliate_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
27
+ {
28
+
29
+ public function _construct()
30
+ {
31
+ $this->_init('novalnet_payment/affiliate');
32
+ }
33
+
34
+ }
app/{design/frontend/default/default/template/novalnet/payment/method/pdf/Ideal.phtml → code/community/Novalnet/Payment/Model/Resource/Affiliateuser.php} RENAMED
@@ -12,18 +12,23 @@
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}}
 
 
 
 
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ class Novalnet_Payment_Model_Resource_Affiliateuser extends Mage_Core_Model_Mysql4_Abstract
27
+ {
28
+
29
+ public function _construct()
30
+ {
31
+ $this->_init('novalnet_payment/aff_user_detail', 'id');
32
+ }
33
+
34
+ }
app/code/community/Novalnet/Payment/Model/Resource/Affiliateuser/Collection.php ADDED
@@ -0,0 +1,34 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ class Novalnet_Payment_Model_Resource_Affiliateuser_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
27
+ {
28
+
29
+ public function _construct()
30
+ {
31
+ $this->_init('novalnet_payment/affiliateuser');
32
+ }
33
+
34
+ }
app/code/community/Novalnet/Payment/Model/Resource/Callback.php CHANGED
@@ -12,23 +12,20 @@
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_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');
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Resource_Callback extends Mage_Core_Model_Mysql4_Abstract
27
  {
28
 
 
 
 
29
  public function _construct()
30
  {
31
  $this->_init('novalnet_payment/callback', 'id');
app/code/community/Novalnet/Payment/Model/Resource/Callback/Collection.php CHANGED
@@ -12,23 +12,20 @@
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_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');
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Resource_Callback_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
27
  {
28
 
 
 
 
29
  public function _construct()
30
  {
31
  $this->_init('novalnet_payment/callback');
app/code/community/Novalnet/Payment/Model/Resource/Transactionoverview.php CHANGED
@@ -12,23 +12,20 @@
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_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');
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Resource_Transactionoverview extends Mage_Core_Model_Mysql4_Abstract
27
  {
28
 
 
 
 
29
  public function _construct()
30
  {
31
  $this->_init('novalnet_payment/order_log', 'nn_log_id');
app/code/community/Novalnet/Payment/Model/Resource/Transactionoverview/Collection.php CHANGED
@@ -12,23 +12,20 @@
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_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');
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Resource_Transactionoverview_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
27
  {
28
 
 
 
 
29
  public function _construct()
30
  {
31
  $this->_init('novalnet_payment/transactionoverview');
app/code/community/Novalnet/Payment/Model/Resource/Transactionstatus.php CHANGED
@@ -12,23 +12,20 @@
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_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');
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Resource_Transactionstatus extends Mage_Core_Model_Mysql4_Abstract
27
  {
28
 
 
 
 
29
  public function _construct()
30
  {
31
  $this->_init('novalnet_payment/transaction_status', 'nn_txn_id');
app/code/community/Novalnet/Payment/Model/Resource/Transactionstatus/Collection.php CHANGED
@@ -12,23 +12,20 @@
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_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');
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Resource_Transactionstatus_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
27
  {
28
 
 
 
 
29
  public function _construct()
30
  {
31
  $this->_init('novalnet_payment/transactionstatus');
app/code/community/Novalnet/Payment/Model/System/Config/Activemethods.php CHANGED
@@ -12,15 +12,15 @@
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_System_Config_Activemethods
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_System_Config_Activemethods
app/code/community/Novalnet/Payment/Model/Transactionoverview.php CHANGED
@@ -12,22 +12,25 @@
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_Transactionoverview extends Mage_Core_Model_Abstract
27
  {
28
 
29
  /**
 
30
  *
 
 
31
  */
32
  public function _construct()
33
  {
@@ -36,7 +39,7 @@ class Novalnet_Payment_Model_Transactionoverview extends Mage_Core_Model_Abstrac
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
@@ -48,6 +51,12 @@ class Novalnet_Payment_Model_Transactionoverview extends Mage_Core_Model_Abstrac
48
  return $this;
49
  }
50
 
 
 
 
 
 
 
51
  public function loadByOrderLogId(Novalnet_Payment_Model_Transactionoverview $orderLog)
52
  {
53
  $this->load($orderLog->getNnLogId(), 'nn_log_id');
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Transactionoverview extends Mage_Core_Model_Abstract
27
  {
28
 
29
  /**
30
+ * Constructor
31
  *
32
+ * @see lib/Varien/Varien_Object#_construct()
33
+ * @return Novalnet_Payment_Model_Transactionoverview
34
  */
35
  public function _construct()
36
  {
39
  }
40
 
41
  /**
42
+ * Load order transaction log by custom attribute value. Attribute value should be unique
43
  *
44
  * @param string $attribute
45
  * @param string $value
51
  return $this;
52
  }
53
 
54
+ /**
55
+ * Load order transaction status by log id
56
+ *
57
+ * @param mixed $orderLog
58
+ * @return Novalnet_Payment_Model_Transactionoverview
59
+ */
60
  public function loadByOrderLogId(Novalnet_Payment_Model_Transactionoverview $orderLog)
61
  {
62
  $this->load($orderLog->getNnLogId(), 'nn_log_id');
app/code/community/Novalnet/Payment/Model/Transactionstatus.php CHANGED
@@ -12,22 +12,25 @@
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_Transactionstatus extends Mage_Core_Model_Abstract
27
  {
28
 
29
  /**
 
30
  *
 
 
31
  */
32
  public function _construct()
33
  {
@@ -48,6 +51,12 @@ class Novalnet_Payment_Model_Transactionstatus extends Mage_Core_Model_Abstract
48
  return $this;
49
  }
50
 
 
 
 
 
 
 
51
  public function loadByTransactionStatusId(Novalnet_Payment_Model_Transactionstatus $transactionStatus)
52
  {
53
  $this->load($transactionStatus->getNnTxnId(), 'nn_txn_id');
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Model_Transactionstatus extends Mage_Core_Model_Abstract
27
  {
28
 
29
  /**
30
+ * Constructor
31
  *
32
+ * @see lib/Varien/Varien_Object#_construct()
33
+ * @return Novalnet_Payment_Model_Transactionstatus
34
  */
35
  public function _construct()
36
  {
51
  return $this;
52
  }
53
 
54
+ /**
55
+ * Load order transaction status by transaction id
56
+ *
57
+ * @param mixed $transactionStatus
58
+ * @return Novalnet_Payment_Model_Transactionstatus
59
+ */
60
  public function loadByTransactionStatusId(Novalnet_Payment_Model_Transactionstatus $transactionStatus)
61
  {
62
  $this->load($transactionStatus->getNnTxnId(), 'nn_txn_id');
app/code/community/Novalnet/Payment/controllers/Adminhtml/Configuration/Wizard/PageController.php CHANGED
@@ -12,20 +12,25 @@
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_Adminhtml_Configuration_Wizard_PageController extends Mage_Adminhtml_Controller_Action
27
  {
28
 
 
 
 
 
 
29
  protected function _initAction()
30
  {
31
  $this->loadLayout();
@@ -38,6 +43,10 @@ class Novalnet_Payment_Adminhtml_Configuration_Wizard_PageController extends Mag
38
  return $this;
39
  }
40
 
 
 
 
 
41
  public function indexAction()
42
  {
43
  $this->initConfig('index');
@@ -46,21 +55,40 @@ class Novalnet_Payment_Adminhtml_Configuration_Wizard_PageController extends Mag
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);
@@ -76,12 +104,20 @@ class Novalnet_Payment_Adminhtml_Configuration_Wizard_PageController extends Mag
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');
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Adminhtml_Configuration_Wizard_PageController extends Mage_Adminhtml_Controller_Action
27
  {
28
 
29
+ /**
30
+ * Init layout, menu and breadcrumb
31
+ *
32
+ * @return Mage_Adminhtml_Controller_Action
33
+ */
34
  protected function _initAction()
35
  {
36
  $this->loadLayout();
43
  return $this;
44
  }
45
 
46
+ /**
47
+ * Configuration wizard
48
+ *
49
+ */
50
  public function indexAction()
51
  {
52
  $this->initConfig('index');
55
  $this->renderLayout();
56
  }
57
 
58
+ /**
59
+ * Get config action
60
+ *
61
+ * @param string $actionName
62
+ * @return string
63
+ */
64
  protected function initConfig($actionName)
65
  {
66
  return $this->helperWizard()->initConfig($actionName, $this->getRequest());
67
  }
68
 
69
+ /**
70
+ * Get Novalnet Helper
71
+ *
72
+ * @return Novalnet_Payment_Helper_Data
73
+ */
74
  public function helperWizard()
75
  {
76
  return Mage::helper('novalnet_payment');
77
  }
78
 
79
+ /**
80
+ * Configuration global action
81
+ *
82
+ */
83
  public function generalGlobalAction()
84
  {
85
  $this->_editAction('generalGlobal');
86
  }
87
 
88
+ /**
89
+ * Configuration wizard edit action
90
+ *
91
+ */
92
  protected function _editAction($actionName)
93
  {
94
  $this->initConfig($actionName);
104
  $this->renderLayout();
105
  }
106
 
107
+ /**
108
+ * page redirect
109
+ *
110
+ */
111
  public function _redirectByPageConfig()
112
  {
113
  $url = $this->helperWizard()->getNextPageUrlAsString();
114
  $this->_redirect($url, array('_current' => true));
115
  }
116
 
117
+ /**
118
+ * Save global configuration values
119
+ *
120
+ */
121
  public function saveAction()
122
  {
123
  $pageCode = $this->getRequest()->getParam('page_code');
app/code/community/Novalnet/Payment/controllers/Adminhtml/InformationController.php CHANGED
@@ -12,23 +12,19 @@
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_Adminhtml_InformationController extends Mage_Adminhtml_Controller_Action
27
  {
28
-
29
- /**
30
- *
31
- */
32
  public function indexAction()
33
  {
34
  $this->loadLayout();
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Adminhtml_InformationController extends Mage_Adminhtml_Controller_Action
27
  {
 
 
 
 
28
  public function indexAction()
29
  {
30
  $this->loadLayout();
app/code/community/Novalnet/Payment/controllers/Adminhtml/NovalnetCcController.php DELETED
@@ -1,46 +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
- 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
40
- $this->getLayout()->getBlock('root')->setTemplate('novalnet/payment/method/form/blank.phtml');
41
-
42
- //Now showing it with rendering of layout
43
- $this->renderLayout();
44
- }
45
-
46
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/controllers/Adminhtml/NovalnetSepaController.php DELETED
@@ -1,46 +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
- 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
40
- $this->getLayout()->getBlock('root')->setTemplate('novalnet/payment/method/form/blank.phtml');
41
-
42
- //Now showing it with rendering of layout
43
- $this->renderLayout();
44
- }
45
-
46
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/controllers/Adminhtml/Sales/OrderController.php CHANGED
@@ -12,15 +12,15 @@
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
  require_once 'Mage' . DS . 'Adminhtml' . DS . 'controllers' . DS . 'Sales' . DS . 'OrderController.php';
@@ -31,6 +31,8 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
31
  var $moduleName = 'novalnet_payment';
32
 
33
  /**
 
 
34
  * @return Mage_Adminhtml_Sales_OrderController
35
  */
36
  protected function _initAction()
@@ -44,6 +46,7 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
44
  }
45
 
46
  /**
 
47
  *
48
  */
49
  public function indexAction()
@@ -55,6 +58,7 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
55
  }
56
 
57
  /**
 
58
  *
59
  */
60
  public function transactionStatusGridAction()
@@ -66,6 +70,7 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
66
  }
67
 
68
  /**
 
69
  *
70
  */
71
  public function transactionOverviewGridAction()
@@ -77,6 +82,7 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
77
  }
78
 
79
  /**
 
80
  *
81
  */
82
  public function gridAction()
@@ -88,6 +94,7 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
88
 
89
  /**
90
  * Invoice update order
 
91
  */
92
  public function invoiceupdateAction()
93
  {
@@ -104,26 +111,10 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
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 {
112
- Mage::helper('novalnet_payment/AssignData')->setNovalnetTidOnHold($order);
113
- $order->hold()
114
- ->save();
115
- $this->_getSession()->addSuccess(
116
- $this->__('The order has been put on hold.')
117
- );
118
- } catch (Mage_Core_Exception $e) {
119
- $this->_getSession()->addError($e->getMessage());
120
- } catch (Exception $e) {
121
- $this->_getSession()->addError($this->__('The order was not put on hold.'));
122
- }
123
- $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
124
- }
125
- }
126
-
127
  public function novalnetconfirmAction()
128
  {
129
  $order = $this->_initOrder();
@@ -187,6 +178,12 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
187
  }
188
  }
189
 
 
 
 
 
 
 
190
  protected function saveInvoice($order, $txnId)
191
  {
192
  $invoice = $order->prepareInvoice();
@@ -204,7 +201,9 @@ class Novalnet_Payment_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Sa
204
  /**
205
  * Set the Order basic params
206
  *
207
- * @param string $payment
 
 
208
  */
209
  private function _getVendorParams($request, $payment = NULL)
210
  {
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  require_once 'Mage' . DS . 'Adminhtml' . DS . 'controllers' . DS . 'Sales' . DS . 'OrderController.php';
31
  var $moduleName = 'novalnet_payment';
32
 
33
  /**
34
+ * Init layout, menu and breadcrumb
35
+ *
36
  * @return Mage_Adminhtml_Sales_OrderController
37
  */
38
  protected function _initAction()
46
  }
47
 
48
  /**
49
+ * Orders grid
50
  *
51
  */
52
  public function indexAction()
58
  }
59
 
60
  /**
61
+ * Set transactionstatus grid in sales order
62
  *
63
  */
64
  public function transactionStatusGridAction()
70
  }
71
 
72
  /**
73
+ * Set transactionoverview grid in sales order
74
  *
75
  */
76
  public function transactionOverviewGridAction()
82
  }
83
 
84
  /**
85
+ * Create sales order block for Novalnet payments
86
  *
87
  */
88
  public function gridAction()
94
 
95
  /**
96
  * Invoice update order
97
+ *
98
  */
99
  public function invoiceupdateAction()
100
  {
111
  $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
112
  }
113
 
114
+ /**
115
+ * Order confirmation process for Novalnet payments (Prepayment & Invoice)
116
+ *
117
+ */
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
118
  public function novalnetconfirmAction()
119
  {
120
  $order = $this->_initOrder();
178
  }
179
  }
180
 
181
+ /**
182
+ * Save order invoice
183
+ *
184
+ * @param varien_object $order
185
+ * @param int $txnId
186
+ */
187
  protected function saveInvoice($order, $txnId)
188
  {
189
  $invoice = $order->prepareInvoice();
201
  /**
202
  * Set the Order basic params
203
  *
204
+ * @param varien_object $request
205
+ * @param varien_object $payment
206
+ * @return mixed
207
  */
208
  private function _getVendorParams($request, $payment = NULL)
209
  {
app/code/community/Novalnet/Payment/controllers/Adminhtml/TransactionController.php CHANGED
@@ -12,15 +12,15 @@
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_Adminhtml_TransactionController extends Mage_Adminhtml_Controller_Action
@@ -28,6 +28,7 @@ class Novalnet_Payment_Adminhtml_TransactionController extends Mage_Adminhtml_Co
28
 
29
  /**
30
  * @return Novalnet_Payment_Adminhtml_TransactionController
 
31
  */
32
  protected function _initAction()
33
  {
@@ -45,6 +46,7 @@ class Novalnet_Payment_Adminhtml_TransactionController extends Mage_Adminhtml_Co
45
  }
46
 
47
  /**
 
48
  *
49
  */
50
  public function indexAction()
@@ -54,6 +56,7 @@ class Novalnet_Payment_Adminhtml_TransactionController extends Mage_Adminhtml_Co
54
  }
55
 
56
  /**
 
57
  *
58
  */
59
  public function gridAction()
@@ -63,13 +66,16 @@ class Novalnet_Payment_Adminhtml_TransactionController extends Mage_Adminhtml_Co
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
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Adminhtml_TransactionController extends Mage_Adminhtml_Controller_Action
28
 
29
  /**
30
  * @return Novalnet_Payment_Adminhtml_TransactionController
31
+ *
32
  */
33
  protected function _initAction()
34
  {
46
  }
47
 
48
  /**
49
+ * Render layout
50
  *
51
  */
52
  public function indexAction()
56
  }
57
 
58
  /**
59
+ * Create transaction status block
60
  *
61
  */
62
  public function gridAction()
66
  );
67
  }
68
 
69
+ /**
70
+ * View the transaction status information
71
+ *
72
+ */
73
  public function viewAction()
74
  {
75
  $id = $this->getRequest()->getParam('nntxn_id');
76
  $modelTransStatus = Mage::helper('novalnet_payment')->getModelTransactionStatus()->load($id);
77
 
78
  if (empty($id) || !$modelTransStatus->getNnTxnId()) {
 
79
  $this->_forward('noRoute');
80
  }
81
 
app/code/community/Novalnet/Payment/controllers/Adminhtml/TransactionoverviewController.php CHANGED
@@ -12,15 +12,15 @@
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_Adminhtml_TransactionoverviewController extends Mage_Adminhtml_Controller_Action
@@ -28,6 +28,7 @@ class Novalnet_Payment_Adminhtml_TransactionoverviewController extends Mage_Admi
28
 
29
  /**
30
  * @return Novalnet_NovalnetIdeal_Adminhtml_TransactionController
 
31
  */
32
  protected function _initAction()
33
  {
@@ -43,6 +44,7 @@ class Novalnet_Payment_Adminhtml_TransactionoverviewController extends Mage_Admi
43
  }
44
 
45
  /**
 
46
  *
47
  */
48
  public function indexAction()
@@ -52,6 +54,7 @@ class Novalnet_Payment_Adminhtml_TransactionoverviewController extends Mage_Admi
52
  }
53
 
54
  /**
 
55
  *
56
  */
57
  public function gridAction()
@@ -61,13 +64,16 @@ class Novalnet_Payment_Adminhtml_TransactionoverviewController extends Mage_Admi
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
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_Adminhtml_TransactionoverviewController extends Mage_Adminhtml_Controller_Action
28
 
29
  /**
30
  * @return Novalnet_NovalnetIdeal_Adminhtml_TransactionController
31
+ *
32
  */
33
  protected function _initAction()
34
  {
44
  }
45
 
46
  /**
47
+ * Render layout
48
  *
49
  */
50
  public function indexAction()
54
  }
55
 
56
  /**
57
+ * Create transaction overview block
58
  *
59
  */
60
  public function gridAction()
64
  );
65
  }
66
 
67
+ /**
68
+ * View the transaction overview information
69
+ *
70
+ */
71
  public function viewAction()
72
  {
73
  $id = $this->getRequest()->getParam('nnlog_id');
74
  $modelTransOverview = Mage::helper('novalnet_payment')->getModelTransactionOverview()->load($id);
75
 
76
  if (empty($id) || !$modelTransOverview->getNnLogId()) {
 
77
  $this->_forward('noRoute');
78
  }
79
 
app/code/community/Novalnet/Payment/controllers/GatewayController.php CHANGED
@@ -12,15 +12,15 @@
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_GatewayController extends Mage_Core_Controller_Front_Action
@@ -67,6 +67,7 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
67
 
68
  /**
69
  * When Novalnet returns after successful payment
 
70
  * The order information at this point is in POST
71
  */
72
  public function returnAction()
@@ -91,6 +92,7 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
91
  /**
92
  * When Customer cancelled/error in the payment
93
  *
 
94
  */
95
  public function errorAction()
96
  {
@@ -141,34 +143,13 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
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) {
@@ -196,6 +177,7 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
196
  /**
197
  * Checking Post variables.
198
  *
 
199
  */
200
  protected function _checkReturnedData()
201
  {
@@ -221,7 +203,7 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
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
@@ -278,6 +260,9 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
278
  /**
279
  * validate the response and save the order
280
  *
 
 
 
281
  */
282
  private function _saveSuccessOrder($order, $response, $authorizeKey)
283
  {
@@ -288,7 +273,7 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
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)
@@ -305,11 +290,11 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
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
 
@@ -332,6 +317,9 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
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
  }
@@ -349,7 +337,7 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
349
  /**
350
  * Get Novalnet Helper
351
  *
352
- * @return Helper data
353
  */
354
  private function _getNovalnetHelper()
355
  {
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Action
67
 
68
  /**
69
  * When Novalnet returns after successful payment
70
+ *
71
  * The order information at this point is in POST
72
  */
73
  public function returnAction()
92
  /**
93
  * When Customer cancelled/error in the payment
94
  *
95
+ * Redirects to failure page.
96
  */
97
  public function errorAction()
98
  {
143
  $paymentCode = $paymentObj->getCode();
144
  $helper = $this->_getNovalnetHelper();
145
  $methodSession = $this->_getCheckout()->getData($paymentCode);
 
 
 
 
 
 
 
 
 
 
 
 
 
146
 
147
+ if (!$paymentObj->isCallbackTypeCall()) {
148
+ $request = $methodSession->getPaymentReqData();
149
+ $response = $paymentObj->postRequest($request);
150
+ $error = $paymentObj->validateNovalnetResponse($payment, $response);
 
151
  } else {
152
+ $error = $paymentObj->validateNovalnetResponse($payment, $methodSession->getPaymentResData());
 
 
 
 
 
 
 
153
  }
154
 
155
  if ($error !== false) {
177
  /**
178
  * Checking Post variables.
179
  *
180
+ * @return boolean
181
  */
182
  protected function _checkReturnedData()
183
  {
203
  if ($order->canUnhold()) {
204
  $order->unhold()->save();
205
  }
206
+
207
  $paymentObj->unsetMethodSession($paymentCode);
208
  $authorizeKey = $paymentObj->_getConfigData('password', true);
209
  if ($response['status'] == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED
260
  /**
261
  * validate the response and save the order
262
  *
263
+ * @param varien_object $order
264
+ * @param array $response
265
+ * @param mixed $authorizeKey
266
  */
267
  private function _saveSuccessOrder($order, $response, $authorizeKey)
268
  {
273
  $getAdminTransaction = $paymentObj->doNovalnetStatusCall($txnId, $payment);
274
  $magentoVersion = $helper->getMagentoVersion();
275
  $captureMode = (version_compare($magentoVersion, '1.6', '<')) ? false : true;
276
+
277
  if ($order->canInvoice() && $getAdminTransaction->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
278
  $payment->setTransactionId($txnId) // Add capture text to make the new transaction
279
  ->setParentTransactionId(null)
290
 
291
  $setOrderAfterStatus = $paymentObj->_getConfigData('order_status_after_payment')
292
  ? $paymentObj->_getConfigData('order_status_after_payment') : Mage_Sales_Model_Order::STATE_PROCESSING; // If after status is empty set default status
293
+ if ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_PAYPAL && $response['status']
294
  == Novalnet_Payment_Model_Config::PAYPAL_PENDING_CODE) {
295
+ $setOrderAfterStatus = $paymentObj->_getConfigData('order_status')
296
  ? $paymentObj->_getConfigData('order_status') : Mage_Sales_Model_Order::STATE_PENDING_PAYMENT;
297
+ }
298
  $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $setOrderAfterStatus, $helper->__('Customer successfully returned from Novalnet'), true
299
  )->save();
300
 
317
  $order->save();
318
 
319
  // Get Admin Transaction status via API
320
+ if ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_CC) {
321
+ $dataObj->setAmount($helper->getFormatedAmount($response['amount'], 'RAW'));
322
+ }
323
  $amount = is_numeric($response['amount']) ? $response['amount'] : $helper->getDecodedParam($response['amount'], $authorizeKey);
324
  $helper->doTransactionStatusSave($dataObj, $getAdminTransaction, $payment, $helper->getFormatedAmount($amount, 'RAW')); // Save the Transaction status
325
  }
337
  /**
338
  * Get Novalnet Helper
339
  *
340
+ * @return Novalnet_Payment_Helper_Data
341
  */
342
  private function _getNovalnetHelper()
343
  {
app/code/community/Novalnet/Payment/controllers/NovalnetCcController.php DELETED
@@ -1,46 +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
- 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
40
- $this->getLayout()->getBlock('root')->setTemplate('novalnet/payment/method/form/blank.phtml');
41
-
42
- //Now showing it with rendering of layout
43
- $this->renderLayout();
44
- }
45
-
46
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/controllers/NovalnetSepaController.php DELETED
@@ -1,46 +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
- 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
40
- $this->getLayout()->getBlock('root')->setTemplate('novalnet/payment/method/form/blank.phtml');
41
-
42
- //Now showing it with rendering of layout
43
- $this->renderLayout();
44
- }
45
-
46
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Novalnet/Payment/etc/adminhtml.xml CHANGED
@@ -1,4 +1,30 @@
1
  <?xml version="1.0"?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2
  <config>
3
  <menu>
4
  <novalnet translate="title" module="novalnet_payment">
@@ -32,12 +58,12 @@
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>
1
  <?xml version="1.0"?>
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 payment modulee of Novalnet AG
17
+ * https://www.novalnet.de
18
+ * If you have found this script useful 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 Copyright (c) Novalnet AG. (https://www.novalnet.de)
25
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
+ */
27
+ -->
28
  <config>
29
  <menu>
30
  <novalnet translate="title" module="novalnet_payment">
58
  <children>
59
  <general module="novalnet_payment">
60
  <title>General</title>
61
+ <sort_order>10</sort_order>
62
  <action>adminhtml/system_config/edit/section/novalnet_global/</action>
63
  </general>
64
  <payment module="novalnet_payment">
65
  <title>Payment Methods</title>
66
+ <sort_order>20</sort_order>
67
  <action>adminhtml/system_config/edit/section/novalnet_paymethods/</action>
68
  </payment>
69
  </children>
app/code/community/Novalnet/Payment/etc/config.xml CHANGED
@@ -1,9 +1,35 @@
1
  <?xml version="1.0" encoding="UTF-8"?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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
 
@@ -47,6 +73,14 @@
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 -->
@@ -76,6 +110,12 @@
76
  <callback>
77
  <table>novalnet_payment_callback</table>
78
  </callback>
 
 
 
 
 
 
79
  </entities>
80
  </novalnet_resource>
81
  </models>
@@ -154,11 +194,11 @@
154
  </layout>
155
  <translate>
156
  <modules>
157
- <novalnet_Payment>
158
  <files>
159
  <default>Novalnet_Payment.csv</default>
160
  </files>
161
- </novalnet_Payment>
162
  </modules>
163
  </translate>
164
  </adminhtml>
@@ -175,11 +215,11 @@
175
  </routers>
176
  <translate>
177
  <modules>
178
- <novalnet_Payment>
179
  <files>
180
  <default>Novalnet_Payment.csv</default>
181
  </files>
182
- </novalnet_Payment>
183
  </modules>
184
  </translate>
185
  <layout>
@@ -190,14 +230,6 @@
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>
@@ -278,6 +310,7 @@
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>
@@ -292,15 +325,6 @@
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>
1
  <?xml version="1.0" encoding="UTF-8"?>
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 payment modulee of Novalnet AG
17
+ * https://www.novalnet.de
18
+ * If you have found this script useful 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 Copyright (c) Novalnet AG. (https://www.novalnet.de)
25
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
+ */
27
+ -->
28
  <config>
29
  <modules>
30
  <Novalnet_Payment>
31
  <!-- declare module's version information for database updates -->
32
+ <version>5.0.4</version>
33
  </Novalnet_Payment>
34
  </modules>
35
 
73
  </novalnet_payment_order_observer_creditmemo_send_email>
74
  </observers>
75
  </sales_order_creditmemo_refund>
76
+ <core_block_abstract_prepare_layout_before>
77
+ <observers>
78
+ <novalnet_payment_prepare_layout_before>
79
+ <class>Novalnet_Payment_Model_Observer</class>
80
+ <method>prepareLayoutBefore</method>
81
+ </novalnet_payment_prepare_layout_before>
82
+ </observers>
83
+ </core_block_abstract_prepare_layout_before>
84
  </events>
85
 
86
  <!-- declare model group for new module -->
110
  <callback>
111
  <table>novalnet_payment_callback</table>
112
  </callback>
113
+ <aff_account_detail>
114
+ <table>novalnet_payment_aff_account_detail</table>
115
+ </aff_account_detail>
116
+ <aff_user_detail>
117
+ <table>novalnet_payment_aff_user_detail</table>
118
+ </aff_user_detail>
119
  </entities>
120
  </novalnet_resource>
121
  </models>
194
  </layout>
195
  <translate>
196
  <modules>
197
+ <Novalnet_Payment>
198
  <files>
199
  <default>Novalnet_Payment.csv</default>
200
  </files>
201
+ </Novalnet_Payment>
202
  </modules>
203
  </translate>
204
  </adminhtml>
215
  </routers>
216
  <translate>
217
  <modules>
218
+ <Novalnet_Payment>
219
  <files>
220
  <default>Novalnet_Payment.csv</default>
221
  </files>
222
+ </Novalnet_Payment>
223
  </modules>
224
  </translate>
225
  <layout>
230
  </updates>
231
  </layout>
232
  <events>
 
 
 
 
 
 
 
 
233
  <customer_logout>
234
  <observers>
235
  <novalnet>
310
  </novalnetIdeal>
311
  <novalnetCc translate="title" module="novalnet_payment">
312
  <active>0</active>
313
+ <cctypes>VI,MC</cctypes>
314
  <model>novalnet_payment/payment_method_novalnetCc</model>
315
  <allowspecific>0</allowspecific>
316
  <title>Novalnet Kreditkarte</title>
325
  <gateway_timeout>240</gateway_timeout>
326
  <group>novalnet</group>
327
  </novalnetSepa>
 
 
 
 
 
 
 
 
 
328
  </payment>
329
  </default>
330
  </config>
app/code/community/Novalnet/Payment/etc/system.xml CHANGED
@@ -1,4 +1,30 @@
1
  <?xml version="1.0" encoding="UTF-8"?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2
  <config>
3
  <tabs>
4
  <novalnet translate="label" module="novalnet_payment">
@@ -167,23 +193,12 @@
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>
@@ -196,7 +211,7 @@
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>
@@ -209,7 +224,7 @@
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>
@@ -217,17 +232,27 @@
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>
@@ -414,7 +439,7 @@
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>
@@ -955,7 +980,7 @@
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>
@@ -1034,7 +1059,7 @@
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>
@@ -1043,7 +1068,7 @@
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>
@@ -1053,7 +1078,7 @@
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>
@@ -1067,7 +1092,7 @@
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>
@@ -1077,7 +1102,7 @@
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>
@@ -1087,7 +1112,7 @@
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>
@@ -1099,7 +1124,7 @@
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>
@@ -1200,7 +1225,7 @@
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>
@@ -1209,7 +1234,7 @@
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>
@@ -1219,7 +1244,7 @@
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>
@@ -1235,7 +1260,7 @@
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>
@@ -1245,7 +1270,7 @@
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>
@@ -1255,7 +1280,7 @@
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>
@@ -1267,7 +1292,7 @@
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>
@@ -1368,7 +1393,7 @@
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>
@@ -1377,7 +1402,7 @@
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>
@@ -1387,7 +1412,7 @@
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>
@@ -1401,7 +1426,7 @@
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>
@@ -1411,7 +1436,7 @@
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>
@@ -1421,7 +1446,7 @@
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>
@@ -1433,7 +1458,7 @@
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>
@@ -1441,162 +1466,6 @@
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 -->
@@ -1626,7 +1495,7 @@
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>
@@ -1636,14 +1505,14 @@
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>
@@ -1658,7 +1527,7 @@
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>
@@ -1668,7 +1537,7 @@
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>
@@ -1690,7 +1559,7 @@
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>
@@ -1700,7 +1569,7 @@
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>
1
  <?xml version="1.0" encoding="UTF-8"?>
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 payment modulee of Novalnet AG
17
+ * https://www.novalnet.de
18
+ * If you have found this script useful 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 Copyright (c) Novalnet AG. (https://www.novalnet.de)
25
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
+ */
27
+ -->
28
  <config>
29
  <tabs>
30
  <novalnet translate="label" module="novalnet_payment">
193
  <show_in_website>1</show_in_website>
194
  <show_in_store>1</show_in_store>
195
  </title>
 
 
 
 
 
 
 
 
 
 
 
196
  <order_status translate="label">
197
+ <label>Order Completion Status</label>
198
  <frontend_type>select</frontend_type>
199
  <config_path>payment/novalnetCc/order_status</config_path>
200
  <source_model>adminhtml/system_config_source_order_status</source_model>
201
+ <sort_order>3</sort_order>
202
  <show_in_default>1</show_in_default>
203
  <show_in_website>1</show_in_website>
204
  <show_in_store>1</show_in_store>
211
  <frontend_type>select</frontend_type>
212
  <config_path>payment/novalnetCc/order_status</config_path>
213
  <source_model>adminhtml/system_config_source_order_status</source_model>
214
+ <sort_order>3</sort_order>
215
  <show_in_default>1</show_in_default>
216
  <show_in_website>1</show_in_website>
217
  <show_in_store>1</show_in_store>
224
  <frontend_type>select</frontend_type>
225
  <config_path>payment/novalnetCc/order_status_after_payment</config_path>
226
  <source_model>adminhtml/system_config_source_order_status</source_model>
227
+ <sort_order>4</sort_order>
228
  <show_in_default>1</show_in_default>
229
  <show_in_website>1</show_in_website>
230
  <show_in_store>1</show_in_store>
232
  <active_cc3d>1</active_cc3d>
233
  </depends>
234
  </order_status_after_payment>
235
+ <cctypes translate="label">
236
+ <label>Credit Card Types</label>
237
+ <frontend_type>multiselect</frontend_type>
238
+ <config_path>payment/novalnetCc/cctypes</config_path>
239
+ <source_model>novalnet_payment/novalnet_source_cctypes</source_model>
240
+ <sort_order>5</sort_order>
241
+ <show_in_default>1</show_in_default>
242
+ <show_in_website>1</show_in_website>
243
+ <show_in_store>1</show_in_store>
244
+ </cctypes>
245
+ <active_cc3d translate="label">
246
+ <label>Enable cc3d</label>
247
+ <comment>cc3d description</comment>
248
  <frontend_type>select</frontend_type>
249
  <source_model>adminhtml/system_config_source_yesno</source_model>
250
+ <config_path>payment/novalnetCc/active_cc3d</config_path>
251
  <sort_order>6</sort_order>
252
  <show_in_default>1</show_in_default>
253
  <show_in_website>1</show_in_website>
254
  <show_in_store>1</show_in_store>
255
+ </active_cc3d>
256
  <manual_checking_amount tranlate="label" >
257
  <label>Manual checking of order</label>
258
  <comment>Manual checking of order Desc</comment>
439
  <show_in_store>1</show_in_store>
440
  </title>
441
  <order_status translate="label">
442
+ <label>Order Completion Status</label>
443
  <frontend_type>select</frontend_type>
444
  <config_path>payment/novalnetSepa/order_status</config_path>
445
  <source_model>adminhtml/system_config_source_order_status</source_model>
980
  <frontend_type>select</frontend_type>
981
  <config_path>payment/novalnetSofortueberweisung/active</config_path>
982
  <source_model>adminhtml/system_config_source_yesno</source_model>
983
+ <sort_order>1</sort_order>
984
  <show_in_default>1</show_in_default>
985
  <show_in_website>1</show_in_website>
986
  <show_in_store>1</show_in_store>
1059
  <label>Gateway Timeout</label>
1060
  <frontend_type>text</frontend_type>
1061
  <config_path>payment/novalnetSofortueberweisung/gateway_timeout</config_path>
1062
+ <sort_order>9</sort_order>
1063
  <show_in_default>1</show_in_default>
1064
  <show_in_website>1</show_in_website>
1065
  <show_in_store>1</show_in_store>
1068
  <label>Payment from applicable countries</label>
1069
  <frontend_type>allowspecific</frontend_type>
1070
  <config_path>payment/novalnetSofortueberweisung/allowspecific</config_path>
1071
+ <sort_order>10</sort_order>
1072
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1073
  <show_in_default>1</show_in_default>
1074
  <show_in_website>1</show_in_website>
1078
  <label>Payment from Specific countries</label>
1079
  <frontend_type>multiselect</frontend_type>
1080
  <config_path>payment/novalnetSofortueberweisung/specificcountry</config_path>
1081
+ <sort_order>11</sort_order>
1082
  <source_model>adminhtml/system_config_source_country</source_model>
1083
  <show_in_default>1</show_in_default>
1084
  <show_in_website>1</show_in_website>
1092
  <frontend_type>text</frontend_type>
1093
  <validate>validate-number</validate>
1094
  <config_path>payment/novalnetSofortueberweisung/min_order_total</config_path>
1095
+ <sort_order>12</sort_order>
1096
  <show_in_default>1</show_in_default>
1097
  <show_in_website>1</show_in_website>
1098
  <show_in_store>1</show_in_store>
1102
  <frontend_type>text</frontend_type>
1103
  <validate>validate-number</validate>
1104
  <config_path>payment/novalnetSofortueberweisung/max_order_total</config_path>
1105
+ <sort_order>13</sort_order>
1106
  <show_in_default>1</show_in_default>
1107
  <show_in_website>1</show_in_website>
1108
  <show_in_store>1</show_in_store>
1112
  <frontend_type>text</frontend_type>
1113
  <validate>validate-digits</validate>
1114
  <config_path>payment/novalnetSofortueberweisung/orderscount</config_path>
1115
+ <sort_order>14</sort_order>
1116
  <comment>Novalnet Minimum Orders Count Desc</comment>
1117
  <show_in_default>1</show_in_default>
1118
  <show_in_website>1</show_in_website>
1124
  <frontend_type>text</frontend_type>
1125
  <validate>validate-digits</validate>
1126
  <config_path>payment/novalnetSofortueberweisung/sort_order</config_path>
1127
+ <sort_order>15</sort_order>
1128
  <show_in_default>1</show_in_default>
1129
  <show_in_website>1</show_in_website>
1130
  <show_in_store>1</show_in_store>
1225
  <label>Gateway Timeout</label>
1226
  <frontend_type>text</frontend_type>
1227
  <config_path>payment/novalnetPaypal/gateway_timeout</config_path>
1228
+ <sort_order>9</sort_order>
1229
  <show_in_default>1</show_in_default>
1230
  <show_in_website>1</show_in_website>
1231
  <show_in_store>1</show_in_store>
1234
  <label>Payment from applicable countries</label>
1235
  <frontend_type>allowspecific</frontend_type>
1236
  <config_path>payment/novalnetPaypal/allowspecific</config_path>
1237
+ <sort_order>10</sort_order>
1238
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1239
  <show_in_default>1</show_in_default>
1240
  <show_in_website>1</show_in_website>
1244
  <label>Payment from Specific countries</label>
1245
  <frontend_type>multiselect</frontend_type>
1246
  <config_path>payment/novalnetPaypal/specificcountry</config_path>
1247
+ <sort_order>11</sort_order>
1248
  <source_model>adminhtml/system_config_source_country</source_model>
1249
  <show_in_default>1</show_in_default>
1250
  <show_in_website>1</show_in_website>
1260
  <frontend_type>text</frontend_type>
1261
  <validate>validate-number</validate>
1262
  <config_path>payment/novalnetPaypal/min_order_total</config_path>
1263
+ <sort_order>12</sort_order>
1264
  <show_in_default>1</show_in_default>
1265
  <show_in_website>1</show_in_website>
1266
  <show_in_store>1</show_in_store>
1270
  <frontend_type>text</frontend_type>
1271
  <validate>validate-number</validate>
1272
  <config_path>payment/novalnetPaypal/max_order_total</config_path>
1273
+ <sort_order>13</sort_order>
1274
  <show_in_default>1</show_in_default>
1275
  <show_in_website>1</show_in_website>
1276
  <show_in_store>1</show_in_store>
1280
  <frontend_type>text</frontend_type>
1281
  <validate>validate-digits</validate>
1282
  <config_path>payment/novalnetPaypal/orderscount</config_path>
1283
+ <sort_order>14</sort_order>
1284
  <comment>Novalnet Minimum Orders Count Desc</comment>
1285
  <show_in_default>1</show_in_default>
1286
  <show_in_website>1</show_in_website>
1292
  <frontend_type>text</frontend_type>
1293
  <validate>validate-digits</validate>
1294
  <config_path>payment/novalnetPaypal/sort_order</config_path>
1295
+ <sort_order>15</sort_order>
1296
  <show_in_default>1</show_in_default>
1297
  <show_in_website>1</show_in_website>
1298
  <show_in_store>1</show_in_store>
1393
  <label>Gateway Timeout</label>
1394
  <frontend_type>text</frontend_type>
1395
  <config_path>payment/novalnetIdeal/gateway_timeout</config_path>
1396
+ <sort_order>9</sort_order>
1397
  <show_in_default>1</show_in_default>
1398
  <show_in_website>1</show_in_website>
1399
  <show_in_store>1</show_in_store>
1402
  <label>Payment from applicable countries</label>
1403
  <frontend_type>allowspecific</frontend_type>
1404
  <config_path>payment/novalnetIdeal/allowspecific</config_path>
1405
+ <sort_order>10</sort_order>
1406
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1407
  <show_in_default>1</show_in_default>
1408
  <show_in_website>1</show_in_website>
1412
  <label>Payment from Specific countries</label>
1413
  <frontend_type>multiselect</frontend_type>
1414
  <config_path>payment/novalnetIdeal/specificcountry</config_path>
1415
+ <sort_order>11</sort_order>
1416
  <source_model>adminhtml/system_config_source_country</source_model>
1417
  <show_in_default>1</show_in_default>
1418
  <show_in_website>1</show_in_website>
1426
  <frontend_type>text</frontend_type>
1427
  <validate>validate-number</validate>
1428
  <config_path>payment/novalnetIdeal/min_order_total</config_path>
1429
+ <sort_order>12</sort_order>
1430
  <show_in_default>1</show_in_default>
1431
  <show_in_website>1</show_in_website>
1432
  <show_in_store>1</show_in_store>
1436
  <frontend_type>text</frontend_type>
1437
  <validate>validate-number</validate>
1438
  <config_path>payment/novalnetIdeal/max_order_total</config_path>
1439
+ <sort_order>13</sort_order>
1440
  <show_in_default>1</show_in_default>
1441
  <show_in_website>1</show_in_website>
1442
  <show_in_store>1</show_in_store>
1446
  <frontend_type>text</frontend_type>
1447
  <validate>validate-digits</validate>
1448
  <config_path>payment/novalnetIdeal/orderscount</config_path>
1449
+ <sort_order>14</sort_order>
1450
  <comment>Novalnet Minimum Orders Count Desc</comment>
1451
  <show_in_default>1</show_in_default>
1452
  <show_in_website>1</show_in_website>
1458
  <frontend_type>text</frontend_type>
1459
  <validate>validate-digits</validate>
1460
  <config_path>payment/novalnetIdeal/sort_order</config_path>
1461
+ <sort_order>15</sort_order>
1462
  <show_in_default>1</show_in_default>
1463
  <show_in_website>1</show_in_website>
1464
  <show_in_store>1</show_in_store>
1466
  </fields>
1467
  </novalnetIdeal>
1468
  <!--}}} Novalnet Ideal-->
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1469
  </groups>
1470
  </novalnet_paymethods>
1471
  <!-- novalnet paymethods -->
1495
  <frontend_type>select</frontend_type>
1496
  <config_path>payment/novalnetCc/callback</config_path>
1497
  <source_model>novalnet_payment/novalnet_source_callbacktypes</source_model>
1498
+ <sort_order>1</sort_order>
1499
  <show_in_default>1</show_in_default>
1500
  <show_in_website>1</show_in_website>
1501
  <show_in_store>1</show_in_store>
1505
  <frontend_type>text</frontend_type>
1506
  <validate>validate-digits</validate>
1507
  <config_path>payment/novalnetCc/callback_minimum_amount</config_path>
1508
+ <sort_order>2</sort_order>
1509
  <show_in_default>1</show_in_default>
1510
  <show_in_website>1</show_in_website>
1511
  <show_in_store>1</show_in_store>
1512
  </callback_minimum_amount>
1513
  </fields>
1514
  </novalnetCc>
1515
+ <novalnetSepa translate="label" module="novalnet_payment">
1516
  <label>Novalnet Direct Debit SEPA</label>
1517
  <comment>Enable the payment Method and activate the Risk and Control option</comment>
1518
  <frontend_type>text</frontend_type>
1527
  <frontend_type>select</frontend_type>
1528
  <config_path>payment/novalnetSepa/callback</config_path>
1529
  <source_model>novalnet_payment/novalnet_source_callbacktypes</source_model>
1530
+ <sort_order>1</sort_order>
1531
  <show_in_default>1</show_in_default>
1532
  <show_in_website>1</show_in_website>
1533
  <show_in_store>1</show_in_store>
1537
  <frontend_type>text</frontend_type>
1538
  <validate>validate-digits</validate>
1539
  <config_path>payment/novalnetSepa/callback_minimum_amount</config_path>
1540
+ <sort_order>2</sort_order>
1541
  <show_in_default>1</show_in_default>
1542
  <show_in_website>1</show_in_website>
1543
  <show_in_store>1</show_in_store>
1559
  <frontend_type>select</frontend_type>
1560
  <config_path>payment/novalnetInvoice/callback</config_path>
1561
  <source_model>novalnet_payment/novalnet_source_callbacktypes</source_model>
1562
+ <sort_order>1</sort_order>
1563
  <show_in_default>1</show_in_default>
1564
  <show_in_website>1</show_in_website>
1565
  <show_in_store>1</show_in_store>
1569
  <frontend_type>text</frontend_type>
1570
  <validate>validate-digits</validate>
1571
  <config_path>payment/novalnetInvoice/callback_minimum_amount</config_path>
1572
+ <sort_order>2</sort_order>
1573
  <show_in_default>1</show_in_default>
1574
  <show_in_website>1</show_in_website>
1575
  <show_in_store>1</show_in_store>
app/code/community/Novalnet/Payment/sql/novalnet_setup/{mysql4-install-5.0.3.php → mysql4-install-5.0.4.php} RENAMED
@@ -12,21 +12,23 @@
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');
@@ -97,6 +99,43 @@ $installer->run("
97
  ) ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_unicode_ci;
98
  ");
99
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
100
  $methodFields = array();
101
  $methodData = array(
102
  'sofortueberweisung' => 'novalnetSofortueberweisung',
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  /** 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
+ $tableAffAccountDetail = $this->getTable('novalnet_payment/aff_account_detail');
31
+ $tableAffUserDetail = $this->getTable('novalnet_payment/aff_user_detail');
32
 
33
  /** magento tables */
34
  $tableOrderPayment = $this->getTable('sales/order_payment');
99
  ) ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_unicode_ci;
100
  ");
101
 
102
+ #-----------------------------------------------------------------
103
+ #-- Create Table novalnet_affiliate_account_info
104
+ #-----------------------------------------------------------------
105
+ $installer->run("
106
+ CREATE TABLE IF NOT EXISTS `{$tableAffAccountDetail}` (
107
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
108
+ `vendor_id` int(11) unsigned NOT NULL,
109
+ `vendor_authcode` varchar(40) NOT NULL,
110
+ `product_id` int(11) unsigned NOT NULL,
111
+ `product_url` varchar(200) NOT NULL,
112
+ `activation_date` datetime NOT NULL,
113
+ `aff_id` int(11) unsigned DEFAULT NULL,
114
+ `aff_authcode` varchar(40) DEFAULT NULL,
115
+ `aff_accesskey` varchar(40) NOT NULL,
116
+ PRIMARY KEY (`id`),
117
+ KEY `vendor_id` (`vendor_id`),
118
+ KEY `product_id` (`product_id`),
119
+ KEY `aff_id` (`aff_id`)
120
+ ) ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_unicode_ci;
121
+ ");
122
+
123
+ #-----------------------------------------------------------------
124
+ #-- Create Table novalnet_aff_user_detail
125
+ #-----------------------------------------------------------------
126
+ $installer->run("
127
+ CREATE TABLE IF NOT EXISTS `{$tableAffUserDetail}` (
128
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
129
+ `aff_id` int(11) unsigned NULL,
130
+ `customer_no` varchar(40) NULL,
131
+ `aff_order_no` varchar(40) NULL,
132
+ PRIMARY KEY (`id`),
133
+ KEY `aff_id` (`aff_id`),
134
+ KEY `customer_no` (`customer_no`),
135
+ KEY `aff_order_no` (`aff_order_no`)
136
+ ) ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_unicode_ci;
137
+ ");
138
+
139
  $methodFields = array();
140
  $methodData = array(
141
  'sofortueberweisung' => 'novalnetSofortueberweisung',
app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-1.4.0-5.0.0.php CHANGED
@@ -12,15 +12,15 @@
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 */
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  /** novalnet tables */
app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-5.0.0-5.0.1.php CHANGED
@@ -12,15 +12,15 @@
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 */
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  /** magento table */
app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-5.0.1-5.0.2.php CHANGED
@@ -12,15 +12,15 @@
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 table */
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  /** novalnet table */
app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-5.0.2-5.0.3.php CHANGED
@@ -12,15 +12,15 @@
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 */
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  /** magento table */
app/code/community/Novalnet/Payment/sql/novalnet_setup/mysql4-upgrade-5.0.3-5.0.4.php ADDED
@@ -0,0 +1,71 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ /** novalnet table */
27
+ $tableAffAccountDetail = $this->getTable('novalnet_payment/aff_account_detail');
28
+ $tableAffUserDetail = $this->getTable('novalnet_payment/aff_user_detail');
29
+
30
+ $installer = $this;
31
+
32
+ $installer->startSetup();
33
+
34
+ #-----------------------------------------------------------------
35
+ #-- Create Table novalnet_affiliate_account_info
36
+ #-----------------------------------------------------------------
37
+ $installer->run("
38
+ CREATE TABLE IF NOT EXISTS `{$tableAffAccountDetail}` (
39
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
40
+ `vendor_id` int(11) unsigned NOT NULL,
41
+ `vendor_authcode` varchar(40) NOT NULL,
42
+ `product_id` int(11) unsigned NOT NULL,
43
+ `product_url` varchar(200) NOT NULL,
44
+ `activation_date` datetime NOT NULL,
45
+ `aff_id` int(11) unsigned DEFAULT NULL,
46
+ `aff_authcode` varchar(40) DEFAULT NULL,
47
+ `aff_accesskey` varchar(40) NOT NULL,
48
+ PRIMARY KEY (`id`),
49
+ KEY `vendor_id` (`vendor_id`),
50
+ KEY `product_id` (`product_id`),
51
+ KEY `aff_id` (`aff_id`)
52
+ ) ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_unicode_ci;
53
+ ");
54
+
55
+ #-----------------------------------------------------------------
56
+ #-- Create Table novalnet_aff_user_detail
57
+ #-----------------------------------------------------------------
58
+ $installer->run("
59
+ CREATE TABLE IF NOT EXISTS `{$tableAffUserDetail}` (
60
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
61
+ `aff_id` int(11) unsigned NULL,
62
+ `customer_no` varchar(40) NULL,
63
+ `aff_order_no` varchar(40) NULL,
64
+ PRIMARY KEY (`id`),
65
+ KEY `aff_id` (`aff_id`),
66
+ KEY `customer_no` (`customer_no`),
67
+ KEY `aff_order_no` (`aff_order_no`)
68
+ ) ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_unicode_ci;
69
+ ");
70
+
71
+ $installer->endSetup();
app/design/adminhtml/default/default/layout/novalnet/configuration.xml CHANGED
@@ -85,7 +85,6 @@
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>
91
 
85
  name="novalnet.config.wizard.page.switcher"
86
  before="-"
87
  template="novalnet/payment/configuration/store_switcher.phtml" />
 
88
  </reference>
89
  </novalnet_payment_adminhtml_configuration_wizard_page_index>
90
 
app/design/adminhtml/default/default/template/novalnet/information/iframe.phtml CHANGED
@@ -12,24 +12,21 @@
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
- * @var $this Novalnet_NovalnetIdeal_Block_Adminhtml_Information_Abstract
28
- */
29
- $url = $this->getNovalnetUrl();
30
  ?>
 
31
  <div style="width:100%;">
32
  <iframe src="<?php echo $url ?>" width="100%" frameborder="0" border="0"
33
  style="min-height:1300px; height: 100%; overflow: hidden;">
34
  </iframe>
35
- </div>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
 
 
26
  ?>
27
+ <?php $url = $this->getNovalnetUrl(); ?>
28
  <div style="width:100%;">
29
  <iframe src="<?php echo $url ?>" width="100%" frameborder="0" border="0"
30
  style="min-height:1300px; height: 100%; overflow: hidden;">
31
  </iframe>
32
+ </div>
app/design/adminhtml/default/default/template/novalnet/payment/configuration/container.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
@@ -31,9 +31,7 @@
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>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
31
  </tr>
32
  </table>
33
  </div>
 
34
  <?php echo $this->getViewHtml() ?>
 
35
  <div class="content-header" id="novalnet_wizard_form_buttons">
36
  <table cellspacing="0">
37
  <tr>
app/design/adminhtml/default/default/template/novalnet/payment/configuration/formcontainer.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/novalnet/payment/configuration/store_switcher.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Cc.phtml CHANGED
@@ -12,67 +12,119 @@
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
- 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="" />
72
- <input type="hidden" name="novalnet_cc_exp_year" id="novalnet_cc_exp_year" value="" />
73
- <input type="hidden" name="novalnet_cc_cid" id="novalnet_cc_cid" value="" />
74
- <input type="hidden" name="novalnet_cc_pan_hash" id="novalnet_cc_pan_hash" value="" />
75
- <input type="hidden" name="novalnet_cc_unique_id" id="novalnet_cc_unique_id" value="" />
76
- <input type="hidden" name="novalnet_cc_field_validator" id="novalnet_cc_field_validator" value="" />
77
- <!--}}} Novalnet Cc Form -->
78
  </fieldset>
 
 
 
 
 
 
 
 
 
 
 
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
+ $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
+ $refillValues = $assignDatahelper->_getCheckout()->getData($code);
30
+ $ccRefill = $this->getMethod()->getConfigData('cc_refill');
31
+ $billingaddres = Mage::getSingleton('adminhtml/session_quote')->getQuote()->getBillingAddress();
32
+
33
  ?>
34
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
35
  <!--{{{ Payment Logo -->
36
  <div>
37
+ <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;float:none;">
38
+ <?php foreach ($this->getCcAvailableTypes() as $typeCode => $typeName): ?>
39
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $typeCode . "_Logo.png"; ?>
40
+ <img style="height:20px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
41
+ <?php endforeach; ?>
42
+ </a>
 
 
 
 
 
 
 
43
  </div>
44
  <!--}}} Payment Logo -->
45
  <!--{{{ Novalnet Cc Form -->
46
+ <ul id="payment_form_<?php echo $code ?>" style="display:none">
47
+ <div class="nnccloader" id='cc_loading' style='display:none;'></div>
48
+ <li>
49
+ <?php echo $this->__('The amount will be booked immediately from your credit card.'); ?>
50
+ </li>
51
+ <?php if ($this->getUserInfo()): ?>
52
+ <li>
53
+ <?php echo $this->getUserInfo() ?>
54
+ </li>
55
+ <?php endif ?>
56
+ <?php if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('live_mode', true) == 0): ?>
57
+ <li>
58
+ <div style="font-weight:bold;color:red;font-size:12px;">
59
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
60
+ </div>
61
+ </li>
62
+ <?php endif ?>
63
+ <li>
64
+ <div class="input-box">
65
+ <label for="<?php echo $code ?>_cc_type"><?php echo $this->__('NN CC type') ?><span class="required">*</span></label><br />
66
+ <select id="<?php echo $code ?>_cc_type" onchange="ccHashCall();" class="required-entry validate-cc-type-select">
67
+ <option value=""><?php echo $this->__('--Please Select--') ?></option>
68
+ <?php foreach ($this->getCcAvailableTypes() as $typeCode => $typeName): ?>
69
+ <option value="<?php echo $typeCode ?>"><?php echo $typeName ?></option>
70
+ <?php endforeach; ?>
71
+ </select>
72
  </div>
73
+ </li>
74
+ <li>
75
+ <div class="input-box">
76
+ <label for="<?php echo $code ?>_cc_owner"><?php echo $this->__('NN CC holder') ?><span class="required">*</span></label><br/>
77
+ <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_cc_owner" autocomplete="off" onchange="ccHashCall();" value="<?php $billingaddres->getFirstname().' '.$billingaddres->getLastname()?>" />
78
  </div>
79
+ </li>
80
+ <li>
81
+ <div class="input-box">
82
+ <label for="<?php echo $code ?>_cc_number"><?php echo $this->__('NN CC number') ?><span class="required">*</span></label><br/>
83
+ <input type="text" id="<?php echo $code ?>_cc_number" title="<?php echo $this->__('Credit Card Number') ?>" class="required-entry input-text validate-cc-number validate-cc-type" autocomplete="off" onchange="ccHashCall();" onkeypress="return isNumberKey(event, true);" value="" />
84
+ </div>
85
+ </li>
86
+ <li>
87
+ <div class="input-box">
88
+ <label for="<?php echo $code ?>_expiration"><?php echo $this->__('NN Expiration Date') ?><span class="required">*</span></label><br />
89
+ <select id="<?php echo $code ?>_expiration" style="width:140px;" onchange="ccHashCall();" class="required-entry">
90
+ <option value=""><?php echo $this->__('Month'); ?></option>
91
+ <?php foreach ($this->getCcMonths() as $k => $v): ?>
92
+ <option value="<?php echo $k ?>"><?php echo $v ?></option>
93
+ <?php endforeach; ?>
94
+ </select>
95
+ <select id="<?php echo $code ?>_expiration_yr" style="width:103px;" onchange="ccHashCall();" class="required-entry">
96
+ <option value=""><?php echo $this->__('Year'); ?></option>
97
+ <?php foreach ($this->getCcYears() as $k => $v): ?>
98
+ <option value="<?php echo $k ?>"><?php echo $v ?></option>
99
+ <?php endforeach; ?>
100
+ </select>
101
+ </div>
102
+ </li>
103
+ <li>
104
+ <div class="input-box">
105
+ <label for="<?php echo $code ?>_cc_cid"><?php echo $this->__('NN CVC') ?><span class="required">*</span></label><br />
106
+ <div class="v-fix"><input type="text" title="<?php echo $this->__('Card Verification Number') ?>" onchange="ccHashCall();" onkeypress="return isNumberKey(event);" class="required-entry input-text validate-cc-cvn" id="<?php echo $code ?>_cc_cid" name="payment[nn_cc_cid]" style="width:3em;" autocomplete="off" />
107
+ </div>
108
+ </li>
109
+ </ul>
110
  <input type="hidden" id="original_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>" />
111
  <input type="hidden" id="original_vendor_authcode" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>" />
112
+ <input type="hidden" name="novalnet_cc_hash" id="novalnet_cc_hash" value="" />
113
+ <input type="hidden" name="novalnet_cc_pan_hash" id="novalnet_cc_pan_hash" value="<?php echo $ccRefill ? $refillValues->getCcPanHash() : ''; ?>" />
114
+ <input type="hidden" name="novalnet_cc_unique_id" id="novalnet_cc_unique_id" value="<?php echo $ccRefill ? $refillValues->getCcUniqueId() : ''; ?>" />
115
+ <input type="hidden" id="nn_cc_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
116
+ <input type="hidden" id="nn_cc_validate_error_message" value="<?php echo $this->__('Please enter valid credit card details') . '!'; ?>" />
117
+
 
 
 
 
 
118
  </fieldset>
119
+
120
+ <style>
121
+ .nnccloader {
122
+ position: fixed;
123
+ left: 0px;
124
+ top: 0px;
125
+ width: 100%;
126
+ height: 100%;
127
+ z-index: 9999;
128
+ background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
129
+ }
130
+ </style>
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Ccform.phtml DELETED
@@ -1,53 +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 = 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/Ideal.phtml DELETED
@@ -1,66 +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
- <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 = "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>
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/Invoice.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Paypal.phtml DELETED
@@ -1,66 +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
- <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 = "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>
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/Phonepayment.phtml 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
- <?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
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Sepa.phtml CHANGED
@@ -12,21 +12,36 @@
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
- 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 -->
@@ -41,26 +56,256 @@ $helper = Mage::helper('novalnet_payment');
41
  </div>
42
  <!--}}} Payment Logo -->
43
  <!--{{{ Novalnet SEPA Form -->
44
- <div id="payment_form_<?php echo $code ?>" style="display:none;">
45
- <?php if (!$this->getMethod()->validateNovalnetIframeParams()): ?>
 
 
 
 
 
 
 
 
 
 
46
  <div style="font-weight:bold;color:red;font-size:12px;">
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 -->
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
66
  </fieldset>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
+ $sepaRefill = $this->getMethod()->getConfigData('sepa_refill');
29
+ $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
30
+ $refillValues = $assignDatahelper->_getCheckout()->getData($code);
31
+ $refillMethod = ($sepaRefill && $refillValues != '' && $code == $refillValues->getMethod());
32
+
33
+ $billingaddres = Mage::getSingleton('adminhtml/session_quote')->getQuote()->getBillingAddress();
34
+ $billingCountry = $billingaddres->getcountryId() ? strtoupper($billingaddres->getcountryId()) : 'DE';
35
+ $accountHolder = $refillMethod ? $refillValues->getAccountHolder() : '';
36
+ $refillName = ($sepaRefill && $accountHolder) ? $accountHolder : $billingaddres->getFirstname() . ' ' . $billingaddres->getLastname();
37
+ $dataStreet = $billingaddres->getStreet();
38
+ $dataCity = $billingaddres->getCity();
39
+ $dataCompany = $billingaddres->getCompany();
40
+ $dataPostcode = $billingaddres->getPostcode();
41
+ $dataemail = $billingaddres->getEmail();
42
+ foreach ($dataStreet as $dataStreetValue) {
43
+ $quoteaddress = $dataStreetValue;
44
+ }
45
  ?>
46
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
47
  <!--{{{ Payment Logo -->
56
  </div>
57
  <!--}}} Payment Logo -->
58
  <!--{{{ Novalnet SEPA Form -->
59
+ <ul id="payment_form_<?php echo $code ?>" style="display:none">
60
+ <div class="nnsepaloader" id='sepa_loading' style='display:none;'></div>
61
+ <li>
62
+ <?php echo $this->__('Your account will be debited upon delivery of goods.'); ?>
63
+ </li>
64
+ <?php if ($this->getUserInfo()): ?>
65
+ <li>
66
+ <?php echo $this->getUserInfo() ?>
67
+ </li>
68
+ <?php endif ?>
69
+ <?php if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('live_mode', true) == 0): ?>
70
+ <li>
71
  <div style="font-weight:bold;color:red;font-size:12px;">
72
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
73
  </div>
74
+ </li>
75
+ <?php endif ?>
76
+ <li class="fields">
77
+ <div class="field">
78
+ <label style="float:none;" for="<?php echo $code ?>_account_holder"><?php echo $this->__('NN Account Holder') ?><span class="required">*</span></label><br/>
79
+ <div class="input-box">
80
+ <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_account_holder" name="payment[account_holder]" autocomplete="off" onchange="unsetHashRelatedElements()" value="<?php echo $sepaRefill ? $refillName : ''; ?>" />
81
+ </div>
82
  </div>
83
+ </li>
84
+ <li class="fields">
85
+ <div class="field">
86
+ <label style="float:none;" for="<?php echo $code ?>_bank_country"><?php echo $this->__('NN Country') ?><span class="required">*</span></label><br />
87
+ <div class="input-box">
88
+ <?php
89
+ $_countries = Mage::getResourceModel('directory/country_collection')
90
+ ->loadData()
91
+ ->toOptionArray(false)
92
+ ?>
93
+ <?php if (count($_countries) > 0): ?>
94
+ <select id="<?php echo $code ?>_bank_country" onchange="unsetHashRelatedElements()" class="required-entry">
95
+ <?php
96
+ foreach ($_countries as $_country):
97
+ if (in_array($billingCountry, $_country)) {
98
+ ?>
99
+ <option selected value="<?php echo $_country['value'] ?>"><?php echo $_country['label'] ?>
100
+ </option>
101
+ <?php } else { ?>
102
+ <option value="<?php echo $_country['value'] ?>">
103
+ <?php echo $_country['label'] ?>
104
+ </option>
105
+ <?php } ?>
106
+ <?php endforeach; ?>
107
+ </select><br/>
108
+ <?php endif; ?>
109
+ </div>
110
+ </div>
111
+ </li>
112
+ <li class="fields">
113
+ <div class="field">
114
+ <label style="float:none;" for="<?php echo $code ?>_account_number"><?php echo $this->__('IBAN or Account Number') ?><span class="required">*</span></label><br/>
115
+ <div class="input-box">
116
+ <input type="text" id="<?php echo $code ?>_account_number" onchange="unsetHashRelatedElements()" title="<?php echo $this->__('IBAN or Account Number') ?>" class="required-entry input-text" autocomplete="off" value="" />
117
+ </div>
118
+ </div>
119
+ </li>
120
+ <li class="fields">
121
+ <div class="field">
122
+ <label style="float:none;" for="<?php echo $code ?>_bank_code"><?php echo $this->__('BIC or Bank Code') ?><span class="required">*</span></label><br/>
123
+ <div class="input-box">
124
+ <input type="text" id="<?php echo $code ?>_bank_code" title="<?php echo $this->__('BIC or Bank Code') ?>" class="input-text" autocomplete="off" onchange="unsetHashRelatedElements()" value="" />
125
+ </div>
126
+ </div>
127
+ </li>
128
+ <li class="fields">
129
+ <div class="field">
130
+ <div class="input-box">
131
+ <input type="checkbox" id="<?php echo $code ?>_mandate_confirm" title="<?php echo $this->__('confirm') ?>" class="required-entry" onclick="sepaIbanBicCall(this)"/>
132
+ <label style="float:none;" for="<?php echo $code ?>_mandate_confirm"><?php echo $this->__('NN Confirm') ?></label><br/>
133
+ </div>
134
+ </div>
135
+ </li>
136
+ <!-- Mandate overlay START-->
137
+ <li>
138
+ <div class="bgCover">&nbsp;</div>
139
+ <div id='sepa_mandate_overlay_block_first' style='display:none;' class='nnsepaloader'></div>
140
+ <div id='sepa_mandate_overlay_block' style='display:none;' class='overlay_window_block'>
141
+ <div class='nn_header'>
142
+ <h1><?php echo $this->__('SEPA Direct Debit Mandate Confirmation') ?></h1>
143
+ </div>
144
+ <div class='body_div' id='overlay_window_block_body' style="height: 400px;">
145
+ <p>
146
+ <table>
147
+ <tr>
148
+ <td><?php echo $this->__('Creditor') ?></td><td>:</td><td><span id='sepa_overlay_payee_span'>&nbsp;</span></td>
149
+ </tr>
150
+ <tr>
151
+ <td><?php echo $this->__('Credit Identification Number') ?></td><td>:</td><td><span id='sepa_overlay_creditoridentificationnumber_span'>&nbsp;</span></td>
152
+ </tr>
153
+ <tr>
154
+ <td><?php echo $this->__('Mandate Reference') ?></td><td>:</td><td><span id='sepa_overlay_mandatereference_span'>&nbsp;</span></td>
155
+ </tr>
156
+ </table><br/>
157
+ <?php echo $this->__('SEPA Confirm paragraph') ?>
158
+ <br/> <br/>
159
+ <?php echo $this->__('SEPA Confirm note') ?>
160
+ <br/> <br/>
161
+ <table>
162
+ <tr>
163
+ <td><?php echo $this->__('Name of the payee') ?></td><td>:</td><td><span id='sepa_overlay_enduserfullname_span'>&nbsp;</span></td>
164
+ </tr>
165
+ <?php if ($dataCompany): ?>
166
+ <tr>
167
+ <td><?php echo $this->__('Company') ?></td><td>:</td><td><?php echo $dataCompany; ?></td>
168
+ </tr>
169
+ <?php endif; ?>
170
+ <?php if ($quoteaddress): ?>
171
+ <tr>
172
+ <td><?php echo $this->__('Address') ?></td><td>:</td><td><?php echo $quoteaddress; ?></td>
173
+ </tr>
174
+ <?php endif; ?>
175
+ <?php if ($dataPostcode && $dataCity): ?>
176
+ <tr>
177
+ <td><?php echo $this->__('Zip Code And City') ?></td><td>:</td><td><?php echo $dataPostcode; ?><span id='sepa_overlay_enduserzipcode_span'>&nbsp;</span> <?php echo $dataCity; ?></td>
178
+ </tr>
179
+ <?php endif; ?>
180
+ <?php if ($dataPostcode): ?>
181
+ <tr>
182
+ <td><?php echo $this->__('Country') ?></td><td>:</td><td><span id='sepa_overlay_endusercountry_span'>&nbsp;</span></td>
183
+ </tr>
184
+ <?php endif; ?>
185
+ <?php if ($dataemail): ?>
186
+ <tr>
187
+ <td><?php echo $this->__('Email') ?></td><td>:</td><td><?php echo $dataemail; ?></td>
188
+ </tr>
189
+ <?php endif; ?>
190
+ <tr id='nn_sepa_overlay_iban_tr'>
191
+ <td><?php echo $this->__('IBAN') ?></td><td>:</td><td><span id='sepa_overlay_iban_span'>&nbsp;</span></td>
192
+ </tr>
193
+ <tr id='nn_sepa_overlay_bic_tr'>
194
+ <td><?php echo $this->__('BIC') ?></td><td>:</td><td><span id='sepa_overlay_bic_span'>&nbsp;</span></td>
195
+ </tr>
196
+ </table>
197
+ <br/>
198
+ <?php echo $dataCity; ?>, <span id='sepa_overlay_mandatedate_span'>&nbsp;</span>, <span id='sepa_overlay_enduserfullname_span1'>&nbsp;</span>
199
+ </p>
200
+ </div>
201
+ <div class='nn_footer'>
202
+ <input style="width: 30%" type='button' id='mandate_confirm_btn' name='mandate_confirm_btn' onclick="mandateConfirmButtonSubmit()" value=<?php echo $this->__('conirm_mandate') ?> class='mandate_confirm_btn' />
203
+ <input style="width: 30%" type='button' id='mandate_cancel_btn' name='mandate_cancel_btn' onclick="mandateCancelButtonSubmit()" value=<?php echo $this->__('NN cancel') ?> class='mandate_confirm_btn' />
204
+ <img src='<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>logo.png' width=120 alt='Novalnet AG' style='float:right;' />
205
+ </div>
206
+ </div>
207
+ </li>
208
+ <!-- Mandate overlay END-->
209
+ </ul>
210
+ <input type="hidden" id="nn_sepa_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
211
+ <input type="hidden" id="nn_sepa_validate_error_message" value="<?php echo $this->__('Please enter valid account details') . '!'; ?>" />
212
+ <input type="hidden" id="process_vendor_id" name="process_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>"/>
213
+ <input type="hidden" id="auth_code" name="auth_code" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>"/>
214
+ <input type="hidden" id="sepa_payment_id" value="37" name="sepa_payment_id">
215
+ <input type="hidden" id="result_sepa_hash" value="<?php echo $sepaRefill ? $refillValues->getSepaHash() : ''; ?>" name="result_sepa_hash">
216
+ <input type="hidden" id="result_mandate_date" value="" name="result_mandate_date">
217
+ <input type="hidden" id="result_mandate_ref" value="" name="result_mandate_ref">
218
+ <input type="hidden" id="result_mandate_unique" value="" name="result_mandate_unique">
219
+ <input type="hidden" id="nnsepa_iban_confirmed" value="0" name="nnsepa_iban_confirmed">
220
+ <input type="hidden" id="sepaiban" value="" name="sepaiban">
221
+ <input type="hidden" id="sepabic" value="" name="sepabic">
222
  </fieldset>
223
+ <style>
224
+ .nnsepaloader {
225
+ position: fixed;
226
+ left: 0px;
227
+ top: 0px;
228
+ width: 100%;
229
+ height: 100%;
230
+ z-index: 9999;
231
+ background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
232
+ }
233
+
234
+ .bgCover { background:#878787; position:fixed; left:0; top:0; display:none; overflow:hidden; z-index:1000; }
235
+ #sepa_mandate_overlay_block
236
+ {
237
+ font-size:12px;
238
+ color:#555555;
239
+ background-color:#fff;
240
+ }
241
+
242
+ .overlay_window_block {
243
+ background-color:#ffffff;
244
+ border-radius:5px;
245
+ border:1px solid #a1a1a1;
246
+ z-index:1000;
247
+ }
248
+ .overlay_window_block .nn_footer{
249
+ bottom:0px;
250
+ position:absolute;
251
+ height:37px;
252
+ width:100%;
253
+ }
254
+ .overlay_window_block .nn_header{
255
+ top:0px;
256
+ height:25px;
257
+ border-bottom:1px solid #878787;
258
+ padding:5px;
259
+ }
260
+ .overlay_window_block .body_div{
261
+ padding:5px;
262
+ overflow-y:scroll;
263
+ }
264
+ .mandate_confirm_btn{
265
+ border:1px solid #0080C9;
266
+ -webkit-border-radius: 3px;
267
+ -moz-border-radius: 3px;
268
+ border-radius: 3px;
269
+ padding: 6px;
270
+ text-decoration:none;
271
+ display:inline-block;
272
+ text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
273
+ font-weight:bold;
274
+ color: #FFFFFF;
275
+ width:40%;
276
+ cursor:pointer;
277
+ margin-left:2px;
278
+ margin-top:3px;
279
+ float:left;
280
+ margin-bottom:0px;
281
+ background-color: #0080C9; background-image: -webkit-gradient(linear, left top, left bottom, from(#0080C9), to(#0080C9));
282
+ background-image: -webkit-linear-gradient(top, #0080C9, #0080C9);
283
+ background-image: -moz-linear-gradient(top, #0080C9, #0080C9);
284
+ background-image: -ms-linear-gradient(top, #0080C9, #0080C9);
285
+ background-image: -o-linear-gradient(top, #0080C9, #0080C9);
286
+ background-image: linear-gradient(to bottom, #0080C9, #0080C9);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=#0080C9, endColorstr=#0080C9);
287
+ }
288
+
289
+ .mandate_confirm_btn:hover{
290
+ border:1px solid #878787;
291
+ background-color: #878787; background-image: -webkit-gradient(linear, left top, left bottom, from(#878787), to(#878787));
292
+ background-image: -webkit-linear-gradient(top, #878787, #878787);
293
+ background-image: -moz-linear-gradient(top, #878787, #878787);
294
+ background-image: -ms-linear-gradient(top, #878787, #878787);
295
+ background-image: -o-linear-gradient(top, #878787, #878787);
296
+ background-image: linear-gradient(to bottom, #878787, #878787);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=#878787, endColorstr=#878787);
297
+ }
298
+
299
+ #sepa_mandate_overlay_block h1
300
+ {
301
+ color: #00669D;
302
+ font-size:14px;
303
+ font-weight:bold;
304
+ text-transform:none;
305
+ margin:0;
306
+ }
307
+
308
+ table td{
309
+ padding : 2px;
310
+ }
311
+ </style>
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Sepaform.phtml DELETED
@@ -1,53 +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 = 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') ?>
45
- </div>
46
- </li>
47
- <?php endif ?>
48
- </ul>
49
- <!--}}} Payment Description -->
50
-
51
- <!--{{{ Novalnet Iframe -->
52
- <?php echo Mage::helper('novalnet_payment')->getModel('novalnetSepa')->getNovalnetIframe() ?>
53
- <!--}}} Novalnet Iframe -->
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Sofortueberweisung.phtml DELETED
@@ -1,66 +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
- <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 DELETED
@@ -1,38 +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
- <!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
@@ -12,15 +12,15 @@
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
  ?>
@@ -34,8 +34,8 @@ if ($_info):
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):
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
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->getMethod()->getTitle()) ?><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):
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Ideal.phtml CHANGED
@@ -12,25 +12,28 @@
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
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 } ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
+ *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
27
+ <?php
28
+ $_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 /><br />' ?>
37
  <?php if ($this->getAdditionalData('NnComments')) { ?>
38
  <?php echo $this->getAdditionalData('NnComments') ?><br />
39
  <?php } ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Invoice.phtml CHANGED
@@ -12,15 +12,15 @@
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();
@@ -32,10 +32,10 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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):
@@ -46,28 +46,54 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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; ?>
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
32
  <?php
33
  if ($this->getAdditionalData('NnTestOrder'))
34
  echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
35
+ ?>
36
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
37
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
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):
46
  endforeach;
47
  endif;
48
  ?>
49
+ <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl)): ?>
50
+ <?php
51
+ if (strlen($this->getAdditionalData('NnNote'))):
52
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
53
+ echo nl2br($this->getAdditionalData('NnNote'));
54
+ else:
55
+ $note = explode('|',$this->getAdditionalData('NnNote'));
56
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
57
+ foreach($note as $noteValue):
58
+ list($text, $value) = explode(':', $noteValue);
59
+ echo $this->__($text) . ' : '. $value . '</br>';
60
+ endforeach;
61
+ endif;
62
+ endif;
63
+ ?>
64
  <?php
65
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
66
+ list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
67
+ echo $this->__($text) . ' : '. $value;
68
+ endif;
69
  ?>
70
  <?php
71
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
72
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
73
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
74
+ else:
75
+ $note = explode('|',$this->getAdditionalData('NnNoteTID'));
76
+ echo "<br />";
77
+ foreach($note as $noteValue):
78
+ list($text, $value) = explode(':', $noteValue);
79
+ if ($text == 'NN_Reference3'):
80
+ list($referenceTxt, $value) = explode('&', $value);
81
+ str_replace('&', '', $referenceTxt);
82
+ echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
83
+ else:
84
+ echo $this->__($text) . ' : '. $value . '</br>';
85
+ endif;
86
+ endforeach;
87
+ endif;
88
+ endif;
89
  ?>
90
  <?php
91
+ if (strlen($this->getAdditionalData('NnComments'))):
 
 
 
 
 
92
  echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
93
+ endif;
94
  ?>
95
+ <?php endif; ?>
96
  <?php else: ?>
97
  <?php echo $this->__('Error in getting payment method') ?>
98
  <?php endif; ?>
99
+
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Paypal.phtml CHANGED
@@ -12,25 +12,26 @@
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
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 } ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
+ *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ $_info = $this->getInfo();
27
+ 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 /><br />' ?>
35
  <?php if ($this->getAdditionalData('NnComments')) { ?>
36
  <?php echo $this->getAdditionalData('NnComments') ?><br />
37
  <?php } ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Phonepayment.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 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
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
@@ -12,15 +12,15 @@
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();
@@ -32,10 +32,10 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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):
@@ -46,28 +46,53 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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; ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
32
  <?php
33
  if ($this->getAdditionalData('NnTestOrder'))
34
  echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
35
+ ?>
36
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
37
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
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):
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
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
53
+ echo nl2br($this->getAdditionalData('NnNote'));
54
+ else:
55
+ $note = explode('|',$this->getAdditionalData('NnNote'));
56
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
57
+ foreach($note as $noteValue):
58
+ list($text, $value) = explode(':', $noteValue);
59
+ echo $this->__($text) . ' : '. $value . '</br>';
60
+ endforeach;
61
+ endif;
62
+ endif;
63
+ ?>
64
  <?php
65
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
66
+ list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
67
+ echo $this->__($text) . ' : '. $value;
68
+ endif;
69
  ?>
70
  <?php
71
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
72
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
73
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
74
+ else:
75
+ $note = explode('|',$this->getAdditionalData('NnNoteTID'));
76
+ echo "<br />";
77
+ foreach($note as $noteValue):
78
+ list($text, $value) = explode(':', $noteValue);
79
+ if ($text == 'NN_Reference3'):
80
+ list($referenceTxt, $value) = explode('&', $value);
81
+ str_replace('&', '', $referenceTxt);
82
+ echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
83
+ else:
84
+ echo $this->__($text) . ' : '. $value . '</br>';
85
+ endif;
86
+ endforeach;
87
+ endif;
88
+ endif;
89
  ?>
90
  <?php
91
+ if (strlen($this->getAdditionalData('NnComments'))):
 
 
 
 
 
92
  echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
93
+ endif;
94
  ?>
95
+ <?php endif; ?>
96
  <?php else: ?>
97
  <?php echo $this->__('Error in getting payment method') ?>
98
  <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Sepa.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
@@ -34,7 +34,7 @@ if ($_info):
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')):
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
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->getMethod()->getTitle()) ?><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')):
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Sofortueberweisung.phtml CHANGED
@@ -12,25 +12,26 @@
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
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 } ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
+ *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
+ $_info = $this->getInfo();
27
+ 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 /><br />' ?>
35
  <?php if ($this->getAdditionalData('NnComments')) { ?>
36
  <?php echo $this->getAdditionalData('NnComments') ?><br />
37
  <?php } ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Cc.phtml CHANGED
@@ -12,15 +12,15 @@
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();
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Ideal.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Invoice.phtml CHANGED
@@ -12,15 +12,15 @@
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();
@@ -42,25 +42,50 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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 } ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
42
  endforeach;
43
  endif;
44
  ?>{{pdf_row_separator}}
45
+ <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl)): ?>
46
  <?php
47
+ if (strlen($this->getAdditionalData('NnNote'))):
48
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
49
+ echo nl2br($this->getAdditionalData('NnNote'));
50
+ else:
51
+ $note = explode('|',$this->getAdditionalData('NnNote'));
52
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
53
+ foreach($note as $noteValue):
54
+ list($text, $value) = explode(':', $noteValue);
55
+ echo $this->__($text) . ' : '. $value ?> {{pdf_row_separator}} <?php
56
+ endforeach;
57
+ endif;
58
+ endif;
59
  ?>{{pdf_row_separator}}
60
  <?php
61
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
62
+ list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
63
+ echo $this->__($text) . ' : '. $value;
64
+ endif;
65
  ?>{{pdf_row_separator}}
66
  <?php
67
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
68
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
69
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
70
+ else:
71
+ $note = explode('|',$this->getAdditionalData('NnNoteTID'));
72
+ echo "<br />";
73
+ foreach($note as $noteValue):
74
+ list($text, $value) = explode(':', $noteValue);
75
+ if ($text == 'NN_Reference3'):
76
+ list($referenceTxt, $value) = explode('&', $value);
77
+ str_replace('&', '', $referenceTxt);
78
+ echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
79
+ else:
80
+ echo $this->__($text) . ' : '. $value ?> {{pdf_row_separator}} <?php
81
+ endif;
82
+ endforeach;
83
+ endif;
84
+ endif;
85
  ?>{{pdf_row_separator}}
86
  <?php
87
+ if (strlen($this->getAdditionalData('NnComments'))):
88
+ echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
89
+ endif;
90
  ?>{{pdf_row_separator}}
91
+ <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Paypal.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Prepayment.phtml CHANGED
@@ -12,15 +12,15 @@
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();
@@ -42,25 +42,50 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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 } ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
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
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
49
+ echo nl2br($this->getAdditionalData('NnNote'));
50
+ else:
51
+ $note = explode('|',$this->getAdditionalData('NnNote'));
52
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
53
+ foreach($note as $noteValue):
54
+ list($text, $value) = explode(':', $noteValue);
55
+ echo $this->__($text) . ' : '. $value ?> {{pdf_row_separator}} <?php
56
+ endforeach;
57
+ endif;
58
+ endif;
59
  ?>{{pdf_row_separator}}
60
  <?php
61
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
62
+ list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
63
+ echo $this->__($text) . ' : '. $value;
64
+ endif;
65
  ?>{{pdf_row_separator}}
66
  <?php
67
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
68
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
69
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
70
+ else:
71
+ $note = explode('|',$this->getAdditionalData('NnNoteTID'));
72
+ echo "<br />";
73
+ foreach($note as $noteValue):
74
+ list($text, $value) = explode(':', $noteValue);
75
+ if ($text == 'NN_Reference3'):
76
+ list($referenceTxt, $value) = explode('&', $value);
77
+ str_replace('&', '', $referenceTxt);
78
+ echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
79
+ else:
80
+ echo $this->__($text) . ' : '. $value ?> {{pdf_row_separator}} <?php
81
+ endif;
82
+ endforeach;
83
+ endif;
84
+ endif;
85
  ?>{{pdf_row_separator}}
86
  <?php
87
+ if (strlen($this->getAdditionalData('NnComments'))):
88
+ echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
89
+ endif;
90
  ?>{{pdf_row_separator}}
91
+ <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Sepa.phtml CHANGED
@@ -12,15 +12,15 @@
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();
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Sofortueberweisung.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/novalnet/sales/order/transactionoverview.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/novalnet/transaction/overview/view/form.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/novalnet/transaction/view/form.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
@@ -82,7 +82,7 @@
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(
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
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(
app/design/frontend/base/default/template/novalnet/payment/method/form/Cc.phtml CHANGED
@@ -12,131 +12,197 @@
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
- * 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;">
57
- <?php if (!$this->getMethod()->validateNovalnetIframeParams()): ?>
58
- <div style="font-weight:bold;color:red;font-size:12px;">
59
- <?php echo $this->__('Basic parameter not valid') . '!' ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
60
  </div>
61
- <?php else: ?>
62
- <div id="nncc_loading">
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="" />
135
- <input type="hidden" name="novalnet_cc_exp_month" id="novalnet_cc_exp_month" value="" />
136
- <input type="hidden" name="novalnet_cc_exp_year" id="novalnet_cc_exp_year" value="" />
137
- <input type="hidden" name="novalnet_cc_cid" id="novalnet_cc_cid" value="" />
138
- <input type="hidden" name="novalnet_cc_pan_hash" id="novalnet_cc_pan_hash" value="" />
139
- <input type="hidden" name="novalnet_cc_unique_id" id="novalnet_cc_unique_id" value="" />
140
- <input type="hidden" name="novalnet_cc_field_validator" id="novalnet_cc_field_validator" value="" />
141
 
142
  </fieldset>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
 
 
 
 
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
+ $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
+ $refillValues = $assignDatahelper->_getCheckout()->getData($code);
30
  $ccRefill = $this->getMethod()->getConfigData('cc_refill');
31
  $creditCardSecure = $this->getMethod()->getConfigData('active_cc3d');
32
+ $refillMethod = ($refillValues != '' && $code == $refillValues->getMethod());
33
+
34
+ $billingaddres = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
35
  ?>
36
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
37
  <!--{{{ Payment Logo -->
38
  <div>
39
+ <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;float:none;">
40
+ <?php foreach ($this->getCcAvailableTypes() as $typeCode => $typeName): ?>
41
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $typeCode . "_Logo.png"; ?>
42
+ <img style="height:20px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
43
+ <?php endforeach; ?>
44
+ </a>
 
 
 
 
 
 
 
45
  </div>
46
  <!--}}} Payment Logo -->
47
  <!--{{{ Novalnet Cc Form -->
48
+ <ul id="payment_form_<?php echo $code ?>" style="display:none">
49
+ <div class="nnccloader" id='cc_loading' style='display:none;'></div>
50
+ <li>
51
+ <?php echo $this->__('The amount will be booked immediately from your credit card.'); ?>
52
+ </li>
53
+ <?php if ($this->getUserInfo()): ?>
54
+ <li>
55
+ <?php echo $this->getUserInfo() ?>
56
+ </li>
57
+ <?php endif ?>
58
+ <?php if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('live_mode', true) == 0): ?>
59
+ <li>
60
+ <div style="font-weight:bold;color:red;font-size:12px;">
61
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
62
+ </div>
63
+ </li>
64
+ <?php endif ?>
65
+ <li class="fields">
66
+ <div class="field">
67
+ <label style="float:none;" for="<?php echo $code ?>_cc_type"><?php echo $this->__('NN CC type') ?><span class="required">*</span></label><br />
68
+ <div class="input-box">
69
+ <select id="<?php echo $code ?>_cc_type" onchange="ccHashCall();" class="required-entry validate-cc-type-select">
70
+ <option value=""><?php echo $this->__('--Please Select--') ?></option>
71
+ <?php foreach ($this->getCcAvailableTypes() as $typeCode => $typeName): ?>
72
+ <option value="<?php echo $typeCode ?>"><?php echo $typeName ?></option>
73
+ <?php endforeach; ?>
74
+ </select>
75
+ </div>
76
  </div>
77
+ </li>
78
+ <li class="fields">
79
+ <div class="field">
80
+ <label style="float:none;" for="<?php echo $code ?>_cc_owner"><?php echo $this->__('NN CC holder') ?><span class="required">*</span></label><br/>
81
+ <div class="input-box">
82
+ <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_cc_owner" autocomplete="off" onchange="ccHashCall();" value="<?php echo $billingaddres->getFirstname().' '.$billingaddres->getLastname() ?>" /></div>
83
  </div>
84
+ </li>
85
+ <li class="fields">
86
+ <div class="field">
87
+ <label style="float:none;" for="<?php echo $code ?>_cc_number"><?php echo $this->__('NN CC number') ?><span class="required">*</span></label><br/>
88
+ <div class="input-box">
89
+ <input type="text" id="<?php echo $code ?>_cc_number" title="<?php echo $this->__('Credit Card Number') ?>" class="required-entry input-text validate-cc-number validate-cc-type" autocomplete="off" onchange="ccHashCall();" onkeypress="return isNumberKey(event, true);" value="" /> </div>
90
+ </div>
91
+ </li>
92
+ <li class="fields">
93
+ <div class="field">
94
+ <label style="float:none;" for="<?php echo $code ?>_expiration"><?php echo $this->__('NN Expiration Date') ?><span class="required">*</span></label><br />
95
+ <div class="input-box">
96
+ <div class="v-fix">
97
+ <select id="<?php echo $code ?>_expiration" style="width:140px;" onchange="ccHashCall();" class="required-entry">
98
+ <option value=""><?php echo $this->__('Month'); ?></option>
99
+ <?php foreach ($this->getCcMonths() as $k => $v): ?>
100
+ <option value="<?php echo $k ?>"><?php echo $v ?></option>
101
+ <?php endforeach; ?>
102
+ </select>
103
+ </div>
104
+ <div class="v-fix" style="padding-left:5px;">
105
+ <select id="<?php echo $code ?>_expiration_yr" style="width:103px;" onchange="ccHashCall();" class="required-entry">
106
+ <option value=""><?php echo $this->__('Year'); ?></option>
107
+ <?php foreach ($this->getCcYears() as $k => $v): ?>
108
+ <option value="<?php echo $k ?>"><?php echo $v ?></option>
109
+ <?php endforeach; ?>
110
+ </select>
111
+ </div>
112
+ </div>
113
+ </div>
114
+ </li>
115
+ <li class="fields">
116
+ <div class="field">
117
+ <label style="float:none;" for="<?php echo $code ?>_cc_cid"><?php echo $this->__('NN CVC') ?><span class="required">*</span></label><br />
118
+ <div class="input-box">
119
+ <div class="v-fix"><input type="text" title="<?php echo $this->__('Card Verification Number') ?>" onkeypress="return isNumberKey(event);" class="required-entry input-text validate-cc-cvn" id="<?php echo $code ?>_cc_cid" name="payment[nn_cc_cid]" style="width:3em;" autocomplete="off" /></div>
120
+ &nbsp;
121
+ <a href="#"><img src='<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>cvc_hint.png' border="0" style="margin-top:0px;" alt="CCV/CVC?" id="nn_cc_hint"></a>
122
+ <img src="<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>creditcard_cvc.jpg" style="display:none;float:left;" border="0" id="nn_cvc_hover"/>
123
+ </div>
124
+ </div>
125
+ </li>
126
+ <!--{{{ CallbackType-->
127
+ <?php if (!$creditCardSecure && $this->isCallbackTypeCall()): ?>
128
+ <!--{{{ PIN by Callback-->
129
+ <?php
130
+ if ($this->getCallbackConfigData() != 3):
131
+ ?>
132
+ <li>
133
+ <div class="input-box">
134
+ <label style="float:none;" for="<?php echo $code ?>_callback_tel">
135
+ <?php
136
+ if ($this->getCallbackConfigData() == 2):
137
+ ?>
138
+ <?php echo $this->__('Mobile phone number'); ?>
139
+ <?php else: ?>
140
+ <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
141
+ <?php endif; ?>
142
+ <span class="required">*</span></label><br/>
143
+ <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" value="<?php
144
+ echo $ccRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackTelNovalnetCc()
145
+ : '';
146
+ ?>"/>
147
+ </div>
148
+ </li>
149
+ <li>
150
+ <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
151
+ <?php echo $this->__('Note for pin by sms and callback') ?>
152
+ </div>
153
+ <div class="input-box">
154
+ <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
155
+ <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/>
156
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
157
+ <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
158
+ </div>
159
+ </li>
160
+ <!--}}} PIN by Callback-->
161
+ <!--{{{ Reply by Email-->
162
+ <?php
163
+ elseif ($this->getCallbackConfigData() == 3):
164
+ ?>
165
+ <li>
166
+ <div class="input-box">
167
+ <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
168
+ <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" value="<?php
169
+ echo $ccRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackEmailNovalnetCc()
170
+ : '';
171
+ ?>"/>
172
+ </div>
173
+ </li>
174
+ <?php endif ?>
175
+ <!--}}} Reply by Email-->
176
+ <?php endif ?>
177
+ <!--}}} CallbackType-->
178
+ </ul>
179
  <input type="hidden" id="original_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>" />
180
  <input type="hidden" id="original_vendor_authcode" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>" />
181
+ <input type="hidden" name="novalnet_cc_hash" id="novalnet_cc_hash" value="" />
182
+ <input type="hidden" name="novalnet_cc_pan_hash" id="novalnet_cc_pan_hash" value="<?php echo $ccRefill ? $refillValues->getCcPanHash() : ''; ?>" />
183
+ <input type="hidden" name="novalnet_cc_unique_id" id="novalnet_cc_unique_id" value="<?php echo $ccRefill ? $refillValues->getCcUniqueId() : ''; ?>" />
184
+ <input type="hidden" id="nn_cc_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
185
+ <input type="hidden" id="nn_cc_validate_error_message" value="<?php echo $this->__('Please enter valid credit card details') . '!'; ?>" />
 
 
 
 
 
 
186
 
187
  </fieldset>
188
+
189
+ <style>
190
+ .nnccloader {
191
+ position: fixed;
192
+ left: 0px;
193
+ top: 0px;
194
+ width: 100%;
195
+ height: 100%;
196
+ z-index: 9999;
197
+ background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
198
+ }
199
+ </style>
200
+
201
+ <script type="text/javascript">
202
+ jQuery('#nn_cc_hint').hover(function(){
203
+ jQuery('#nn_cvc_hover').show();
204
+ });
205
+ jQuery('#nn_cc_hint').mouseleave(function(){
206
+ jQuery('#nn_cvc_hover').hide();
207
+ });
208
+ </script>
app/design/frontend/base/default/template/novalnet/payment/method/form/Ccform.phtml DELETED
@@ -1,53 +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 = 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/frontend/base/default/template/novalnet/payment/method/form/Ideal.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/novalnet/payment/method/form/Invoice.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
@@ -70,12 +70,12 @@ $helper = Mage::helper('novalnet_payment');
70
  <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
71
  <?php endif; ?>
72
  <span class="required">*</span></label><br/>
73
- <input type="text" value="" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text" />
74
  </div>
75
  </li>
76
  <li>
77
  <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
78
- <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze eine PIN per Telefon-/Handyrückruf oder SMS.') ?>
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/>
@@ -88,9 +88,6 @@ $helper = Mage::helper('novalnet_payment');
88
  <!--{{{ Reply by Email-->
89
  <?php elseif ($this->getCallbackConfigData() == 3): ?>
90
  <li>
91
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
92
- <?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.') ?>
93
- </div>
94
  <div class="input-box">
95
  <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
96
  <input type="text" value="" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" />
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
70
  <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
71
  <?php endif; ?>
72
  <span class="required">*</span></label><br/>
73
+ <input type="text" value="" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" />
74
  </div>
75
  </li>
76
  <li>
77
  <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
78
+ <?php echo $this->__('Note for pin by sms and callback') ?>
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/>
88
  <!--{{{ Reply by Email-->
89
  <?php elseif ($this->getCallbackConfigData() == 3): ?>
90
  <li>
 
 
 
91
  <div class="input-box">
92
  <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
93
  <input type="text" value="" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" />
app/design/frontend/base/default/template/novalnet/payment/method/form/Paypal.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/novalnet/payment/method/form/Phonepayment.phtml 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
- <?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 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/frontend/base/default/template/novalnet/payment/method/form/Prepayment.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/novalnet/payment/method/form/Sepa.phtml CHANGED
@@ -12,22 +12,37 @@
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
- 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 -->
@@ -42,84 +57,310 @@ $sepaRefill = $this->getMethod()->getConfigData('sepa_refill');
42
  </div>
43
  <!--}}} Payment Logo -->
44
  <!--{{{ Novalnet SEPA Form -->
45
- <div id="payment_form_<?php echo $code ?>" style="display:none;">
46
- <?php if (!$this->getMethod()->validateNovalnetIframeParams()): ?>
 
 
 
 
 
 
 
 
 
 
47
  <div style="font-weight:bold;color:red;font-size:12px;">
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
 
 
 
 
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
+ $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
  $sepaRefill = $this->getMethod()->getConfigData('sepa_refill');
30
+ $refillValues = $assignDatahelper->_getCheckout()->getData($code);
31
+ $refillMethod = ($sepaRefill && $refillValues != '' && $code == $refillValues->getMethod());
32
+
33
+ $billingaddres = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
34
+ $accountHolder = $refillMethod ? $refillValues->getSepaHolder() : '';
35
+ $billingCountry = $billingaddres->getcountryId() ? strtoupper($billingaddres->getcountryId()) : 'DE';
36
+ $refillName = ($sepaRefill && $accountHolder)
37
+ ? $accountHolder : $billingaddres->getFirstname() . ' ' . $billingaddres->getLastname();
38
+ $dataStreet = $billingaddres->getStreet();
39
+ $dataCity = $billingaddres->getCity();
40
+ $dataCompany = $billingaddres->getCompany();
41
+ $dataPostcode = $billingaddres->getPostcode();
42
+ $dataemail = $billingaddres->getEmail();
43
+ foreach ($dataStreet as $dataStreetValue) {
44
+ $quoteaddress = $dataStreetValue;
45
+ }
46
  ?>
47
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
48
  <!--{{{ Payment Logo -->
57
  </div>
58
  <!--}}} Payment Logo -->
59
  <!--{{{ Novalnet SEPA Form -->
60
+ <ul id="payment_form_<?php echo $code ?>" style="display:none">
61
+ <div class="nnsepaloader" id='sepa_loading' style='display:none;'></div>
62
+ <li>
63
+ <?php echo $this->__('Your account will be debited upon delivery of goods.'); ?>
64
+ </li>
65
+ <?php if ($this->getUserInfo()): ?>
66
+ <li>
67
+ <?php echo $this->getUserInfo() ?>
68
+ </li>
69
+ <?php endif ?>
70
+ <?php if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('live_mode', true) == 0): ?>
71
+ <li>
72
  <div style="font-weight:bold;color:red;font-size:12px;">
73
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
74
  </div>
75
+ </li>
76
+ <?php endif ?>
77
+ <li class="fields">
78
+ <div class="field">
79
+ <label style="float:none;" for="<?php echo $code ?>_account_holder"><?php echo $this->__('NN Account Holder') ?><span class="required">*</span></label><br/>
80
+ <div class="input-box">
81
+ <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_account_holder" name="payment[account_holder]" autocomplete="off" onchange="unsetHashRelatedElements()" value="<?php echo $refillName; ?>" />
82
+ </div>
83
  </div>
84
+ </li>
85
+ <li class="fields">
86
+ <div class="field">
87
+ <label style="float:none;" for="<?php echo $code ?>_bank_country"><?php echo $this->__('NN Country') ?><span class="required">*</span></label><br />
88
+ <div class="input-box">
89
+ <?php
90
+ $_countries = Mage::getResourceModel('directory/country_collection')
91
+ ->loadData()
92
+ ->toOptionArray(false)
93
+ ?>
94
+ <?php if (count($_countries) > 0): ?>
95
+ <select id="<?php echo $code ?>_bank_country" onchange="unsetHashRelatedElements()" class="required-entry">
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
96
  <?php
97
+ foreach ($_countries as $_country):
98
+ if (in_array($billingCountry, $_country)) {
99
+ ?>
100
+ <option selected value="<?php echo $_country['value'] ?>"><?php echo $_country['label'] ?>
101
+ </option>
102
+ <?php } else { ?>
103
+ <option value="<?php echo $_country['value'] ?>">
104
+ <?php echo $_country['label'] ?>
105
+ </option>
106
+ <?php } ?>
107
+ <?php endforeach; ?>
108
+ </select><br/>
109
+ <?php endif; ?>
110
+ </div>
111
+ </div>
112
+ </li>
113
+ <li class="fields">
114
+ <div class="field">
115
+ <label style="float:none;" for="<?php echo $code ?>_account_number"><?php echo $this->__('IBAN or Account Number') ?><span class="required">*</span></label><br/>
116
+ <div class="input-box">
117
+ <input type="text" id="<?php echo $code ?>_account_number" onchange="unsetHashRelatedElements()" title="<?php echo $this->__('IBAN or Account Number') ?>" class="required-entry input-text" autocomplete="off" value="" />
118
+ </div>
119
+ </div>
120
+ </li>
121
+ <li class="fields">
122
+ <div class="field">
123
+ <label style="float:none;" for="<?php echo $code ?>_bank_code"><?php echo $this->__('BIC or Bank Code') ?><span class="required">*</span></label><br/>
124
+ <div class="input-box">
125
+ <input type="text" id="<?php echo $code ?>_bank_code" title="<?php echo $this->__('BIC or Bank Code') ?>" class="input-text" autocomplete="off" onchange="unsetHashRelatedElements()" value="" />
126
+ </div>
127
+ </div>
128
+ </li>
129
+ <li class="fields">
130
+ <div class="field">
131
+ <div class="input-box">
132
+ <input type="checkbox" id="<?php echo $code ?>_mandate_confirm" title="<?php echo $this->__('confirm') ?>" class="required-entry" onclick="sepaIbanBicCall(this)"/>
133
+ <label style="float:none;" for="<?php echo $code ?>_mandate_confirm"><?php echo $this->__('NN Confirm') ?></label><br/>
134
+ </div>
135
+ </div>
136
+ </li>
137
+ <!--{{{ CallbackType-->
138
+ <?php if ($this->isCallbackTypeCall()): ?>
139
+ <!--{{{ PIN by Callback-->
140
+ <?php
141
+ if ($this->getCallbackConfigData() != 3):
142
+ ?>
143
+ <li>
144
+ <div class="input-box">
145
+ <label style="float:none;" for="<?php echo $code ?>_callback_tel">
146
+ <?php
147
+ if ($this->getCallbackConfigData() == 2):
148
+ ?>
149
+ <?php echo $this->__('Mobile phone number'); ?>
150
+ <?php else: ?>
151
+ <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
152
+ <?php endif; ?>
153
+ <span class="required">*</span></label><br/>
154
+ <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" value="<?php
155
+ echo $sepaRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackTelNovalnetSepa()
156
+ : '';
157
+ ?>"/>
158
+ </div>
159
+ </li>
160
+ <li>
161
+ <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
162
+ <?php echo $this->__('Note for pin by sms and callback') ?>
163
+ </div>
164
+ <div class="input-box">
165
+ <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
166
+ <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/>
167
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
168
+ <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
169
+ </div>
170
+ </li>
171
+ <!--}}} PIN by Callback-->
172
+ <!--{{{ Reply by Email-->
173
+ <?php
174
+ elseif ($this->getCallbackConfigData() == 3):
175
+ ?>
176
+ <li>
177
+ <div class="input-box">
178
+ <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
179
+ <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
180
+ echo $sepaRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackEmailNovalnetSepa()
181
+ : '';
182
+ ?>"/>
183
+ </div>
184
+ </li>
185
+ <?php endif ?>
186
+ <!--}}} Reply by Email-->
187
+ <?php endif ?>
188
+ <!--}}} CallbackType-->
189
+ <!-- Mandate overlay START-->
190
+ <li>
191
+ <div class="bgCover">&nbsp;</div>
192
+ <div id='sepa_mandate_overlay_block_first' style='display:none;' class='overlay_window_block'>
193
+ <img src='<?php echo $this->getSkinUrl("images/novalnet/novalnet-loading-icon.gif"); ?>'alt='Loading...'/>
194
+ </div>
195
+ <div id='sepa_mandate_overlay_block' style='display:none;' class='overlay_window_block'>
196
+ <div class='nn_header'>
197
+ <h1><?php echo $this->__('SEPA Direct Debit Mandate Confirmation') ?></h1>
198
+ </div>
199
+ <div class='body_div' id='overlay_window_block_body' style="height: 400px;">
200
+ <p>
201
+ <table>
202
+ <tr>
203
+ <td><?php echo $this->__('Creditor') ?></td><td>:</td><td><span id='sepa_overlay_payee_span'>&nbsp;</span></td>
204
+ </tr>
205
+ <tr>
206
+ <td><?php echo $this->__('Credit Identification Number') ?></td><td>:</td><td><span id='sepa_overlay_creditoridentificationnumber_span'>&nbsp;</span></td>
207
+ </tr>
208
+ <tr>
209
+ <td><?php echo $this->__('Mandate Reference') ?></td><td>:</td><td><span id='sepa_overlay_mandatereference_span'>&nbsp;</span></td>
210
+ </tr>
211
+ </table><br/>
212
+ <?php echo $this->__('SEPA Confirm paragraph') ?>
213
+ <br/> <br/>
214
+ <?php echo $this->__('SEPA Confirm note') ?>
215
+ <br/> <br/>
216
+ <table>
217
+ <tr>
218
+ <td><?php echo $this->__('Name of the payee') ?></td><td>:</td><td><span id='sepa_overlay_enduserfullname_span'>&nbsp;</span></td>
219
+ </tr>
220
+ <?php if ($dataCompany): ?>
221
+ <tr>
222
+ <td><?php echo $this->__('Company') ?></td><td>:</td><td><?php echo $dataCompany; ?></td>
223
+ </tr>
224
+ <?php endif; ?>
225
+ <?php if ($quoteaddress): ?>
226
+ <tr>
227
+ <td><?php echo $this->__('Address') ?></td><td>:</td><td><?php echo $quoteaddress; ?></td>
228
+ </tr>
229
+ <?php endif; ?>
230
+ <?php if ($dataPostcode && $dataCity): ?>
231
+ <tr>
232
+ <td><?php echo $this->__('Zip Code And City') ?></td><td>:</td><td><?php echo $dataPostcode; ?><span id='sepa_overlay_enduserzipcode_span'>&nbsp;</span> <?php echo $dataCity; ?></td>
233
+ </tr>
234
+ <?php endif; ?>
235
+ <?php if ($dataPostcode): ?>
236
+ <tr>
237
+ <td><?php echo $this->__('Country') ?></td><td>:</td><td><span id='sepa_overlay_endusercountry_span'>&nbsp;</span></td>
238
+ </tr>
239
+ <?php endif; ?>
240
+ <?php if ($dataemail): ?>
241
+ <tr>
242
+ <td><?php echo $this->__('Email') ?></td><td>:</td><td><?php echo $dataemail; ?></td>
243
+ </tr>
244
+ <?php endif; ?>
245
+ <tr id='nn_sepa_overlay_iban_tr'>
246
+ <td><?php echo $this->__('IBAN') ?></td><td>:</td><td><span id='sepa_overlay_iban_span'>&nbsp;</span></td>
247
+ </tr>
248
+ <tr id='nn_sepa_overlay_bic_tr'>
249
+ <td><?php echo $this->__('BIC') ?></td><td>:</td><td><span id='sepa_overlay_bic_span'>&nbsp;</span></td>
250
+ </tr>
251
+ </table>
252
+ <br/>
253
+ <?php echo $dataCity; ?>, <span id='sepa_overlay_mandatedate_span'>&nbsp;</span>, <span id='sepa_overlay_enduserfullname_span1'>&nbsp;</span>
254
+ </p>
255
+ </div>
256
+ <div class='nn_footer'>
257
+ <input style="width: 30%" type='button' id='mandate_confirm_btn' name='mandate_confirm_btn' onclick="mandateConfirmButtonSubmit()" value=<?php echo $this->__('conirm_mandate') ?> class='mandate_confirm_btn' />
258
+ <input style="width: 30%" type='button' id='mandate_cancel_btn' name='mandate_cancel_btn' onclick="mandateCancelButtonSubmit()" value=<?php echo $this->__('NN cancel') ?> class='mandate_confirm_btn' />
259
+ <img src='<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>logo.png' width=120 alt='Novalnet AG' style='float:right;' />
260
+ </div>
261
+ </div>
262
+ </li>
263
+ <!-- Mandate overlay END-->
264
+ </ul>
265
+ <input type="hidden" id="nn_sepa_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
266
+ <input type="hidden" id="nn_sepa_validate_error_message" value="<?php echo $this->__('Please enter valid account details') . '!'; ?>" />
267
+ <input type="hidden" id="process_vendor_id" name="process_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>"/>
268
+ <input type="hidden" id="auth_code" name="auth_code" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>"/>
269
+ <input type="hidden" id="sepa_payment_id" value="37" name="sepa_payment_id">
270
+ <input type="hidden" id="result_sepa_hash" value="<?php echo $sepaRefill ? $refillValues->getSepaHash() : ''; ?>" name="result_sepa_hash">
271
+ <input type="hidden" id="result_mandate_date" value="" name="result_mandate_date">
272
+ <input type="hidden" id="result_mandate_ref" value="" name="result_mandate_ref">
273
+ <input type="hidden" id="result_mandate_unique" value="" name="result_mandate_unique">
274
+ <input type="hidden" id="nnsepa_iban_confirmed" value="0" name="nnsepa_iban_confirmed">
275
+ <input type="hidden" id="sepaiban" value="" name="sepaiban">
276
+ <input type="hidden" id="sepabic" value="" name="sepabic">
277
  </fieldset>
278
+ <style>
279
+ .nnsepaloader {
280
+ position: fixed;
281
+ left: 0px;
282
+ top: 0px;
283
+ width: 100%;
284
+ height: 100%;
285
+ z-index: 9999;
286
+ background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
287
+ }
288
+
289
+ .bgCover { background:#878787; position:fixed; left:0; top:0; display:none; overflow:hidden; z-index:1000; }
290
+ #sepa_mandate_overlay_block
291
+ {
292
+ font-size:12px;
293
+ color:#555555;
294
+ background-color:#fff;
295
+ }
296
+
297
+ .overlay_window_block {
298
+ background-color:#ffffff;
299
+ border-radius:5px;
300
+ border:1px solid #a1a1a1;
301
+ z-index:1000;
302
+ }
303
+ .overlay_window_block .nn_footer{
304
+ bottom:0px;
305
+ position:absolute;
306
+ height:37px;
307
+ width:100%;
308
+ }
309
+ .overlay_window_block .nn_header{
310
+ top:0px;
311
+ height:25px;
312
+ border-bottom:1px solid #878787;
313
+ padding:5px;
314
+ }
315
+ .overlay_window_block .body_div{
316
+ padding:5px;
317
+ overflow-y:scroll;
318
+ }
319
+ .mandate_confirm_btn{
320
+ border:1px solid #0080C9;
321
+ -webkit-border-radius: 3px;
322
+ -moz-border-radius: 3px;
323
+ border-radius: 3px;
324
+ padding: 6px;
325
+ text-decoration:none;
326
+ display:inline-block;
327
+ text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
328
+ font-weight:bold;
329
+ color: #FFFFFF;
330
+ width:40%;
331
+ cursor:pointer;
332
+ margin-left:2px;
333
+ margin-top:3px;
334
+ float:left;
335
+ margin-bottom:0px;
336
+ background-color: #0080C9; background-image: -webkit-gradient(linear, left top, left bottom, from(#0080C9), to(#0080C9));
337
+ background-image: -webkit-linear-gradient(top, #0080C9, #0080C9);
338
+ background-image: -moz-linear-gradient(top, #0080C9, #0080C9);
339
+ background-image: -ms-linear-gradient(top, #0080C9, #0080C9);
340
+ background-image: -o-linear-gradient(top, #0080C9, #0080C9);
341
+ background-image: linear-gradient(to bottom, #0080C9, #0080C9);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=#0080C9, endColorstr=#0080C9);
342
+ }
343
+
344
+ .mandate_confirm_btn:hover{
345
+ border:1px solid #878787;
346
+ background-color: #878787; background-image: -webkit-gradient(linear, left top, left bottom, from(#878787), to(#878787));
347
+ background-image: -webkit-linear-gradient(top, #878787, #878787);
348
+ background-image: -moz-linear-gradient(top, #878787, #878787);
349
+ background-image: -ms-linear-gradient(top, #878787, #878787);
350
+ background-image: -o-linear-gradient(top, #878787, #878787);
351
+ background-image: linear-gradient(to bottom, #878787, #878787);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=#878787, endColorstr=#878787);
352
+ }
353
+
354
+ #sepa_mandate_overlay_block h1
355
+ {
356
+ color: #00669D;
357
+ font-size:14px;
358
+ font-weight:bold;
359
+ text-transform:none;
360
+ margin:0;
361
+ }
362
 
363
+ table td{
364
+ padding : 2px;
365
+ }
366
+ </style>
app/design/frontend/base/default/template/novalnet/payment/method/form/Sepaform.phtml DELETED
@@ -1,53 +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 = 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') ?>
45
- </div>
46
- </li>
47
- <?php endif ?>
48
- </ul>
49
- <!--}}} Payment Description -->
50
-
51
- <!--{{{ Novalnet Iframe -->
52
- <?php echo Mage::helper('novalnet_payment')->getModel('novalnetSepa')->getNovalnetIframe() ?>
53
- <!--}}} Novalnet Iframe -->
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/novalnet/payment/method/form/Sofortueberweisung.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/novalnet/payment/method/form/blank.phtml DELETED
@@ -1,38 +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
- <!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/frontend/base/default/template/novalnet/payment/method/info/Cc.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
@@ -34,7 +34,7 @@ if ($_info):
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')):
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
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->getMethod()->getTitle()) ?><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')):
app/design/frontend/base/default/template/novalnet/payment/method/info/Ideal.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
@@ -33,7 +33,7 @@ if ($_info):
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 } ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
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 /><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
@@ -12,15 +12,15 @@
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();
@@ -32,10 +32,10 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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):
@@ -46,28 +46,54 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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; ?>
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
32
  <?php
33
  if ($this->getAdditionalData('NnTestOrder'))
34
  echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
35
+ ?>
36
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
37
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
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):
46
  endforeach;
47
  endif;
48
  ?>
49
+ <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl)): ?>
50
+ <?php
51
+ if (strlen($this->getAdditionalData('NnNote'))):
52
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
53
+ echo nl2br($this->getAdditionalData('NnNote'));
54
+ else:
55
+ $note = explode('|',$this->getAdditionalData('NnNote'));
56
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
57
+ foreach($note as $noteValue):
58
+ list($text, $value) = explode(':', $noteValue);
59
+ echo $this->__($text) . ' : '. $value . '</br>';
60
+ endforeach;
61
+ endif;
62
+ endif;
63
+ ?>
64
  <?php
65
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
66
+ list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
67
+ echo $this->__($text) . ' : '. $value;
68
+ endif;
69
  ?>
70
  <?php
71
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
72
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
73
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
74
+ else:
75
+ $note = explode('|',$this->getAdditionalData('NnNoteTID'));
76
+ echo "<br />";
77
+ foreach($note as $noteValue):
78
+ list($text, $value) = explode(':', $noteValue);
79
+ if ($text == 'NN_Reference3'):
80
+ list($referenceTxt, $value) = explode('&', $value);
81
+ str_replace('&', '', $referenceTxt);
82
+ echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
83
+ else:
84
+ echo $this->__($text) . ' : '. $value . '</br>';
85
+ endif;
86
+ endforeach;
87
+ endif;
88
+ endif;
89
  ?>
90
  <?php
91
+ if (strlen($this->getAdditionalData('NnComments'))):
 
 
 
 
 
92
  echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
93
+ endif;
94
  ?>
95
+ <?php endif; ?>
96
  <?php else: ?>
97
  <?php echo $this->__('Error in getting payment method') ?>
98
  <?php endif; ?>
99
+
app/design/frontend/base/default/template/novalnet/payment/method/info/Paypal.phtml CHANGED
@@ -12,15 +12,15 @@
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();
@@ -31,7 +31,7 @@ if ($_info):
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 } ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
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 /><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 DELETED
@@ -1,42 +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
- ?>
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 } ?>
40
- <?php else: ?>
41
- <?php echo $this->__('Error in getting payment method') ?>
42
- <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/novalnet/payment/method/info/Prepayment.phtml CHANGED
@@ -12,15 +12,15 @@
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();
@@ -32,10 +32,10 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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):
@@ -46,28 +46,53 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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; ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
32
  <?php
33
  if ($this->getAdditionalData('NnTestOrder'))
34
  echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
35
+ ?>
36
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
37
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
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):
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
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
53
+ echo nl2br($this->getAdditionalData('NnNote'));
54
+ else:
55
+ $note = explode('|',$this->getAdditionalData('NnNote'));
56
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
57
+ foreach($note as $noteValue):
58
+ list($text, $value) = explode(':', $noteValue);
59
+ echo $this->__($text) . ' : '. $value . '</br>';
60
+ endforeach;
61
+ endif;
62
+ endif;
63
+ ?>
64
  <?php
65
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
66
+ list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
67
+ echo $this->__($text) . ' : '. $value;
68
+ endif;
69
  ?>
70
  <?php
71
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
72
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
73
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
74
+ else:
75
+ $note = explode('|',$this->getAdditionalData('NnNoteTID'));
76
+ echo "<br />";
77
+ foreach($note as $noteValue):
78
+ list($text, $value) = explode(':', $noteValue);
79
+ if ($text == 'NN_Reference3'):
80
+ list($referenceTxt, $value) = explode('&', $value);
81
+ str_replace('&', '', $referenceTxt);
82
+ echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
83
+ else:
84
+ echo $this->__($text) . ' : '. $value . '</br>';
85
+ endif;
86
+ endforeach;
87
+ endif;
88
+ endif;
89
  ?>
90
  <?php
91
+ if (strlen($this->getAdditionalData('NnComments'))):
 
 
 
 
 
92
  echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
93
+ endif;
94
  ?>
95
+ <?php endif; ?>
96
  <?php else: ?>
97
  <?php echo $this->__('Error in getting payment method') ?>
98
  <?php endif; ?>
app/design/frontend/base/default/template/novalnet/payment/method/info/Sepa.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
@@ -34,7 +34,7 @@ if ($_info):
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')):
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
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->getMethod()->getTitle()) ?><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')):
app/design/frontend/base/default/template/novalnet/payment/method/info/Sofortueberweisung.phtml CHANGED
@@ -12,15 +12,15 @@
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();
@@ -31,7 +31,7 @@ if ($_info):
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 } ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
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 /><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 CHANGED
@@ -12,15 +12,15 @@
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();
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Ideal.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Invoice.phtml CHANGED
@@ -12,15 +12,15 @@
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();
@@ -42,25 +42,50 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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 } ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
42
  endforeach;
43
  endif;
44
  ?>{{pdf_row_separator}}
45
+ <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl)): ?>
46
  <?php
47
+ if (strlen($this->getAdditionalData('NnNote'))):
48
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
49
+ echo nl2br($this->getAdditionalData('NnNote'));
50
+ else:
51
+ $note = explode('|',$this->getAdditionalData('NnNote'));
52
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
53
+ foreach($note as $noteValue):
54
+ list($text, $value) = explode(':', $noteValue);
55
+ echo $this->__($text) . ' : '. $value ?> {{pdf_row_separator}} <?php
56
+ endforeach;
57
+ endif;
58
+ endif;
59
  ?>{{pdf_row_separator}}
60
  <?php
61
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
62
+ list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
63
+ echo $this->__($text) . ' : '. $value;
64
+ endif;
65
  ?>{{pdf_row_separator}}
66
  <?php
67
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
68
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
69
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
70
+ else:
71
+ $note = explode('|',$this->getAdditionalData('NnNoteTID'));
72
+ echo "<br />";
73
+ foreach($note as $noteValue):
74
+ list($text, $value) = explode(':', $noteValue);
75
+ if ($text == 'NN_Reference3'):
76
+ list($referenceTxt, $value) = explode('&', $value);
77
+ str_replace('&', '', $referenceTxt);
78
+ echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
79
+ else:
80
+ echo $this->__($text) . ' : '. $value ?> {{pdf_row_separator}} <?php
81
+ endif;
82
+ endforeach;
83
+ endif;
84
+ endif;
85
  ?>{{pdf_row_separator}}
86
  <?php
87
+ if (strlen($this->getAdditionalData('NnComments'))):
88
+ echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
89
+ endif;
90
  ?>{{pdf_row_separator}}
91
+ <?php endif; ?>
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Paypal.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Prepayment.phtml CHANGED
@@ -12,15 +12,15 @@
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();
@@ -42,25 +42,50 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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 } ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
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
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
49
+ echo nl2br($this->getAdditionalData('NnNote'));
50
+ else:
51
+ $note = explode('|',$this->getAdditionalData('NnNote'));
52
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
53
+ foreach($note as $noteValue):
54
+ list($text, $value) = explode(':', $noteValue);
55
+ echo $this->__($text) . ' : '. $value ?> {{pdf_row_separator}} <?php
56
+ endforeach;
57
+ endif;
58
+ endif;
59
  ?>{{pdf_row_separator}}
60
  <?php
61
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
62
+ list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
63
+ echo $this->__($text) . ' : '. $value;
64
+ endif;
65
  ?>{{pdf_row_separator}}
66
  <?php
67
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
68
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
69
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
70
+ else:
71
+ $note = explode('|',$this->getAdditionalData('NnNoteTID'));
72
+ echo "<br />";
73
+ foreach($note as $noteValue):
74
+ list($text, $value) = explode(':', $noteValue);
75
+ if ($text == 'NN_Reference3'):
76
+ list($referenceTxt, $value) = explode('&', $value);
77
+ str_replace('&', '', $referenceTxt);
78
+ echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
79
+ else:
80
+ echo $this->__($text) . ' : '. $value ?> {{pdf_row_separator}} <?php
81
+ endif;
82
+ endforeach;
83
+ endif;
84
+ endif;
85
  ?>{{pdf_row_separator}}
86
  <?php
87
+ if (strlen($this->getAdditionalData('NnComments'))):
88
+ echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
89
+ endif;
90
  ?>{{pdf_row_separator}}
91
+ <?php endif; ?>
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Sepa.phtml CHANGED
@@ -12,15 +12,15 @@
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();
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Sofortueberweisung.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/frontend/default/default/template/novalnet/payment/method/form/Cc.phtml CHANGED
@@ -12,131 +12,197 @@
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
- * 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;">
57
- <?php if (!$this->getMethod()->validateNovalnetIframeParams()): ?>
58
- <div style="font-weight:bold;color:red;font-size:12px;">
59
- <?php echo $this->__('Basic parameter not valid') . '!' ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
60
  </div>
61
- <?php else: ?>
62
- <div id="nncc_loading">
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="" />
135
- <input type="hidden" name="novalnet_cc_exp_month" id="novalnet_cc_exp_month" value="" />
136
- <input type="hidden" name="novalnet_cc_exp_year" id="novalnet_cc_exp_year" value="" />
137
- <input type="hidden" name="novalnet_cc_cid" id="novalnet_cc_cid" value="" />
138
- <input type="hidden" name="novalnet_cc_pan_hash" id="novalnet_cc_pan_hash" value="" />
139
- <input type="hidden" name="novalnet_cc_unique_id" id="novalnet_cc_unique_id" value="" />
140
- <input type="hidden" name="novalnet_cc_field_validator" id="novalnet_cc_field_validator" value="" />
141
 
142
  </fieldset>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
 
 
 
 
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
+ $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
+ $refillValues = $assignDatahelper->_getCheckout()->getData($code);
30
  $ccRefill = $this->getMethod()->getConfigData('cc_refill');
31
  $creditCardSecure = $this->getMethod()->getConfigData('active_cc3d');
32
+ $refillMethod = ($refillValues != '' && $code == $refillValues->getMethod());
33
+
34
+ $billingaddres = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
35
  ?>
36
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
37
  <!--{{{ Payment Logo -->
38
  <div>
39
+ <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;float:none;">
40
+ <?php foreach ($this->getCcAvailableTypes() as $typeCode => $typeName): ?>
41
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $typeCode . "_Logo.png"; ?>
42
+ <img style="height:20px;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
43
+ <?php endforeach; ?>
44
+ </a>
 
 
 
 
 
 
 
45
  </div>
46
  <!--}}} Payment Logo -->
47
  <!--{{{ Novalnet Cc Form -->
48
+ <ul id="payment_form_<?php echo $code ?>" style="display:none">
49
+ <div class="nnccloader" id='cc_loading' style='display:none;'></div>
50
+ <li>
51
+ <?php echo $this->__('The amount will be booked immediately from your credit card.'); ?>
52
+ </li>
53
+ <?php if ($this->getUserInfo()): ?>
54
+ <li>
55
+ <?php echo $this->getUserInfo() ?>
56
+ </li>
57
+ <?php endif ?>
58
+ <?php if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('live_mode', true) == 0): ?>
59
+ <li>
60
+ <div style="font-weight:bold;color:red;font-size:12px;">
61
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
62
+ </div>
63
+ </li>
64
+ <?php endif ?>
65
+ <li class="fields">
66
+ <div class="field">
67
+ <label style="float:none;" for="<?php echo $code ?>_cc_type"><?php echo $this->__('NN CC type') ?><span class="required">*</span></label><br />
68
+ <div class="input-box">
69
+ <select id="<?php echo $code ?>_cc_type" onchange="ccHashCall();" class="required-entry validate-cc-type-select">
70
+ <option value=""><?php echo $this->__('--Please Select--') ?></option>
71
+ <?php foreach ($this->getCcAvailableTypes() as $typeCode => $typeName): ?>
72
+ <option value="<?php echo $typeCode ?>"><?php echo $typeName ?></option>
73
+ <?php endforeach; ?>
74
+ </select>
75
+ </div>
76
  </div>
77
+ </li>
78
+ <li class="fields">
79
+ <div class="field">
80
+ <label style="float:none;" for="<?php echo $code ?>_cc_owner"><?php echo $this->__('NN CC holder') ?><span class="required">*</span></label><br/>
81
+ <div class="input-box">
82
+ <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_cc_owner" autocomplete="off" onchange="ccHashCall();" value="<?php echo $billingaddres->getFirstname().' '.$billingaddres->getLastname() ?>" /></div>
83
  </div>
84
+ </li>
85
+ <li class="fields">
86
+ <div class="field">
87
+ <label style="float:none;" for="<?php echo $code ?>_cc_number"><?php echo $this->__('NN CC number') ?><span class="required">*</span></label><br/>
88
+ <div class="input-box">
89
+ <input type="text" id="<?php echo $code ?>_cc_number" title="<?php echo $this->__('Credit Card Number') ?>" class="required-entry input-text validate-cc-number validate-cc-type" autocomplete="off" onchange="ccHashCall();" onkeypress="return isNumberKey(event, true);" value="" /> </div>
90
+ </div>
91
+ </li>
92
+ <li class="fields">
93
+ <div class="field">
94
+ <label style="float:none;" for="<?php echo $code ?>_expiration"><?php echo $this->__('NN Expiration Date') ?><span class="required">*</span></label><br />
95
+ <div class="input-box">
96
+ <div class="v-fix">
97
+ <select id="<?php echo $code ?>_expiration" style="width:140px;" onchange="ccHashCall();" class="required-entry">
98
+ <option value=""><?php echo $this->__('Month'); ?></option>
99
+ <?php foreach ($this->getCcMonths() as $k => $v): ?>
100
+ <option value="<?php echo $k ?>"><?php echo $v ?></option>
101
+ <?php endforeach; ?>
102
+ </select>
103
+ </div>
104
+ <div class="v-fix" style="padding-left:5px;">
105
+ <select id="<?php echo $code ?>_expiration_yr" style="width:103px;" onchange="ccHashCall();" class="required-entry">
106
+ <option value=""><?php echo $this->__('Year'); ?></option>
107
+ <?php foreach ($this->getCcYears() as $k => $v): ?>
108
+ <option value="<?php echo $k ?>"><?php echo $v ?></option>
109
+ <?php endforeach; ?>
110
+ </select>
111
+ </div>
112
+ </div>
113
+ </div>
114
+ </li>
115
+ <li class="fields">
116
+ <div class="field">
117
+ <label style="float:none;" for="<?php echo $code ?>_cc_cid"><?php echo $this->__('NN CVC') ?><span class="required">*</span></label><br />
118
+ <div class="input-box">
119
+ <div class="v-fix"><input type="text" title="<?php echo $this->__('Card Verification Number') ?>" onkeypress="return isNumberKey(event);" class="required-entry input-text validate-cc-cvn" id="<?php echo $code ?>_cc_cid" name="payment[nn_cc_cid]" style="width:3em;" autocomplete="off" /></div>
120
+ &nbsp;
121
+ <a href="#"><img src='<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>cvc_hint.png' border="0" style="margin-top:0px;" alt="CCV/CVC?" id="nn_cc_hint"></a>
122
+ <img src="<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>creditcard_cvc.jpg" style="display:none;float:left;" border="0" id="nn_cvc_hover"/>
123
+ </div>
124
+ </div>
125
+ </li>
126
+ <!--{{{ CallbackType-->
127
+ <?php if (!$creditCardSecure && $this->isCallbackTypeCall()): ?>
128
+ <!--{{{ PIN by Callback-->
129
+ <?php
130
+ if ($this->getCallbackConfigData() != 3):
131
+ ?>
132
+ <li>
133
+ <div class="input-box">
134
+ <label style="float:none;" for="<?php echo $code ?>_callback_tel">
135
+ <?php
136
+ if ($this->getCallbackConfigData() == 2):
137
+ ?>
138
+ <?php echo $this->__('Mobile phone number'); ?>
139
+ <?php else: ?>
140
+ <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
141
+ <?php endif; ?>
142
+ <span class="required">*</span></label><br/>
143
+ <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" value="<?php
144
+ echo $ccRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackTelNovalnetCc()
145
+ : '';
146
+ ?>"/>
147
+ </div>
148
+ </li>
149
+ <li>
150
+ <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
151
+ <?php echo $this->__('Note for pin by sms and callback') ?>
152
+ </div>
153
+ <div class="input-box">
154
+ <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
155
+ <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/>
156
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
157
+ <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
158
+ </div>
159
+ </li>
160
+ <!--}}} PIN by Callback-->
161
+ <!--{{{ Reply by Email-->
162
+ <?php
163
+ elseif ($this->getCallbackConfigData() == 3):
164
+ ?>
165
+ <li>
166
+ <div class="input-box">
167
+ <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
168
+ <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" value="<?php
169
+ echo $ccRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackEmailNovalnetCc()
170
+ : '';
171
+ ?>"/>
172
+ </div>
173
+ </li>
174
+ <?php endif ?>
175
+ <!--}}} Reply by Email-->
176
+ <?php endif ?>
177
+ <!--}}} CallbackType-->
178
+ </ul>
179
  <input type="hidden" id="original_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>" />
180
  <input type="hidden" id="original_vendor_authcode" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>" />
181
+ <input type="hidden" name="novalnet_cc_hash" id="novalnet_cc_hash" value="" />
182
+ <input type="hidden" name="novalnet_cc_pan_hash" id="novalnet_cc_pan_hash" value="<?php echo $ccRefill ? $refillValues->getCcPanHash() : ''; ?>" />
183
+ <input type="hidden" name="novalnet_cc_unique_id" id="novalnet_cc_unique_id" value="<?php echo $ccRefill ? $refillValues->getCcUniqueId() : ''; ?>" />
184
+ <input type="hidden" id="nn_cc_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
185
+ <input type="hidden" id="nn_cc_validate_error_message" value="<?php echo $this->__('Please enter valid credit card details') . '!'; ?>" />
 
 
 
 
 
 
186
 
187
  </fieldset>
188
+
189
+ <style>
190
+ .nnccloader {
191
+ position: fixed;
192
+ left: 0px;
193
+ top: 0px;
194
+ width: 100%;
195
+ height: 100%;
196
+ z-index: 9999;
197
+ background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
198
+ }
199
+ </style>
200
+
201
+ <script type="text/javascript">
202
+ jQuery('#nn_cc_hint').hover(function(){
203
+ jQuery('#nn_cvc_hover').show();
204
+ });
205
+ jQuery('#nn_cc_hint').mouseleave(function(){
206
+ jQuery('#nn_cvc_hover').hide();
207
+ });
208
+ </script>
app/design/frontend/default/default/template/novalnet/payment/method/form/Ccform.phtml DELETED
@@ -1,53 +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 = 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/frontend/default/default/template/novalnet/payment/method/form/Ideal.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/frontend/default/default/template/novalnet/payment/method/form/Invoice.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
@@ -70,12 +70,12 @@ $helper = Mage::helper('novalnet_payment');
70
  <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
71
  <?php endif; ?>
72
  <span class="required">*</span></label><br/>
73
- <input type="text" value="" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text" />
74
  </div>
75
  </li>
76
  <li>
77
  <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
78
- <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze eine PIN per Telefon-/Handyrückruf oder SMS.') ?>
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/>
@@ -88,9 +88,6 @@ $helper = Mage::helper('novalnet_payment');
88
  <!--{{{ Reply by Email-->
89
  <?php elseif ($this->getCallbackConfigData() == 3): ?>
90
  <li>
91
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
92
- <?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.') ?>
93
- </div>
94
  <div class="input-box">
95
  <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
96
  <input type="text" value="" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" />
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
70
  <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
71
  <?php endif; ?>
72
  <span class="required">*</span></label><br/>
73
+ <input type="text" value="" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" />
74
  </div>
75
  </li>
76
  <li>
77
  <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
78
+ <?php echo $this->__('Note for pin by sms and callback') ?>
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/>
88
  <!--{{{ Reply by Email-->
89
  <?php elseif ($this->getCallbackConfigData() == 3): ?>
90
  <li>
 
 
 
91
  <div class="input-box">
92
  <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
93
  <input type="text" value="" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" />
app/design/frontend/default/default/template/novalnet/payment/method/form/Paypal.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/frontend/default/default/template/novalnet/payment/method/form/Phonepayment.phtml 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
- <?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 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/frontend/default/default/template/novalnet/payment/method/form/Prepayment.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/frontend/default/default/template/novalnet/payment/method/form/Sepa.phtml CHANGED
@@ -12,22 +12,37 @@
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
- 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 -->
@@ -42,84 +57,310 @@ $sepaRefill = $this->getMethod()->getConfigData('sepa_refill');
42
  </div>
43
  <!--}}} Payment Logo -->
44
  <!--{{{ Novalnet SEPA Form -->
45
- <div id="payment_form_<?php echo $code ?>" style="display:none;">
46
- <?php if (!$this->getMethod()->validateNovalnetIframeParams()): ?>
 
 
 
 
 
 
 
 
 
 
47
  <div style="font-weight:bold;color:red;font-size:12px;">
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
 
 
 
 
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
+ $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
  $sepaRefill = $this->getMethod()->getConfigData('sepa_refill');
30
+ $refillValues = $assignDatahelper->_getCheckout()->getData($code);
31
+ $refillMethod = ($sepaRefill && $refillValues != '' && $code == $refillValues->getMethod());
32
+
33
+ $billingaddres = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
34
+ $accountHolder = $refillMethod ? $refillValues->getSepaHolder() : '';
35
+ $billingCountry = $billingaddres->getcountryId() ? strtoupper($billingaddres->getcountryId()) : 'DE';
36
+ $refillName = ($sepaRefill && $accountHolder)
37
+ ? $accountHolder : $billingaddres->getFirstname() . ' ' . $billingaddres->getLastname();
38
+ $dataStreet = $billingaddres->getStreet();
39
+ $dataCity = $billingaddres->getCity();
40
+ $dataCompany = $billingaddres->getCompany();
41
+ $dataPostcode = $billingaddres->getPostcode();
42
+ $dataemail = $billingaddres->getEmail();
43
+ foreach ($dataStreet as $dataStreetValue) {
44
+ $quoteaddress = $dataStreetValue;
45
+ }
46
  ?>
47
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
48
  <!--{{{ Payment Logo -->
57
  </div>
58
  <!--}}} Payment Logo -->
59
  <!--{{{ Novalnet SEPA Form -->
60
+ <ul id="payment_form_<?php echo $code ?>" style="display:none">
61
+ <div class="nnsepaloader" id='sepa_loading' style='display:none;'></div>
62
+ <li>
63
+ <?php echo $this->__('Your account will be debited upon delivery of goods.'); ?>
64
+ </li>
65
+ <?php if ($this->getUserInfo()): ?>
66
+ <li>
67
+ <?php echo $this->getUserInfo() ?>
68
+ </li>
69
+ <?php endif ?>
70
+ <?php if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('live_mode', true) == 0): ?>
71
+ <li>
72
  <div style="font-weight:bold;color:red;font-size:12px;">
73
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
74
  </div>
75
+ </li>
76
+ <?php endif ?>
77
+ <li class="fields">
78
+ <div class="field">
79
+ <label style="float:none;" for="<?php echo $code ?>_account_holder"><?php echo $this->__('NN Account Holder') ?><span class="required">*</span></label><br/>
80
+ <div class="input-box">
81
+ <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_account_holder" name="payment[account_holder]" autocomplete="off" onchange="unsetHashRelatedElements()" value="<?php echo $refillName; ?>" />
82
+ </div>
83
  </div>
84
+ </li>
85
+ <li class="fields">
86
+ <div class="field">
87
+ <label style="float:none;" for="<?php echo $code ?>_bank_country"><?php echo $this->__('NN Country') ?><span class="required">*</span></label><br />
88
+ <div class="input-box">
89
+ <?php
90
+ $_countries = Mage::getResourceModel('directory/country_collection')
91
+ ->loadData()
92
+ ->toOptionArray(false)
93
+ ?>
94
+ <?php if (count($_countries) > 0): ?>
95
+ <select id="<?php echo $code ?>_bank_country" onchange="unsetHashRelatedElements()" class="required-entry">
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
96
  <?php
97
+ foreach ($_countries as $_country):
98
+ if (in_array($billingCountry, $_country)) {
99
+ ?>
100
+ <option selected value="<?php echo $_country['value'] ?>"><?php echo $_country['label'] ?>
101
+ </option>
102
+ <?php } else { ?>
103
+ <option value="<?php echo $_country['value'] ?>">
104
+ <?php echo $_country['label'] ?>
105
+ </option>
106
+ <?php } ?>
107
+ <?php endforeach; ?>
108
+ </select><br/>
109
+ <?php endif; ?>
110
+ </div>
111
+ </div>
112
+ </li>
113
+ <li class="fields">
114
+ <div class="field">
115
+ <label style="float:none;" for="<?php echo $code ?>_account_number"><?php echo $this->__('IBAN or Account Number') ?><span class="required">*</span></label><br/>
116
+ <div class="input-box">
117
+ <input type="text" id="<?php echo $code ?>_account_number" onchange="unsetHashRelatedElements()" title="<?php echo $this->__('IBAN or Account Number') ?>" class="required-entry input-text" autocomplete="off" value="" />
118
+ </div>
119
+ </div>
120
+ </li>
121
+ <li class="fields">
122
+ <div class="field">
123
+ <label style="float:none;" for="<?php echo $code ?>_bank_code"><?php echo $this->__('BIC or Bank Code') ?><span class="required">*</span></label><br/>
124
+ <div class="input-box">
125
+ <input type="text" id="<?php echo $code ?>_bank_code" title="<?php echo $this->__('BIC or Bank Code') ?>" class="input-text" autocomplete="off" onchange="unsetHashRelatedElements()" value="" />
126
+ </div>
127
+ </div>
128
+ </li>
129
+ <li class="fields">
130
+ <div class="field">
131
+ <div class="input-box">
132
+ <input type="checkbox" id="<?php echo $code ?>_mandate_confirm" title="<?php echo $this->__('confirm') ?>" class="required-entry" onclick="sepaIbanBicCall(this)"/>
133
+ <label style="float:none;" for="<?php echo $code ?>_mandate_confirm"><?php echo $this->__('NN Confirm') ?></label><br/>
134
+ </div>
135
+ </div>
136
+ </li>
137
+ <!--{{{ CallbackType-->
138
+ <?php if ($this->isCallbackTypeCall()): ?>
139
+ <!--{{{ PIN by Callback-->
140
+ <?php
141
+ if ($this->getCallbackConfigData() != 3):
142
+ ?>
143
+ <li>
144
+ <div class="input-box">
145
+ <label style="float:none;" for="<?php echo $code ?>_callback_tel">
146
+ <?php
147
+ if ($this->getCallbackConfigData() == 2):
148
+ ?>
149
+ <?php echo $this->__('Mobile phone number'); ?>
150
+ <?php else: ?>
151
+ <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
152
+ <?php endif; ?>
153
+ <span class="required">*</span></label><br/>
154
+ <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" value="<?php
155
+ echo $sepaRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackTelNovalnetSepa()
156
+ : '';
157
+ ?>"/>
158
+ </div>
159
+ </li>
160
+ <li>
161
+ <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
162
+ <?php echo $this->__('Note for pin by sms and callback') ?>
163
+ </div>
164
+ <div class="input-box">
165
+ <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required">*</span></label><br/>
166
+ <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/>
167
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
168
+ <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
169
+ </div>
170
+ </li>
171
+ <!--}}} PIN by Callback-->
172
+ <!--{{{ Reply by Email-->
173
+ <?php
174
+ elseif ($this->getCallbackConfigData() == 3):
175
+ ?>
176
+ <li>
177
+ <div class="input-box">
178
+ <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required">*</span></label><br/>
179
+ <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
180
+ echo $sepaRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackEmailNovalnetSepa()
181
+ : '';
182
+ ?>"/>
183
+ </div>
184
+ </li>
185
+ <?php endif ?>
186
+ <!--}}} Reply by Email-->
187
+ <?php endif ?>
188
+ <!--}}} CallbackType-->
189
+ <!-- Mandate overlay START-->
190
+ <li>
191
+ <div class="bgCover">&nbsp;</div>
192
+ <div id='sepa_mandate_overlay_block_first' style='display:none;' class='overlay_window_block'>
193
+ <img src='<?php echo $this->getSkinUrl("images/novalnet/novalnet-loading-icon.gif"); ?>'alt='Loading...'/>
194
+ </div>
195
+ <div id='sepa_mandate_overlay_block' style='display:none;' class='overlay_window_block'>
196
+ <div class='nn_header'>
197
+ <h1><?php echo $this->__('SEPA Direct Debit Mandate Confirmation') ?></h1>
198
+ </div>
199
+ <div class='body_div' id='overlay_window_block_body' style="height: 400px;">
200
+ <p>
201
+ <table>
202
+ <tr>
203
+ <td><?php echo $this->__('Creditor') ?></td><td>:</td><td><span id='sepa_overlay_payee_span'>&nbsp;</span></td>
204
+ </tr>
205
+ <tr>
206
+ <td><?php echo $this->__('Credit Identification Number') ?></td><td>:</td><td><span id='sepa_overlay_creditoridentificationnumber_span'>&nbsp;</span></td>
207
+ </tr>
208
+ <tr>
209
+ <td><?php echo $this->__('Mandate Reference') ?></td><td>:</td><td><span id='sepa_overlay_mandatereference_span'>&nbsp;</span></td>
210
+ </tr>
211
+ </table><br/>
212
+ <?php echo $this->__('SEPA Confirm paragraph') ?>
213
+ <br/> <br/>
214
+ <?php echo $this->__('SEPA Confirm note') ?>
215
+ <br/> <br/>
216
+ <table>
217
+ <tr>
218
+ <td><?php echo $this->__('Name of the payee') ?></td><td>:</td><td><span id='sepa_overlay_enduserfullname_span'>&nbsp;</span></td>
219
+ </tr>
220
+ <?php if ($dataCompany): ?>
221
+ <tr>
222
+ <td><?php echo $this->__('Company') ?></td><td>:</td><td><?php echo $dataCompany; ?></td>
223
+ </tr>
224
+ <?php endif; ?>
225
+ <?php if ($quoteaddress): ?>
226
+ <tr>
227
+ <td><?php echo $this->__('Address') ?></td><td>:</td><td><?php echo $quoteaddress; ?></td>
228
+ </tr>
229
+ <?php endif; ?>
230
+ <?php if ($dataPostcode && $dataCity): ?>
231
+ <tr>
232
+ <td><?php echo $this->__('Zip Code And City') ?></td><td>:</td><td><?php echo $dataPostcode; ?><span id='sepa_overlay_enduserzipcode_span'>&nbsp;</span> <?php echo $dataCity; ?></td>
233
+ </tr>
234
+ <?php endif; ?>
235
+ <?php if ($dataPostcode): ?>
236
+ <tr>
237
+ <td><?php echo $this->__('Country') ?></td><td>:</td><td><span id='sepa_overlay_endusercountry_span'>&nbsp;</span></td>
238
+ </tr>
239
+ <?php endif; ?>
240
+ <?php if ($dataemail): ?>
241
+ <tr>
242
+ <td><?php echo $this->__('Email') ?></td><td>:</td><td><?php echo $dataemail; ?></td>
243
+ </tr>
244
+ <?php endif; ?>
245
+ <tr id='nn_sepa_overlay_iban_tr'>
246
+ <td><?php echo $this->__('IBAN') ?></td><td>:</td><td><span id='sepa_overlay_iban_span'>&nbsp;</span></td>
247
+ </tr>
248
+ <tr id='nn_sepa_overlay_bic_tr'>
249
+ <td><?php echo $this->__('BIC') ?></td><td>:</td><td><span id='sepa_overlay_bic_span'>&nbsp;</span></td>
250
+ </tr>
251
+ </table>
252
+ <br/>
253
+ <?php echo $dataCity; ?>, <span id='sepa_overlay_mandatedate_span'>&nbsp;</span>, <span id='sepa_overlay_enduserfullname_span1'>&nbsp;</span>
254
+ </p>
255
+ </div>
256
+ <div class='nn_footer'>
257
+ <input style="width: 30%" type='button' id='mandate_confirm_btn' name='mandate_confirm_btn' onclick="mandateConfirmButtonSubmit()" value=<?php echo $this->__('conirm_mandate') ?> class='mandate_confirm_btn' />
258
+ <input style="width: 30%" type='button' id='mandate_cancel_btn' name='mandate_cancel_btn' onclick="mandateCancelButtonSubmit()" value=<?php echo $this->__('NN cancel') ?> class='mandate_confirm_btn' />
259
+ <img src='<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>logo.png' width=120 alt='Novalnet AG' style='float:right;' />
260
+ </div>
261
+ </div>
262
+ </li>
263
+ <!-- Mandate overlay END-->
264
+ </ul>
265
+ <input type="hidden" id="nn_sepa_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
266
+ <input type="hidden" id="nn_sepa_validate_error_message" value="<?php echo $this->__('Please enter valid account details') . '!'; ?>" />
267
+ <input type="hidden" id="process_vendor_id" name="process_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>"/>
268
+ <input type="hidden" id="auth_code" name="auth_code" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>"/>
269
+ <input type="hidden" id="sepa_payment_id" value="37" name="sepa_payment_id">
270
+ <input type="hidden" id="result_sepa_hash" value="<?php echo $sepaRefill ? $refillValues->getSepaHash() : ''; ?>" name="result_sepa_hash">
271
+ <input type="hidden" id="result_mandate_date" value="" name="result_mandate_date">
272
+ <input type="hidden" id="result_mandate_ref" value="" name="result_mandate_ref">
273
+ <input type="hidden" id="result_mandate_unique" value="" name="result_mandate_unique">
274
+ <input type="hidden" id="nnsepa_iban_confirmed" value="0" name="nnsepa_iban_confirmed">
275
+ <input type="hidden" id="sepaiban" value="" name="sepaiban">
276
+ <input type="hidden" id="sepabic" value="" name="sepabic">
277
  </fieldset>
278
+ <style>
279
+ .nnsepaloader {
280
+ position: fixed;
281
+ left: 0px;
282
+ top: 0px;
283
+ width: 100%;
284
+ height: 100%;
285
+ z-index: 9999;
286
+ background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
287
+ }
288
+
289
+ .bgCover { background:#878787; position:fixed; left:0; top:0; display:none; overflow:hidden; z-index:1000; }
290
+ #sepa_mandate_overlay_block
291
+ {
292
+ font-size:12px;
293
+ color:#555555;
294
+ background-color:#fff;
295
+ }
296
+
297
+ .overlay_window_block {
298
+ background-color:#ffffff;
299
+ border-radius:5px;
300
+ border:1px solid #a1a1a1;
301
+ z-index:1000;
302
+ }
303
+ .overlay_window_block .nn_footer{
304
+ bottom:0px;
305
+ position:absolute;
306
+ height:37px;
307
+ width:100%;
308
+ }
309
+ .overlay_window_block .nn_header{
310
+ top:0px;
311
+ height:25px;
312
+ border-bottom:1px solid #878787;
313
+ padding:5px;
314
+ }
315
+ .overlay_window_block .body_div{
316
+ padding:5px;
317
+ overflow-y:scroll;
318
+ }
319
+ .mandate_confirm_btn{
320
+ border:1px solid #0080C9;
321
+ -webkit-border-radius: 3px;
322
+ -moz-border-radius: 3px;
323
+ border-radius: 3px;
324
+ padding: 6px;
325
+ text-decoration:none;
326
+ display:inline-block;
327
+ text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
328
+ font-weight:bold;
329
+ color: #FFFFFF;
330
+ width:40%;
331
+ cursor:pointer;
332
+ margin-left:2px;
333
+ margin-top:3px;
334
+ float:left;
335
+ margin-bottom:0px;
336
+ background-color: #0080C9; background-image: -webkit-gradient(linear, left top, left bottom, from(#0080C9), to(#0080C9));
337
+ background-image: -webkit-linear-gradient(top, #0080C9, #0080C9);
338
+ background-image: -moz-linear-gradient(top, #0080C9, #0080C9);
339
+ background-image: -ms-linear-gradient(top, #0080C9, #0080C9);
340
+ background-image: -o-linear-gradient(top, #0080C9, #0080C9);
341
+ background-image: linear-gradient(to bottom, #0080C9, #0080C9);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=#0080C9, endColorstr=#0080C9);
342
+ }
343
+
344
+ .mandate_confirm_btn:hover{
345
+ border:1px solid #878787;
346
+ background-color: #878787; background-image: -webkit-gradient(linear, left top, left bottom, from(#878787), to(#878787));
347
+ background-image: -webkit-linear-gradient(top, #878787, #878787);
348
+ background-image: -moz-linear-gradient(top, #878787, #878787);
349
+ background-image: -ms-linear-gradient(top, #878787, #878787);
350
+ background-image: -o-linear-gradient(top, #878787, #878787);
351
+ background-image: linear-gradient(to bottom, #878787, #878787);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=#878787, endColorstr=#878787);
352
+ }
353
+
354
+ #sepa_mandate_overlay_block h1
355
+ {
356
+ color: #00669D;
357
+ font-size:14px;
358
+ font-weight:bold;
359
+ text-transform:none;
360
+ margin:0;
361
+ }
362
 
363
+ table td{
364
+ padding : 2px;
365
+ }
366
+ </style>
app/design/frontend/default/default/template/novalnet/payment/method/form/Sepaform.phtml DELETED
@@ -1,53 +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 = 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') ?>
45
- </div>
46
- </li>
47
- <?php endif ?>
48
- </ul>
49
- <!--}}} Payment Description -->
50
-
51
- <!--{{{ Novalnet Iframe -->
52
- <?php echo Mage::helper('novalnet_payment')->getModel('novalnetSepa')->getNovalnetIframe() ?>
53
- <!--}}} Novalnet Iframe -->
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/default/default/template/novalnet/payment/method/form/Sofortueberweisung.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/frontend/default/default/template/novalnet/payment/method/form/blank.phtml DELETED
@@ -1,38 +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
- <!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/frontend/default/default/template/novalnet/payment/method/info/Cc.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
@@ -34,7 +34,7 @@ if ($_info):
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')):
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
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->getMethod()->getTitle()) ?><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')):
app/design/frontend/default/default/template/novalnet/payment/method/info/Ideal.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
@@ -33,7 +33,7 @@ if ($_info):
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 } ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
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 /><br />' ?>
37
  <?php if ($this->getAdditionalData('NnComments')) { ?>
38
  <?php echo $this->getAdditionalData('NnComments') ?><br />
39
  <?php } ?>
app/design/frontend/default/default/template/novalnet/payment/method/info/Invoice.phtml CHANGED
@@ -12,15 +12,15 @@
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();
@@ -32,10 +32,10 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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):
@@ -46,28 +46,54 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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; ?>
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
32
  <?php
33
  if ($this->getAdditionalData('NnTestOrder'))
34
  echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
35
+ ?>
36
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
37
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
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):
46
  endforeach;
47
  endif;
48
  ?>
49
+ <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl)): ?>
50
+ <?php
51
+ if (strlen($this->getAdditionalData('NnNote'))):
52
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
53
+ echo nl2br($this->getAdditionalData('NnNote'));
54
+ else:
55
+ $note = explode('|',$this->getAdditionalData('NnNote'));
56
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
57
+ foreach($note as $noteValue):
58
+ list($text, $value) = explode(':', $noteValue);
59
+ echo $this->__($text) . ' : '. $value . '</br>';
60
+ endforeach;
61
+ endif;
62
+ endif;
63
+ ?>
64
  <?php
65
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
66
+ list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
67
+ echo $this->__($text) . ' : '. $value;
68
+ endif;
69
  ?>
70
  <?php
71
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
72
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
73
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
74
+ else:
75
+ $note = explode('|',$this->getAdditionalData('NnNoteTID'));
76
+ echo "<br />";
77
+ foreach($note as $noteValue):
78
+ list($text, $value) = explode(':', $noteValue);
79
+ if ($text == 'NN_Reference3'):
80
+ list($referenceTxt, $value) = explode('&', $value);
81
+ str_replace('&', '', $referenceTxt);
82
+ echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
83
+ else:
84
+ echo $this->__($text) . ' : '. $value . '</br>';
85
+ endif;
86
+ endforeach;
87
+ endif;
88
+ endif;
89
  ?>
90
  <?php
91
+ if (strlen($this->getAdditionalData('NnComments'))):
 
 
 
 
 
92
  echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
93
+ endif;
94
  ?>
95
+ <?php endif; ?>
96
  <?php else: ?>
97
  <?php echo $this->__('Error in getting payment method') ?>
98
  <?php endif; ?>
99
+
app/design/frontend/default/default/template/novalnet/payment/method/info/Paypal.phtml CHANGED
@@ -12,15 +12,15 @@
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();
@@ -31,7 +31,7 @@ if ($_info):
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 } ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
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 /><br />' ?>
35
  <?php if ($this->getAdditionalData('NnComments')) { ?>
36
  <?php echo $this->getAdditionalData('NnComments') ?><br />
37
  <?php } ?>
app/design/frontend/default/default/template/novalnet/payment/method/info/Phonepayment.phtml DELETED
@@ -1,42 +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
- ?>
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 } ?>
40
- <?php else: ?>
41
- <?php echo $this->__('Error in getting payment method') ?>
42
- <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/default/default/template/novalnet/payment/method/info/Prepayment.phtml CHANGED
@@ -12,15 +12,15 @@
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();
@@ -32,10 +32,10 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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):
@@ -46,28 +46,53 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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; ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
32
  <?php
33
  if ($this->getAdditionalData('NnTestOrder'))
34
  echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
35
+ ?>
36
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
37
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
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):
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
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
53
+ echo nl2br($this->getAdditionalData('NnNote'));
54
+ else:
55
+ $note = explode('|',$this->getAdditionalData('NnNote'));
56
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
57
+ foreach($note as $noteValue):
58
+ list($text, $value) = explode(':', $noteValue);
59
+ echo $this->__($text) . ' : '. $value . '</br>';
60
+ endforeach;
61
+ endif;
62
+ endif;
63
+ ?>
64
  <?php
65
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
66
+ list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
67
+ echo $this->__($text) . ' : '. $value;
68
+ endif;
69
  ?>
70
  <?php
71
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
72
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
73
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
74
+ else:
75
+ $note = explode('|',$this->getAdditionalData('NnNoteTID'));
76
+ echo "<br />";
77
+ foreach($note as $noteValue):
78
+ list($text, $value) = explode(':', $noteValue);
79
+ if ($text == 'NN_Reference3'):
80
+ list($referenceTxt, $value) = explode('&', $value);
81
+ str_replace('&', '', $referenceTxt);
82
+ echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
83
+ else:
84
+ echo $this->__($text) . ' : '. $value . '</br>';
85
+ endif;
86
+ endforeach;
87
+ endif;
88
+ endif;
89
  ?>
90
  <?php
91
+ if (strlen($this->getAdditionalData('NnComments'))):
 
 
 
 
 
92
  echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
93
+ endif;
94
  ?>
95
+ <?php endif; ?>
96
  <?php else: ?>
97
  <?php echo $this->__('Error in getting payment method') ?>
98
  <?php endif; ?>
app/design/frontend/default/default/template/novalnet/payment/method/info/Sepa.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
@@ -34,7 +34,7 @@ if ($_info):
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')):
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
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->getMethod()->getTitle()) ?><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')):
app/design/frontend/default/default/template/novalnet/payment/method/info/Sofortueberweisung.phtml CHANGED
@@ -12,15 +12,15 @@
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();
@@ -31,7 +31,7 @@ if ($_info):
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 } ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
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 /><br />' ?>
35
  <?php if ($this->getAdditionalData('NnComments')) { ?>
36
  <?php echo $this->getAdditionalData('NnComments') ?><br />
37
  <?php } ?>
app/design/frontend/default/default/template/novalnet/payment/method/pdf/Cc.phtml DELETED
@@ -1,43 +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
- $_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/frontend/default/default/template/novalnet/payment/method/pdf/Invoice.phtml DELETED
@@ -1,66 +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
- $_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/default/default/template/novalnet/payment/method/pdf/Paypal.phtml DELETED
@@ -1,34 +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 ($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/frontend/default/default/template/novalnet/payment/method/pdf/Prepayment.phtml DELETED
@@ -1,66 +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
- $_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/default/default/template/novalnet/payment/method/pdf/Sepa.phtml DELETED
@@ -1,45 +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
- $_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/frontend/default/default/template/novalnet/payment/method/pdf/Sofortueberweisung.phtml DELETED
@@ -1,29 +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 ($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/rwd/default/template/novalnet/payment/method/form/Cc.phtml CHANGED
@@ -12,132 +12,197 @@
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
- * 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;">
57
- <?php if (!$this->getMethod()->validateNovalnetIframeParams()): ?>
58
- <div style="font-weight:bold;color:red;font-size:12px;">
59
- <?php echo $this->__('Basic parameter not valid') . '!' ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
60
  </div>
61
- <?php else: ?>
62
- <div id="nncc_loading">
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: 345px; 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="input~~~#novalnetCc_cc_cid~~~.ccv~~~select~~~#novalnetCc_expiration_yr~~~#novalnetCc_expiration_yr.error" />
131
- <input type="hidden" id="original_customstyle_cssval" value="max-width: 100%;width: 260px !important;height: 30px !important;-moz-appearance: none;background: none repeat scroll 0 0 #ffffff;border: 1px solid silver;border-radius: 2px;font-size: 15px;~~~width:50px !important;~~~float: left;margin: 8px;~~~height:28px;~~~width:110px;~~~color:#2f2f2f;font-weight:lighter;" />
 
 
 
132
 
 
133
 
134
- <input type="hidden" name="novalnet_cc_owner" id="novalnet_cc_owner" value="" />
135
- <input type="hidden" name="novalnet_cc_type" id="novalnet_cc_type" value="" />
136
- <input type="hidden" name="novalnet_cc_exp_month" id="novalnet_cc_exp_month" value="" />
137
- <input type="hidden" name="novalnet_cc_exp_year" id="novalnet_cc_exp_year" value="" />
138
- <input type="hidden" name="novalnet_cc_cid" id="novalnet_cc_cid" value="" />
139
- <input type="hidden" name="novalnet_cc_pan_hash" id="novalnet_cc_pan_hash" value="" />
140
- <input type="hidden" name="novalnet_cc_unique_id" id="novalnet_cc_unique_id" value="" />
141
- <input type="hidden" name="novalnet_cc_field_validator" id="novalnet_cc_field_validator" value="" />
 
 
 
142
 
143
- </fieldset>
 
 
 
 
 
 
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
 
 
 
 
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
+ $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
+ $refillValues = $assignDatahelper->_getCheckout()->getData($code);
30
  $ccRefill = $this->getMethod()->getConfigData('cc_refill');
31
  $creditCardSecure = $this->getMethod()->getConfigData('active_cc3d');
32
+ $refillMethod = ($refillValues != '' && $code == $refillValues->getMethod());
33
+
34
+ $billingaddres = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
35
  ?>
36
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
37
  <!--{{{ Payment Logo -->
38
  <div>
39
+ <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;float:none;">
40
+ <?php foreach ($this->getCcAvailableTypes() as $typeCode => $typeName): ?>
41
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $typeCode . "_Logo.png"; ?>
42
+ <img style="height:20px;display:inline;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
43
+ <?php endforeach; ?>
44
+ </a>
 
 
 
 
 
 
 
45
  </div>
46
  <!--}}} Payment Logo -->
47
  <!--{{{ Novalnet Cc Form -->
48
+ <ul id="payment_form_<?php echo $code ?>" style="display:none">
49
+ <div class="nnccloader" id='cc_loading' style='display:none;'></div>
50
+ <li>
51
+ <?php echo $this->__('The amount will be booked immediately from your credit card.'); ?>
52
+ </li>
53
+ <?php if ($this->getUserInfo()): ?>
54
+ <li>
55
+ <?php echo $this->getUserInfo() ?>
56
+ </li>
57
+ <?php endif ?>
58
+ <?php if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->_getConfigData('live_mode', true) == 0): ?>
59
+ <li>
60
+ <div style="font-weight:bold;color:red;font-size:12px;">
61
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
62
+ </div>
63
+ </li>
64
+ <?php endif ?>
65
+ <li class="fields">
66
+ <div class="field">
67
+ <label style="float:none;" for="<?php echo $code ?>_cc_type"><?php echo $this->__('NN CC type') ?><span class="required"></span></label><br />
68
+ <div class="input-box">
69
+ <select id="<?php echo $code ?>_cc_type" onchange="ccHashCall();" class="required-entry validate-cc-type-select">
70
+ <option value=""><?php echo $this->__('--Please Select--') ?></option>
71
+ <?php foreach ($this->getCcAvailableTypes() as $typeCode => $typeName): ?>
72
+ <option value="<?php echo $typeCode ?>"><?php echo $typeName ?></option>
73
+ <?php endforeach; ?>
74
+ </select>
75
+ </div>
76
  </div>
77
+ </li>
78
+ <li class="fields">
79
+ <div class="field">
80
+ <label style="float:none;" for="<?php echo $code ?>_cc_owner"><?php echo $this->__('NN CC holder') ?><span class="required"></span></label><br/>
81
+ <div class="input-box">
82
+ <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_cc_owner" autocomplete="off" onchange="ccHashCall();" value="<?php echo $billingaddres->getFirstname().' '.$billingaddres->getLastname() ?>" /></div>
83
  </div>
84
+ </li>
85
+ <li class="fields">
86
+ <div class="field">
87
+ <label style="float:none;" for="<?php echo $code ?>_cc_number"><?php echo $this->__('NN CC number') ?><span class="required"></span></label><br/>
88
+ <div class="input-box">
89
+ <input type="text" id="<?php echo $code ?>_cc_number" title="<?php echo $this->__('Credit Card Number') ?>" class="required-entry input-text validate-cc-number validate-cc-type" autocomplete="off" onchange="ccHashCall();" onkeypress="return isNumberKey(event, true);" value="" /> </div>
90
+ </div>
91
+ </li>
92
+ <li class="fields">
93
+ <div class="field">
94
+ <label style="float:none;" for="<?php echo $code ?>_expiration"><?php echo $this->__('NN Expiration Date') ?><span class="required"></span></label><br />
95
+ <div class="input-box">
96
+ <div class="v-fix">
97
+ <select id="<?php echo $code ?>_expiration" style="width:140px;" onchange="ccHashCall();" class="required-entry">
98
+ <option value=""><?php echo $this->__('Month'); ?></option>
99
+ <?php foreach ($this->getCcMonths() as $k => $v): ?>
100
+ <option value="<?php echo $k ?>"><?php echo $v ?></option>
101
+ <?php endforeach; ?>
102
+ </select>
103
+ </div>
104
+ <div class="v-fix" style="padding-left:5px;">
105
+ <select id="<?php echo $code ?>_expiration_yr" style="width:103px;" onchange="ccHashCall();" class="required-entry">
106
+ <option value=""><?php echo $this->__('Year'); ?></option>
107
+ <?php foreach ($this->getCcYears() as $k => $v): ?>
108
+ <option value="<?php echo $k ?>"><?php echo $v ?></option>
109
+ <?php endforeach; ?>
110
+ </select>
111
+ </div>
112
+ </div>
113
+ </div>
114
+ </li>
115
+ <li class="fields">
116
+ <div class="field">
117
+ <label style="float:none;" for="<?php echo $code ?>_cc_cid"><?php echo $this->__('NN CVC') ?><span class="required"></span></label><br />
118
+ <div class="input-box">
119
+ <div class="v-fix"><input type="text" title="<?php echo $this->__('Card Verification Number') ?>" onkeypress="return isNumberKey(event);" class="required-entry input-text validate-cc-cvn" id="<?php echo $code ?>_cc_cid" name="payment[nn_cc_cid]" style="width:3em;" autocomplete="off" /></div>
120
+ &nbsp;
121
+ <a href="#"><img src='<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>cvc_hint.png' border="0" style="margin-top:-15px;" alt="CCV/CVC?" id="nn_cc_hint"></a>
122
+ <img src="<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>creditcard_cvc.jpg" style="display:none;float:left;" border="0" id="nn_cvc_hover"/>
123
+ </div>
124
+ </div>
125
+ </li>
126
+ <!--{{{ CallbackType-->
127
+ <?php if (!$creditCardSecure && $this->isCallbackTypeCall()): ?>
128
+ <!--{{{ PIN by Callback-->
129
+ <?php
130
+ if ($this->getCallbackConfigData() != 3):
131
+ ?>
132
+ <li>
133
+ <div class="input-box">
134
+ <label style="float:none;" for="<?php echo $code ?>_callback_tel">
135
+ <?php
136
+ if ($this->getCallbackConfigData() == 2):
137
+ ?>
138
+ <?php echo $this->__('Mobile phone number'); ?>
139
+ <?php else: ?>
140
+ <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
141
+ <?php endif; ?>
142
+ <span class="required"></span></label><br/>
143
+ <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" value="<?php
144
+ echo $ccRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackTelNovalnetCc()
145
+ : '';
146
+ ?>"/>
147
+ </div>
148
+ </li>
149
+ <li>
150
+ <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
151
+ <?php echo $this->__('Note for pin by sms and callback') ?>
152
+ </div>
153
+ <div class="input-box">
154
+ <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required"></span></label><br/>
155
+ <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/>
156
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
157
+ <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
158
+ </div>
159
+ </li>
160
+ <!--}}} PIN by Callback-->
161
+ <!--{{{ Reply by Email-->
162
+ <?php
163
+ elseif ($this->getCallbackConfigData() == 3):
164
+ ?>
165
+ <li>
166
+ <div class="input-box">
167
+ <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required"></span></label><br/>
168
+ <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" value="<?php
169
+ echo $ccRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackEmailNovalnetCc()
170
+ : '';
171
+ ?>"/>
172
+ </div>
173
+ </li>
174
+ <?php endif ?>
175
+ <!--}}} Reply by Email-->
176
+ <?php endif ?>
177
+ <!--}}} CallbackType-->
178
+ </ul>
179
  <input type="hidden" id="original_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>" />
180
  <input type="hidden" id="original_vendor_authcode" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>" />
181
+ <input type="hidden" name="novalnet_cc_hash" id="novalnet_cc_hash" value="" />
182
+ <input type="hidden" name="novalnet_cc_pan_hash" id="novalnet_cc_pan_hash" value="<?php echo $ccRefill ? $refillValues->getCcPanHash() : ''; ?>" />
183
+ <input type="hidden" name="novalnet_cc_unique_id" id="novalnet_cc_unique_id" value="<?php echo $ccRefill ? $refillValues->getCcUniqueId() : ''; ?>" />
184
+ <input type="hidden" id="nn_cc_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
185
+ <input type="hidden" id="nn_cc_validate_error_message" value="<?php echo $this->__('Please enter valid credit card details') . '!'; ?>" />
186
 
187
+ </fieldset>
188
 
189
+ <style>
190
+ .nnccloader {
191
+ position: fixed;
192
+ left: 0px;
193
+ top: 0px;
194
+ width: 100%;
195
+ height: 100%;
196
+ z-index: 9999;
197
+ background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
198
+ }
199
+ </style>
200
 
201
+ <script type="text/javascript">
202
+ jQuery('#nn_cc_hint').hover(function(){
203
+ jQuery('#nn_cvc_hover').show();
204
+ });
205
+ jQuery('#nn_cc_hint').mouseleave(function(){
206
+ jQuery('#nn_cvc_hover').hide();
207
+ });
208
+ </script>
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Ccform.phtml DELETED
@@ -1,53 +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 = 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/frontend/rwd/default/template/novalnet/payment/method/form/Ideal.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Invoice.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
@@ -70,12 +70,12 @@ $helper = Mage::helper('novalnet_payment');
70
  <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
71
  <?php endif; ?>
72
  <span class="required"></span></label><br/>
73
- <input type="text" value="" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text" />
74
  </div>
75
  </li>
76
  <li>
77
  <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
78
- <?php echo $this->__('Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze eine PIN per Telefon-/Handyrückruf oder SMS.') ?>
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/>
@@ -88,9 +88,6 @@ $helper = Mage::helper('novalnet_payment');
88
  <!--{{{ Reply by Email-->
89
  <?php elseif ($this->getCallbackConfigData() == 3): ?>
90
  <li>
91
- <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
92
- <?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.') ?>
93
- </div>
94
  <div class="input-box">
95
  <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required"></span></label><br/>
96
  <input type="text" value="" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" />
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
70
  <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
71
  <?php endif; ?>
72
  <span class="required"></span></label><br/>
73
+ <input type="text" value="" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" />
74
  </div>
75
  </li>
76
  <li>
77
  <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
78
+ <?php echo $this->__('Note for pin by sms and callback') ?>
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/>
88
  <!--{{{ Reply by Email-->
89
  <?php elseif ($this->getCallbackConfigData() == 3): ?>
90
  <li>
 
 
 
91
  <div class="input-box">
92
  <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required"></span></label><br/>
93
  <input type="text" value="" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" />
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Paypal.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Phonepayment.phtml 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
- <?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 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/frontend/rwd/default/template/novalnet/payment/method/form/Prepayment.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Sepa.phtml CHANGED
@@ -12,22 +12,36 @@
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
- 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 -->
@@ -42,84 +56,310 @@ $sepaRefill = $this->getMethod()->getConfigData('sepa_refill');
42
  </div>
43
  <!--}}} Payment Logo -->
44
  <!--{{{ Novalnet SEPA Form -->
45
- <div id="payment_form_<?php echo $code ?>" style="display:none;">
46
- <?php if (!$this->getMethod()->validateNovalnetIframeParams()): ?>
 
 
 
 
 
 
 
 
 
 
47
  <div style="font-weight:bold;color:red;font-size:12px;">
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: 560px; 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="input~~~select" />
117
- <input type="hidden" id="original_sepa_customstyle_cssval" value="background: none repeat scroll 0 0 #FFFFFF;
118
- border-color: #AAAAAA #C8C8C8 #C8C8C8 #AAAAAA;border-style: solid;border-width: 1px;font: 12px;width:224px;~~~max-width: 100%;width:365px;" />
119
- <input type="hidden" name="novalnet_sepa_owner" id="novalnet_sepa_owner" value="" />
120
- <input type="hidden" name="novalnet_sepa_pan_hash" id="novalnet_sepa_pan_hash" value="" />
121
- <input type="hidden" name="novalnet_sepa_unique_id" id="novalnet_sepa_unique_id" value="" />
122
- <input type="hidden" name="novalnet_sepa_iban_confirmed" id="novalnet_sepa_iban_confirmed" value="" />
123
- <input type="hidden" name="novalnet_sepa_field_validator" id="novalnet_sepa_field_validator" value="" />
124
- <!--}}} Novalnet SEPA Form -->
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
125
  </fieldset>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
 
 
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
+ $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
  $sepaRefill = $this->getMethod()->getConfigData('sepa_refill');
30
+ $refillValues = $assignDatahelper->_getCheckout()->getData($code);
31
+ $refillMethod = ($sepaRefill && $refillValues != '' && $code == $refillValues->getMethod());
32
+ $billingaddres = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress();
33
+ $accountHolder = $refillMethod ? $refillValues->getSepaHolder() : '';
34
+ $billingCountry = $billingaddres->getcountryId() ? strtoupper($billingaddres->getcountryId()) : 'DE';
35
+ $refillName = ($sepaRefill && $accountHolder)
36
+ ? $accountHolder : $billingaddres->getFirstname() . ' ' . $billingaddres->getLastname();
37
+ $dataStreet = $billingaddres->getStreet();
38
+ $dataCity = $billingaddres->getCity();
39
+ $dataCompany = $billingaddres->getCompany();
40
+ $dataPostcode = $billingaddres->getPostcode();
41
+ $dataemail = $billingaddres->getEmail();
42
+ foreach ($dataStreet as $dataStreetValue) {
43
+ $quoteaddress = $dataStreetValue;
44
+ }
45
  ?>
46
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
47
  <!--{{{ Payment Logo -->
56
  </div>
57
  <!--}}} Payment Logo -->
58
  <!--{{{ Novalnet SEPA Form -->
59
+ <ul id="payment_form_<?php echo $code ?>" style="display:none">
60
+ <div class="nnsepaloader" id='sepa_loading' style='display:none;'></div>
61
+ <li>
62
+ <?php echo $this->__('Your account will be debited upon delivery of goods.'); ?>
63
+ </li>
64
+ <?php if ($this->getUserInfo()): ?>
65
+ <li>
66
+ <?php echo $this->getUserInfo() ?>
67
+ </li>
68
+ <?php endif ?>
69
+ <?php if (Mage::helper('novalnet_payment')->getModel('novalnetSepa')->_getConfigData('live_mode', true) == 0): ?>
70
+ <li>
71
  <div style="font-weight:bold;color:red;font-size:12px;">
72
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
73
  </div>
74
+ </li>
75
+ <?php endif ?>
76
+ <li class="fields">
77
+ <div class="field">
78
+ <label style="float:none;" for="<?php echo $code ?>_account_holder"><?php echo $this->__('NN Account Holder') ?><span class="required"></span></label><br/>
79
+ <div class="input-box">
80
+ <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_account_holder" name="payment[account_holder]" autocomplete="off" onchange="unsetHashRelatedElements()" value="<?php echo $refillName; ?>" />
81
+ </div>
82
  </div>
83
+ </li>
84
+ <li class="fields">
85
+ <div class="field">
86
+ <label style="float:none;" for="<?php echo $code ?>_bank_country"><?php echo $this->__('NN Country') ?><span class="required"></span></label><br />
87
+ <div class="input-box">
88
+ <?php
89
+ $_countries = Mage::getResourceModel('directory/country_collection')
90
+ ->loadData()
91
+ ->toOptionArray(false)
92
+ ?>
93
+ <?php if (count($_countries) > 0): ?>
94
+ <select id="<?php echo $code ?>_bank_country" onchange="unsetHashRelatedElements()" class="required-entry">
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
95
  <?php
96
+ foreach ($_countries as $_country):
97
+ if (in_array($billingCountry, $_country)) {
98
+ ?>
99
+ <option selected value="<?php echo $_country['value'] ?>"><?php echo $_country['label'] ?>
100
+ </option>
101
+ <?php } else { ?>
102
+ <option value="<?php echo $_country['value'] ?>">
103
+ <?php echo $_country['label'] ?>
104
+ </option>
105
+ <?php } ?>
106
+ <?php endforeach; ?>
107
+ </select><br/>
108
+ <?php endif; ?>
109
+ </div>
110
+ </div>
111
+ </li>
112
+ <li class="fields">
113
+ <div class="field">
114
+ <label style="float:none;" for="<?php echo $code ?>_account_number"><?php echo $this->__('IBAN or Account Number') ?><span class="required"></span></label><br/>
115
+ <div class="input-box">
116
+ <input type="text" id="<?php echo $code ?>_account_number" onchange="unsetHashRelatedElements()" title="<?php echo $this->__('IBAN or Account Number') ?>" class="required-entry input-text" autocomplete="off" value="" />
117
+ </div>
118
+ </div>
119
+ </li>
120
+ <li class="fields">
121
+ <div class="field">
122
+ <label style="float:none;" for="<?php echo $code ?>_bank_code"><?php echo $this->__('BIC or Bank Code') ?><span class="required"></span></label><br/>
123
+ <div class="input-box">
124
+ <input type="text" id="<?php echo $code ?>_bank_code" title="<?php echo $this->__('BIC or Bank Code') ?>" class="input-text" autocomplete="off" onchange="unsetHashRelatedElements()" value="" />
125
+ </div>
126
+ </div>
127
+ </li>
128
+ <li class="fields">
129
+ <div class="field">
130
+ <div class="input-box">
131
+ <input type="checkbox" id="<?php echo $code ?>_mandate_confirm" title="<?php echo $this->__('confirm') ?>" class="required-entry" onclick="sepaIbanBicCall(this)"/>
132
+ <label style="float:none;display:inline;" for="<?php echo $code ?>_mandate_confirm"><?php echo $this->__('NN Confirm') ?></label><br/>
133
+ </div>
134
+ </div>
135
+ </li>
136
+ <!--{{{ CallbackType-->
137
+ <?php if ($this->isCallbackTypeCall()): ?>
138
+ <!--{{{ PIN by Callback-->
139
+ <?php
140
+ if ($this->getCallbackConfigData() != 3):
141
+ ?>
142
+ <li>
143
+ <div class="input-box">
144
+ <label style="float:none;" for="<?php echo $code ?>_callback_tel">
145
+ <?php
146
+ if ($this->getCallbackConfigData() == 2):
147
+ ?>
148
+ <?php echo $this->__('Mobile phone number'); ?>
149
+ <?php else: ?>
150
+ <?php echo $this->__('Ihre Telefon- / Mobil- Nummer'); ?>
151
+ <?php endif; ?>
152
+ <span class="required"></span></label><br/>
153
+ <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" value="<?php
154
+ echo $sepaRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackTelNovalnetSepa()
155
+ : '';
156
+ ?>"/>
157
+ </div>
158
+ </li>
159
+ <li>
160
+ <div style="font-weight:bold;color:gray;border:1px solid #BFBFBF;font-size:11px; background:#FEFFBF; padding:10px; margin-top:10px;width:400px;">
161
+ <?php echo $this->__('Note for pin by sms and callback') ?>
162
+ </div>
163
+ <div class="input-box">
164
+ <label style="float:none;" for="<?php echo $code ?>_callback_pin"><?php echo $this->__('PIN') ?><span class="required"></span></label><br/>
165
+ <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/>
166
+ <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
167
+ <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
168
+ </div>
169
+ </li>
170
+ <!--}}} PIN by Callback-->
171
+ <!--{{{ Reply by Email-->
172
+ <?php
173
+ elseif ($this->getCallbackConfigData() == 3):
174
+ ?>
175
+ <li>
176
+ <div class="input-box">
177
+ <label style="float:none;" for="<?php echo $code ?>_callback_email"><?php echo $this->__('E-mail Address') ?><span class="required"></span></label><br/>
178
+ <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
179
+ echo $sepaRefill ? $helper->_getCheckout()->getData($code)->getNnCallbackEmailNovalnetSepa()
180
+ : '';
181
+ ?>"/>
182
+ </div>
183
+ </li>
184
+ <?php endif ?>
185
+ <!--}}} Reply by Email-->
186
+ <?php endif ?>
187
+ <!--}}} CallbackType-->
188
+ <!-- Mandate overlay START-->
189
+ <li>
190
+ <div class="bgCover">&nbsp;</div>
191
+ <div id='sepa_mandate_overlay_block_first' style='display:none;' class='overlay_window_block'>
192
+ <img src='<?php echo $this->getSkinUrl("images/novalnet/novalnet-loading-icon.gif"); ?>'alt='Loading...'/>
193
+ </div>
194
+ <div id='sepa_mandate_overlay_block' style='display:none;' class='overlay_window_block'>
195
+ <div class='nn_header'>
196
+ <h1><?php echo $this->__('SEPA Direct Debit Mandate Confirmation') ?></h1>
197
+ </div>
198
+ <div class='body_div' id='overlay_window_block_body' style="height: 400px;">
199
+ <p>
200
+ <table>
201
+ <tr>
202
+ <td><?php echo $this->__('Creditor') ?></td><td>:</td><td><span id='sepa_overlay_payee_span'>&nbsp;</span></td>
203
+ </tr>
204
+ <tr>
205
+ <td><?php echo $this->__('Credit Identification Number') ?></td><td>:</td><td><span id='sepa_overlay_creditoridentificationnumber_span'>&nbsp;</span></td>
206
+ </tr>
207
+ <tr>
208
+ <td><?php echo $this->__('Mandate Reference') ?></td><td>:</td><td><span id='sepa_overlay_mandatereference_span'>&nbsp;</span></td>
209
+ </tr>
210
+ </table><br/>
211
+ <?php echo $this->__('SEPA Confirm paragraph') ?>
212
+ <br/> <br/>
213
+ <?php echo $this->__('SEPA Confirm note') ?>
214
+ <br/> <br/>
215
+ <table>
216
+ <tr>
217
+ <td><?php echo $this->__('Name of the payee') ?></td><td>:</td><td><span id='sepa_overlay_enduserfullname_span'>&nbsp;</span></td>
218
+ </tr>
219
+ <?php if ($dataCompany): ?>
220
+ <tr>
221
+ <td><?php echo $this->__('Company') ?></td><td>:</td><td><?php echo $dataCompany; ?></td>
222
+ </tr>
223
+ <?php endif; ?>
224
+ <?php if ($quoteaddress): ?>
225
+ <tr>
226
+ <td><?php echo $this->__('Address') ?></td><td>:</td><td><?php echo $quoteaddress; ?></td>
227
+ </tr>
228
+ <?php endif; ?>
229
+ <?php if ($dataPostcode && $dataCity): ?>
230
+ <tr>
231
+ <td><?php echo $this->__('Zip Code And City') ?></td><td>:</td><td><?php echo $dataPostcode; ?><span id='sepa_overlay_enduserzipcode_span'>&nbsp;</span> <?php echo $dataCity; ?></td>
232
+ </tr>
233
+ <?php endif; ?>
234
+ <?php if ($dataPostcode): ?>
235
+ <tr>
236
+ <td><?php echo $this->__('Country') ?></td><td>:</td><td><span id='sepa_overlay_endusercountry_span'>&nbsp;</span></td>
237
+ </tr>
238
+ <?php endif; ?>
239
+ <?php if ($dataemail): ?>
240
+ <tr>
241
+ <td><?php echo $this->__('Email') ?></td><td>:</td><td><?php echo $dataemail; ?></td>
242
+ </tr>
243
+ <?php endif; ?>
244
+ <tr id='nn_sepa_overlay_iban_tr'>
245
+ <td><?php echo $this->__('IBAN') ?></td><td>:</td><td><span id='sepa_overlay_iban_span'>&nbsp;</span></td>
246
+ </tr>
247
+ <tr id='nn_sepa_overlay_bic_tr'>
248
+ <td><?php echo $this->__('BIC') ?></td><td>:</td><td><span id='sepa_overlay_bic_span'>&nbsp;</span></td>
249
+ </tr>
250
+ </table>
251
+ <br/>
252
+ <?php echo $dataCity; ?>, <span id='sepa_overlay_mandatedate_span'>&nbsp;</span>, <span id='sepa_overlay_enduserfullname_span1'>&nbsp;</span>
253
+ </p>
254
+ </div>
255
+ <div class='nn_footer'>
256
+ <input style="width: 30%" type='button' id='mandate_confirm_btn' name='mandate_confirm_btn' onclick="mandateConfirmButtonSubmit()" value=<?php echo $this->__('conirm_mandate') ?> class='mandate_confirm_btn' />
257
+ <input style="width: 30%" type='button' id='mandate_cancel_btn' name='mandate_cancel_btn' onclick="mandateCancelButtonSubmit()" value=<?php echo $this->__('NN cancel') ?> class='mandate_confirm_btn' />
258
+ <img src='<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>logo.png' width=120 alt='Novalnet AG' style='float:right;' />
259
+ </div>
260
+ </div>
261
+ </li>
262
+ <!-- Mandate overlay END-->
263
+ </ul>
264
+ <input type="hidden" id="nn_sepa_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
265
+ <input type="hidden" id="nn_sepa_validate_error_message" value="<?php echo $this->__('Please enter valid account details') . '!'; ?>" />
266
+ <input type="hidden" id="process_vendor_id" name="process_vendor_id" value="<?php echo trim($this->getMethod()->_getConfigData('merchant_id', true)) ?>"/>
267
+ <input type="hidden" id="auth_code" name="auth_code" value="<?php echo trim($this->getMethod()->_getConfigData('auth_code', true)) ?>"/>
268
+ <input type="hidden" id="sepa_payment_id" value="37" name="sepa_payment_id">
269
+ <input type="hidden" id="result_sepa_hash" value="<?php echo $sepaRefill ? $refillValues->getSepaHash() : ''; ?>" name="result_sepa_hash">
270
+ <input type="hidden" id="result_mandate_date" value="" name="result_mandate_date">
271
+ <input type="hidden" id="result_mandate_ref" value="" name="result_mandate_ref">
272
+ <input type="hidden" id="result_mandate_unique" value="" name="result_mandate_unique">
273
+ <input type="hidden" id="nnsepa_iban_confirmed" value="0" name="nnsepa_iban_confirmed">
274
+ <input type="hidden" id="sepaiban" value="" name="sepaiban">
275
+ <input type="hidden" id="sepabic" value="" name="sepabic">
276
  </fieldset>
277
+ <style>
278
+ .nnsepaloader {
279
+ position: fixed;
280
+ left: 0px;
281
+ top: 0px;
282
+ width: 100%;
283
+ height: 100%;
284
+ z-index: 9999;
285
+ background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
286
+ }
287
+
288
+ .bgCover { background:#878787; position:fixed; left:0; top:0; display:none; overflow:hidden; z-index:1000; }
289
+ #sepa_mandate_overlay_block
290
+ {
291
+ font-size:12px;
292
+ color:#555555;
293
+ background-color:#fff;
294
+ }
295
+
296
+ .overlay_window_block {
297
+ background-color:#ffffff;
298
+ border-radius:5px;
299
+ border:1px solid #a1a1a1;
300
+ z-index:1000;
301
+ }
302
+ .overlay_window_block .nn_footer{
303
+ bottom:0px;
304
+ position:absolute;
305
+ height:37px;
306
+ width:100%;
307
+ }
308
+ .overlay_window_block .nn_header{
309
+ top:0px;
310
+ height:25px;
311
+ border-bottom:1px solid #878787;
312
+ padding:5px;
313
+ }
314
+ .overlay_window_block .body_div{
315
+ padding:5px;
316
+ overflow-y:scroll;
317
+ }
318
+ .mandate_confirm_btn{
319
+ border:1px solid #0080C9;
320
+ -webkit-border-radius: 3px;
321
+ -moz-border-radius: 3px;
322
+ border-radius: 3px;
323
+ padding: 6px;
324
+ text-decoration:none;
325
+ display:inline-block;
326
+ text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
327
+ font-weight:bold;
328
+ color: #FFFFFF;
329
+ width:40%;
330
+ cursor:pointer;
331
+ margin-left:2px;
332
+ margin-top:3px;
333
+ float:left;
334
+ margin-bottom:0px;
335
+ background-color: #0080C9; background-image: -webkit-gradient(linear, left top, left bottom, from(#0080C9), to(#0080C9));
336
+ background-image: -webkit-linear-gradient(top, #0080C9, #0080C9);
337
+ background-image: -moz-linear-gradient(top, #0080C9, #0080C9);
338
+ background-image: -ms-linear-gradient(top, #0080C9, #0080C9);
339
+ background-image: -o-linear-gradient(top, #0080C9, #0080C9);
340
+ background-image: linear-gradient(to bottom, #0080C9, #0080C9);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=#0080C9, endColorstr=#0080C9);
341
+ }
342
+
343
+ .mandate_confirm_btn:hover{
344
+ border:1px solid #878787;
345
+ background-color: #878787; background-image: -webkit-gradient(linear, left top, left bottom, from(#878787), to(#878787));
346
+ background-image: -webkit-linear-gradient(top, #878787, #878787);
347
+ background-image: -moz-linear-gradient(top, #878787, #878787);
348
+ background-image: -ms-linear-gradient(top, #878787, #878787);
349
+ background-image: -o-linear-gradient(top, #878787, #878787);
350
+ background-image: linear-gradient(to bottom, #878787, #878787);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=#878787, endColorstr=#878787);
351
+ }
352
+
353
+ #sepa_mandate_overlay_block h1
354
+ {
355
+ color: #00669D;
356
+ font-size:14px;
357
+ font-weight:bold;
358
+ text-transform:none;
359
+ margin:0;
360
+ }
361
+
362
+ table td{
363
+ padding : 2px;
364
+ }
365
+ </style>
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Sepaform.phtml DELETED
@@ -1,53 +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 = 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') ?>
45
- </div>
46
- </li>
47
- <?php endif ?>
48
- </ul>
49
- <!--}}} Payment Description -->
50
-
51
- <!--{{{ Novalnet Iframe -->
52
- <?php echo Mage::helper('novalnet_payment')->getModel('novalnetSepa')->getNovalnetIframe() ?>
53
- <!--}}} Novalnet Iframe -->
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Sofortueberweisung.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/frontend/rwd/default/template/novalnet/payment/method/form/blank.phtml DELETED
@@ -1,38 +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
- <!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/frontend/rwd/default/template/novalnet/payment/method/info/Cc.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
@@ -34,7 +34,7 @@ if ($_info):
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')):
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
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->getMethod()->getTitle()) ?><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')):
app/design/frontend/rwd/default/template/novalnet/payment/method/info/Ideal.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
app/design/frontend/rwd/default/template/novalnet/payment/method/info/Invoice.phtml CHANGED
@@ -12,15 +12,15 @@
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();
@@ -32,10 +32,10 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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):
@@ -46,28 +46,54 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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; ?>
 
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
32
  <?php
33
  if ($this->getAdditionalData('NnTestOrder'))
34
  echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
35
+ ?>
36
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
37
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
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):
46
  endforeach;
47
  endif;
48
  ?>
49
+ <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl)): ?>
50
+ <?php
51
+ if (strlen($this->getAdditionalData('NnNote'))):
52
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
53
+ echo nl2br($this->getAdditionalData('NnNote'));
54
+ else:
55
+ $note = explode('|',$this->getAdditionalData('NnNote'));
56
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
57
+ foreach($note as $noteValue):
58
+ list($text, $value) = explode(':', $noteValue);
59
+ echo $this->__($text) . ' : '. $value . '</br>';
60
+ endforeach;
61
+ endif;
62
+ endif;
63
+ ?>
64
  <?php
65
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
66
+ list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
67
+ echo $this->__($text) . ' : '. $value;
68
+ endif;
69
  ?>
70
  <?php
71
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
72
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
73
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
74
+ else:
75
+ $note = explode('|',$this->getAdditionalData('NnNoteTID'));
76
+ echo "<br />";
77
+ foreach($note as $noteValue):
78
+ list($text, $value) = explode(':', $noteValue);
79
+ if ($text == 'NN_Reference3'):
80
+ list($referenceTxt, $value) = explode('&', $value);
81
+ str_replace('&', '', $referenceTxt);
82
+ echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
83
+ else:
84
+ echo $this->__($text) . ' : '. $value . '</br>';
85
+ endif;
86
+ endforeach;
87
+ endif;
88
+ endif;
89
  ?>
90
  <?php
91
+ if (strlen($this->getAdditionalData('NnComments'))):
 
 
 
 
 
92
  echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
93
+ endif;
94
  ?>
95
+ <?php endif; ?>
96
  <?php else: ?>
97
  <?php echo $this->__('Error in getting payment method') ?>
98
  <?php endif; ?>
99
+
app/design/frontend/rwd/default/template/novalnet/payment/method/info/Paypal.phtml CHANGED
@@ -12,15 +12,15 @@
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();
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
app/design/frontend/rwd/default/template/novalnet/payment/method/info/Phonepayment.phtml DELETED
@@ -1,42 +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
- ?>
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 } ?>
40
- <?php else: ?>
41
- <?php echo $this->__('Error in getting payment method') ?>
42
- <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/rwd/default/template/novalnet/payment/method/info/Prepayment.phtml CHANGED
@@ -12,15 +12,15 @@
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();
@@ -32,10 +32,10 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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):
@@ -46,28 +46,53 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
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; ?>
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
32
  <?php
33
  if ($this->getAdditionalData('NnTestOrder'))
34
  echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
35
+ ?>
36
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
37
  <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br />' ?>
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):
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
+ if (strstr($this->getAdditionalData('NnNote'), 'br')):
53
+ echo nl2br($this->getAdditionalData('NnNote'));
54
+ else:
55
+ $note = explode('|',$this->getAdditionalData('NnNote'));
56
+ echo '<br><b>' . $this->__('Please transfer the invoice amount with the following information to our payment provider Novalnet AG') . '</b></br>';
57
+ foreach($note as $noteValue):
58
+ list($text, $value) = explode(':', $noteValue);
59
+ echo $this->__($text) . ' : '. $value . '</br>';
60
+ endforeach;
61
+ endif;
62
+ endif;
63
+ ?>
64
  <?php
65
+ if (strlen($this->getAdditionalData('NnNoteAmount'))):
66
+ list ($text, $value) = explode(':',$this->getAdditionalData('NnNoteAmount'));
67
+ echo $this->__($text) . ' : '. $value;
68
+ endif;
69
  ?>
70
  <?php
71
+ if (strlen($this->getAdditionalData('NnNoteTID'))):
72
+ if (strstr($this->getAdditionalData('NnNoteTID'), 'br')):
73
+ echo nl2br($this->getAdditionalData('NnNoteTID'));
74
+ else:
75
+ $note = explode('|',$this->getAdditionalData('NnNoteTID'));
76
+ echo "<br />";
77
+ foreach($note as $noteValue):
78
+ list($text, $value) = explode(':', $noteValue);
79
+ if ($text == 'NN_Reference3'):
80
+ list($referenceTxt, $value) = explode('&', $value);
81
+ str_replace('&', '', $referenceTxt);
82
+ echo $this->__($text) . ' : '. '<b>'.$this->__($referenceTxt) . ' '. $value . '</b></br>';
83
+ else:
84
+ echo $this->__($text) . ' : '. $value . '</br>';
85
+ endif;
86
+ endforeach;
87
+ endif;
88
+ endif;
89
  ?>
90
  <?php
91
+ if (strlen($this->getAdditionalData('NnComments'))):
 
 
 
 
 
92
  echo nl2br($this->getAdditionalData('NnComments')) . '<br>';
93
+ endif;
94
  ?>
95
+ <?php endif; ?>
96
  <?php else: ?>
97
  <?php echo $this->__('Error in getting payment method') ?>
98
  <?php endif; ?>
app/design/frontend/rwd/default/template/novalnet/payment/method/info/Sepa.phtml CHANGED
@@ -12,15 +12,15 @@
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
  ?>
@@ -34,7 +34,7 @@ if ($_info):
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')):
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
  * @category Novalnet
22
  * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  ?>
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->getMethod()->getTitle()) ?><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')):
app/design/frontend/rwd/default/template/novalnet/payment/method/info/Sofortueberweisung.phtml CHANGED
@@ -12,15 +12,15 @@
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();
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * Part of the payment module of Novalnet AG
16
  * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
  * recommendation as well as a comment on merchant form
19
  * would be greatly appreciated.
20
  *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  $_info = $this->getInfo();
app/etc/modules/Novalnet_Payment.xml CHANGED
@@ -1,4 +1,30 @@
1
  <?xml version="1.0" encoding="UTF-8"?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2
  <config>
3
  <modules>
4
  <Novalnet_Payment>
1
  <?xml version="1.0" encoding="UTF-8"?>
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 payment modulee of Novalnet AG
17
+ * https://www.novalnet.de
18
+ * If you have found this script useful 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 Copyright (c) Novalnet AG. (https://www.novalnet.de)
25
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
+ */
27
+ -->
28
  <config>
29
  <modules>
30
  <Novalnet_Payment>
app/locale/de_DE/Novalnet_Payment.csv CHANGED
@@ -26,18 +26,14 @@
26
  "Novalnet Instant Bank Transfer","Novalnet Sofortüberweisung"
27
  "Novalnet PayPal","Novalnet PayPal"
28
  "Novalnet iDEAL","Novalnet iDEAL"
29
- "Novalnet Phonepayment","Novalnet Telefonpayment"
30
- "Novalnet Telephone Payment","Novalnet Telefonpayment"
31
  "Enable Novalnet Module","Modul aktivieren"
32
  "Novalnet Title","Novalnet Titel"
 
33
  "Enable cc3d","3D Secure (Achtung : dies muss zuerst bei Novalnet eingerichtet werden: bitte wenden Sie sich an support@novalnet.de, falls Sie dies wünschen)"
34
  "cc3d description","(Bitte beachten Sie; dass dieses Verfahren nur eine geringe Akzeptanz bei Endkunden hat). Sobald 3D-Secure für Kreditkarten aktiviert ist, läßt die Bank den Käufer ein Passwort eingeben, um den Mißbrauch der Kreditkarte zu verhindern. Dies kann als Beweis verwendet werden, dass der Käufer tatsächlich der Inhaber der Kreditkarte ist."
35
- "Set order Status","Bestellstatus für abgeschlossene Zahlungen"
36
- "Order Status Before Payment","Bestellstatus vor der Zahlung"
37
- "Order Status After Successful Payment","Bestellstatus nach erfolgreicher Zahlung"
38
  "Order Status Before Payment","Bestellstatus vor der zahlung"
39
  "Order Status After Payment","Bestellstatus nach zahlung"
40
- "Set the status of orders made with this payment module to this value","Setzen Sie den Status von über dieses Zahlungsmodul durchgeführten Bestellungen auf diesen Wert"
41
  "Order Status After Successful Payment","Bestellstatus nach erfolgreicher Zahlung"
42
  "Manual checking of order","Manuelle Überprüfung der Bestellung ab einem Betrag (in Cent) (Anmerkung: dies ist eine Zahlung on hold, welche Sie manuell überprüfen und aktivieren müssen.)"
43
  "Manual checking of order Desc","Alle Bestellungen über diesem Betrag werden von Novalnet on hold gesetzt. Erst nach Ihrer manuellen Überprüfung und Bestätigung bei Novalnet, wird die Buchung ausgeführt."
@@ -54,7 +50,7 @@
54
  "Excluded User Group Desc","Geben Sie hier die IDs der Benutzergruppen (durch Komma getrennt) ein. Diese finden Sie unter Kunden → Kundengruppen"
55
  "Gateway Timeout","Zeitüberschreitung bei der Schnittstelle"
56
  "Gateway Timeout in seconds","Zeitlimit der Schnittstelle in Sekunden"
57
- "Payment from applicable countries","Zahlungsmöglichkeit für"
58
  "Payment from Specific countries","Länderauswahl für Zahlungsmöglichkeit"
59
  "Novalnet Minimum Order Total","Mindestwert für Gesamtbestellung (in Euro)"
60
  "Novalnet Maximum Order Total","Höchstwert für Gesamtbestellung (in Euro)"
@@ -62,7 +58,6 @@
62
  "Novalnet Minimum Orders Count Desc","Standardwert: ""0"" (Prüfung deaktiviert) | Mindestanzahl der vorherigen Bestellungen des Endkunden, damit dieser diese Zahlungsart verwenden darf."
63
  "Novalnet Sort Order","Sortierung nach"
64
  "Sort order of display. Lowest is displayed first.","Sortierung der Anzeige. Der niedrigste Wert wird zuerst angezeigt."
65
- "SEPA Payment Type","SEPA-Zahlungstyp"
66
  "Direct Debit SEPA","Lastschrift SEPA"
67
  "SEPA Payment duration in days","SEPA Zahlungsdauer in Tagen"
68
  "SEPA Due Date description","Tragen Sie das Fälligkeitsdatum in Tagen ein, es sollten mehr als 6 Tage sein. Eine fehlerhafte Eingabe wird automatisch als 7 Tage übernommen."
@@ -77,23 +72,21 @@
77
  "Mobile phone number","Handy-Nummer"
78
  "Ihre Telefon- / Mobil- Nummer","Telefonnummer"
79
  "Callback","Callback"
80
- "Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze eine PIN per Telefon-/Handyrückruf oder SMS.","Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze eine PIN per Telefon-/Handyrückruf oder SMS."
81
- "Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze ein EMAIL, das Sie sofort ohne änderung des Mailtexts beantworten müssen.","Hinweis: Nach einem Klick auf "Fortsetzen" erhalten Sie in Kürze ein EMAIL, das Sie sofort ohne änderung des Mailtexts beantworten müssen."
82
  "PIN","PIN"
83
  "Forgot PIN? [New PIN Request]","PIN vergessen? [Neue PIN beantragen]"
84
  "E-mail Address","E-mail Adresse"
85
  "Please Note: This transaction will run on TEST MODE and the amount will not be charged","Bitte beachten Sie: Diese Transaktion wird im Test-Modus ausgeführt werden und der Betrag wird nicht belastet werden."
86
- "Your amount will be added in your telephone bill when you place the order","Ihr Betrag wird zu Ihrer Telefonrechnung hinzugefügt werden, wenn Sie die Bestellung aufgeben."
87
  "The amount will be booked immediately from your credit card.","Die Belastung Ihrer Kreditkarte erfolgt mit dem Abschluss der Bestellung."
88
  "Your account will be debited upon delivery of goods.","Die Belastung Ihres Kontos erfolgt mit dem Versand der Ware."
89
  "The Bank details will be emailed to you soon after the completion of checkout process","Die Bankverbindung wird Ihnen nach Abschluss Ihrer Bestellung per E-Mail zugeschickt."
90
  "You will be redirected to Novalnet AG website when you place an order.","Sie werden zur Website der Novalnet AG umgeleitet, sobald Sie die Bestellung bestätigen."
91
  "You will be redirected to Novalnet AG in a few seconds.","Sie werden in wenigen Sekunden zur Novalnet AG weitergeleitet."
92
- "Customer was redirected to Novalnet","Besteller zu Novalnet umgeleitet"
93
  "Payment Failed","Zahlung fehlgeschlagen"
94
- "Payment was successful.","Zahlung war erfolgreich."
95
- "Customer successfully returned from Novalnet","Besteller von Novalnet erfolgreich zurückgeleitet"
96
- "Payment was not successfull","Zahlung konnte nicht durchgeführt werden. Es ist ein Fehler aufgetreten."
97
  "successful","erfolgreiche"
98
  "Please transfer the invoice amount with the following information to our payment provider Novalnet AG","Bitte überweisen Sie den Betrag mit der folgenden Information an unseren Zahlungsdienstleister Novalnet AG"
99
  "Due Date","Fälligkeitsdatum"
@@ -105,21 +98,11 @@
105
  "Required parameter not valid","Ungültiger Wert für Pflichtfeld"
106
  "Gateway request error: %s","Fehler beim übertragen der Daten: %s"
107
  "Error in capturing the payment","Fehler bei der Durchführung der Zahlung"
108
- "Following steps are required to complete your payment","Folgende Schritte sind notwendig, um Ihre Zahlung abzuschließen"
109
- "Step","Schritt"
110
- "including VAT","inkl. MwSt."
111
- "This call will cost","Dieser Anruf kostet"
112
- "Please call the telephone number displayed","Bitte rufen Sie die angezeigte Telefonnummer an"
113
- "and it is possible only for German landline connection","und ist nur für Festnetzanschlüsse in Deutschland möglich"
114
- "Please wait for the beep and then hang up the listeners","Bitte warten Sie auf den Signalton und legen Sie dann den Hörer auf"
115
- "After your successful call, please proceed with the payment","War Ihr Anruf erfolgreich, schließen Sie bitte die Zahlung ab"
116
- "Amounts below 0,99 Euros and above 10,00 Euros cannot be processed and are not accepted","Betraege unter 0,99 Euro und ueber 10,00 Euro koennen nicht verarbeitet werden bzw. werden nicht akzeptiert"
117
  "SEPA Due date is not valid","SEPA Fälligkeitsdatum Ungültiger"
118
  "Manual limit amount / Product-ID2 / Tariff-ID2 is not valid","Ungültige Bestellgrenze / 2. Produkt-ID / 2. Tarif-ID"
119
  "Customer name/email fields are not valid","Ungültige Werte für die Felder Kundenname-/email"
120
  "Please reply to the e-mail","Wir haben Ihnen eine Email geschickt, beantworten Sie diese bitte."
121
  "You will shortly receive a PIN by phone / SMS. Please enter the PIN in the appropriate text box","Sie erhalten in Kürze eine PIN per Telefon/SMS. Geben Sie bitte die PIN in das entsprechende Textfeld ein"
122
- "You have changed the order amount after receiving telephone number","Sie haben die Bestellmenge nach Erhalt der Telefonnummer geändert, versuchen Sie es bitte noch einmal mit einem neuen Anruf."
123
  "You have changed the order amount after getting PIN number, please try again with a new call","Sie haben die Bestellmenge nach dem Erhalt der PIN-Nummer geändert, versuchen Sie es bitte erneut mit einem neuen Anruf"
124
  "You have changed the order amount after getting e-mail, please try again with a new call","Sie haben die Bestellmenge nach dem Erhalt der Email geändert, versuchen Sie es bitte erneut mit einem neuen Anruf"
125
  "Please enter valid account details","Geben Sie bitte gültige Kontodaten ein"
@@ -163,6 +146,7 @@
163
  "Enable AMEX logo","AMEX-Logo aktivieren"
164
  "To display AMEX logo in front end","AMEX-Logo im Frontend anzeigen"
165
  "Order no","Bestellnr."
 
166
  "Transaction Status","Transaktions-Status"
167
  "Transaction","Transaktion"
168
  "Transaction no","Transaktionsnr."
@@ -188,3 +172,33 @@
188
  "Invoice Due Date description","Geben Sie bitte die Zahlungsfrist in Tagen ein - diese sollte größer als 6 sein. Wenn Sie diesen Wert leer lassen oder einen Wert < 7 eingeben, dann wird der Standardwert von 14 Tagen verwendet."
189
  "No active payment method for this store","Für diesen Shop ist keine Zahlungsart aktiviert."
190
  "Novalnet Method","Novalnet Methode"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
26
  "Novalnet Instant Bank Transfer","Novalnet Sofortüberweisung"
27
  "Novalnet PayPal","Novalnet PayPal"
28
  "Novalnet iDEAL","Novalnet iDEAL"
 
 
29
  "Enable Novalnet Module","Modul aktivieren"
30
  "Novalnet Title","Novalnet Titel"
31
+ "Current Configuration Scope:","Aktueller Konfig.-Bereich:"
32
  "Enable cc3d","3D Secure (Achtung : dies muss zuerst bei Novalnet eingerichtet werden: bitte wenden Sie sich an support@novalnet.de, falls Sie dies wünschen)"
33
  "cc3d description","(Bitte beachten Sie; dass dieses Verfahren nur eine geringe Akzeptanz bei Endkunden hat). Sobald 3D-Secure für Kreditkarten aktiviert ist, läßt die Bank den Käufer ein Passwort eingeben, um den Mißbrauch der Kreditkarte zu verhindern. Dies kann als Beweis verwendet werden, dass der Käufer tatsächlich der Inhaber der Kreditkarte ist."
34
+ "Order Completion Status","Bestellen Abschluss status"
 
 
35
  "Order Status Before Payment","Bestellstatus vor der zahlung"
36
  "Order Status After Payment","Bestellstatus nach zahlung"
 
37
  "Order Status After Successful Payment","Bestellstatus nach erfolgreicher Zahlung"
38
  "Manual checking of order","Manuelle Überprüfung der Bestellung ab einem Betrag (in Cent) (Anmerkung: dies ist eine Zahlung on hold, welche Sie manuell überprüfen und aktivieren müssen.)"
39
  "Manual checking of order Desc","Alle Bestellungen über diesem Betrag werden von Novalnet on hold gesetzt. Erst nach Ihrer manuellen Überprüfung und Bestätigung bei Novalnet, wird die Buchung ausgeführt."
50
  "Excluded User Group Desc","Geben Sie hier die IDs der Benutzergruppen (durch Komma getrennt) ein. Diese finden Sie unter Kunden → Kundengruppen"
51
  "Gateway Timeout","Zeitüberschreitung bei der Schnittstelle"
52
  "Gateway Timeout in seconds","Zeitlimit der Schnittstelle in Sekunden"
53
+ "Payment from applicable countries","Zahlung aus zugelassenen Ländern"
54
  "Payment from Specific countries","Länderauswahl für Zahlungsmöglichkeit"
55
  "Novalnet Minimum Order Total","Mindestwert für Gesamtbestellung (in Euro)"
56
  "Novalnet Maximum Order Total","Höchstwert für Gesamtbestellung (in Euro)"
58
  "Novalnet Minimum Orders Count Desc","Standardwert: ""0"" (Prüfung deaktiviert) | Mindestanzahl der vorherigen Bestellungen des Endkunden, damit dieser diese Zahlungsart verwenden darf."
59
  "Novalnet Sort Order","Sortierung nach"
60
  "Sort order of display. Lowest is displayed first.","Sortierung der Anzeige. Der niedrigste Wert wird zuerst angezeigt."
 
61
  "Direct Debit SEPA","Lastschrift SEPA"
62
  "SEPA Payment duration in days","SEPA Zahlungsdauer in Tagen"
63
  "SEPA Due Date description","Tragen Sie das Fälligkeitsdatum in Tagen ein, es sollten mehr als 6 Tage sein. Eine fehlerhafte Eingabe wird automatisch als 7 Tage übernommen."
72
  "Mobile phone number","Handy-Nummer"
73
  "Ihre Telefon- / Mobil- Nummer","Telefonnummer"
74
  "Callback","Callback"
75
+ "Note for pin by sms and callback","Nachdem Sie auf den Button ""Weiter"" geklickt haben, erhalten Sie in Kürze eine PIN via Telefon / SMS. Geben Sie diese PIN bitte in das passende Textfeld ein."
 
76
  "PIN","PIN"
77
  "Forgot PIN? [New PIN Request]","PIN vergessen? [Neue PIN beantragen]"
78
  "E-mail Address","E-mail Adresse"
79
  "Please Note: This transaction will run on TEST MODE and the amount will not be charged","Bitte beachten Sie: Diese Transaktion wird im Test-Modus ausgeführt werden und der Betrag wird nicht belastet werden."
 
80
  "The amount will be booked immediately from your credit card.","Die Belastung Ihrer Kreditkarte erfolgt mit dem Abschluss der Bestellung."
81
  "Your account will be debited upon delivery of goods.","Die Belastung Ihres Kontos erfolgt mit dem Versand der Ware."
82
  "The Bank details will be emailed to you soon after the completion of checkout process","Die Bankverbindung wird Ihnen nach Abschluss Ihrer Bestellung per E-Mail zugeschickt."
83
  "You will be redirected to Novalnet AG website when you place an order.","Sie werden zur Website der Novalnet AG umgeleitet, sobald Sie die Bestellung bestätigen."
84
  "You will be redirected to Novalnet AG in a few seconds.","Sie werden in wenigen Sekunden zur Novalnet AG weitergeleitet."
85
+ "Customer was redirected to Novalnet","Der Endkunde wird zu Novalnet umgeleitet. "
86
  "Payment Failed","Zahlung fehlgeschlagen"
87
+ "Payment was successful.","Die Zahlung war erfolgreich."
88
+ "Customer successfully returned from Novalnet","Der Kunde wurde erfolgreich von Novalnet zurückgeleitet."
89
+ "Payment was not successfull","Die Zahlung war nicht erfolgreich. Ein Fehler trat auf."
90
  "successful","erfolgreiche"
91
  "Please transfer the invoice amount with the following information to our payment provider Novalnet AG","Bitte überweisen Sie den Betrag mit der folgenden Information an unseren Zahlungsdienstleister Novalnet AG"
92
  "Due Date","Fälligkeitsdatum"
98
  "Required parameter not valid","Ungültiger Wert für Pflichtfeld"
99
  "Gateway request error: %s","Fehler beim übertragen der Daten: %s"
100
  "Error in capturing the payment","Fehler bei der Durchführung der Zahlung"
 
 
 
 
 
 
 
 
 
101
  "SEPA Due date is not valid","SEPA Fälligkeitsdatum Ungültiger"
102
  "Manual limit amount / Product-ID2 / Tariff-ID2 is not valid","Ungültige Bestellgrenze / 2. Produkt-ID / 2. Tarif-ID"
103
  "Customer name/email fields are not valid","Ungültige Werte für die Felder Kundenname-/email"
104
  "Please reply to the e-mail","Wir haben Ihnen eine Email geschickt, beantworten Sie diese bitte."
105
  "You will shortly receive a PIN by phone / SMS. Please enter the PIN in the appropriate text box","Sie erhalten in Kürze eine PIN per Telefon/SMS. Geben Sie bitte die PIN in das entsprechende Textfeld ein"
 
106
  "You have changed the order amount after getting PIN number, please try again with a new call","Sie haben die Bestellmenge nach dem Erhalt der PIN-Nummer geändert, versuchen Sie es bitte erneut mit einem neuen Anruf"
107
  "You have changed the order amount after getting e-mail, please try again with a new call","Sie haben die Bestellmenge nach dem Erhalt der Email geändert, versuchen Sie es bitte erneut mit einem neuen Anruf"
108
  "Please enter valid account details","Geben Sie bitte gültige Kontodaten ein"
146
  "Enable AMEX logo","AMEX-Logo aktivieren"
147
  "To display AMEX logo in front end","AMEX-Logo im Frontend anzeigen"
148
  "Order no","Bestellnr."
149
+ "Order No","Bestellnummer"
150
  "Transaction Status","Transaktions-Status"
151
  "Transaction","Transaktion"
152
  "Transaction no","Transaktionsnr."
172
  "Invoice Due Date description","Geben Sie bitte die Zahlungsfrist in Tagen ein - diese sollte größer als 6 sein. Wenn Sie diesen Wert leer lassen oder einen Wert < 7 eingeben, dann wird der Standardwert von 14 Tagen verwendet."
173
  "No active payment method for this store","Für diesen Shop ist keine Zahlungsart aktiviert."
174
  "Novalnet Method","Novalnet Methode"
175
+ "NN CC type","Kreditkartentyp"
176
+ "NN CC holder","Kreditkarteninhaber"
177
+ "NN CC number","Kreditkartennummer"
178
+ "NN Expiration Date","Gültigkeit (Monat/Jahr)"
179
+ "Month","Monat"
180
+ "Year","Jahr"
181
+ "NN CVC","CVC (Prüfziffer)"
182
+ "NN Country","Land der Bank"
183
+ "NN Confirm","Ich erteile hiermit das Mandat für die SEPA-Lastschriftzahlung (elektronische Übertragung) und bestätige, dass die angegebene IBAN und BIC korrekt sind."
184
+ "SEPA Direct Debit Mandate Confirmation","SEPA Lastschrift Mandatsbestätigung"
185
+ "Creditor","Zahlungsempfänger"
186
+ "Credit Identification Number","Gläubigiger-Identifikationsnummer"
187
+ "Mandate Reference","Mandatsreferenz"
188
+ "SEPA Confirm paragraph","Ich ermächtige den Zahlungsempfänger, Zahlungen von meinem Konto mittels Lastschrift einzuziehen. Zugleich weise ich mein Kreditinstitut an, die von dem Zahlungsempfänger auf mein Konto gezogenen Lastschriften einzulösen."
189
+ "SEPA Confirm note","Hinweis: Ich kann innerhalb von acht Wochen, beginnend mit dem Belastungsdatum, die Erstattung des belasteten Betrages verlangen. Es gelten dabei die mit meinem Kreditinstitut vereinbarten Bedingungen."
190
+ "Name of the payee","Name des Zahlungspflichtigen"
191
+ "Company","Firma"
192
+ "Address","Straße und Hausnummer"
193
+ "Zip Code And City","Postleitzahl und Ort"
194
+ "Country","Land"
195
+ "Email","E-Mail"
196
+ "conirm_mandate","Bestätigen"
197
+ "NN cancel","Stornieren"
198
+ "IBAN or Account Number","IBAN oder Kontonummer"
199
+ "BIC or Bank Code","BIC oder Bankleitzahl"
200
+ "NN_Reference1","1. Verwendungszweck"
201
+ "NN_Reference2","2. Verwendungszweck"
202
+ "NN_Reference3","3. Verwendungszweck"
203
+ "The hash functions are not available!","Die Hashfunktionen sind nicht verfügbar!"
204
+ "The methods for the handling of character sets are not available!","Die Methoden für die Verarbeitung von Zeichensätzen sind nicht verfügbar!"
app/locale/en_US/Novalnet_Payment.csv CHANGED
@@ -27,11 +27,10 @@
27
  "Novalnet Instant Bank Transfer","Novalnet Instant Bank Transfer"
28
  "Novalnet PayPal","Novalnet PayPal"
29
  "Novalnet iDEAL","Novalnet iDEAL"
30
- "Novalnet Phonepayment","Novalnet Telephone Payment"
31
  "Enable Novalnet Module","Enable module"
32
  "Novalnet Title","Novalnet Title"
33
  "Enable cc3d","Enable Credit Card 3D Secure"
34
- "Set order Status","Set order Status"
35
  "Order Status Before Payment","Order Status Before Payment"
36
  "Order Status After Successful Payment","Order Status After Successful Payment"
37
  "Set the status of orders made with this payment module to this value","Set the status of orders made with this payment module to this value"
@@ -74,27 +73,25 @@
74
  "Mobile phone number","Mobile phone number"
75
  "Ihre Telefon- / Mobil- Nummer","Phone Number"
76
  "Callback","Callback"
77
- "Hinweis: Nach einem Klick auf ""Fortsetzen"" erhalten Sie in Kürze eine PIN per Telefon-/Handyrückruf oder SMS.","Note: Shortly, after clicking on "Continue" you will receive a PIN via a landline or mobile network call, or via SMS."
78
- "Hinweis: Nach einem Klick auf ""Fortsetzen"" erhalten Sie in Kürze ein EMAIL, das Sie sofort ohne änderung des Mailtexts beantworten müssen.","Note: Shortly, after clicking on "Continue" you will recieve an EMAIL, that you need to reply right away, without making any changes."
79
  "PIN","PIN"
80
  "Forgot PIN? [New PIN Request]","Forgot PIN? [New PIN Request]"
81
  "E-mail Address","E-mail Address"
82
  "Please Note: This transaction will run on TEST MODE and the amount will not be charged","Please Note: This transaction will run on TEST MODE and the amount will not be charged."
83
- "Your amount will be added in your telephone bill when you place the order","Your amount will be added in your telephone bill when you place the order."
84
  "The amount will be booked immediately from your credit card.","The amount will be booked immediately from your credit card when you submit the order."
85
  "Your account will be debited upon delivery of goods.","Your account will be debited upon delivery of goods."
86
  "The Bank details will be emailed to you soon after the completion of checkout process","The Bank details will be emailed to you soon after the completion of checkout process."
87
- "You will be redirected to Novalnet AG website when you place an order.","You will be redirected to Novalnet AG website when you place an order."
88
  "You will be redirected to Novalnet AG in a few seconds.","You will be redirected to Novalnet AG in a few seconds."
89
- "Customer was redirected to Novalnet","Customer was redirected to Novalnet"
90
  "Payment Failed","Payment Failed"
91
  "Payment was successful.","Payment was successful."
92
  "Customer successfully returned from Novalnet","Customer successfully returned from Novalnet"
93
  "Payment was not successfull","Payment was not successfull. An error occured."
94
  "successful","successful"
95
- "Please transfer the invoice amount with the following information to our payment provider Novalnet AG","Please transfer the amount to the following information to our payment service Novalnet AG"
96
- "Due Date","Due Date"
97
- "NN Account Holder","Account Holder"
98
  "NN_Bank","Bank"
99
  "NN_Amount","Amount"
100
  "NN_Reference","Reference"
@@ -103,21 +100,11 @@
103
  "Required parameter not valid","Required parameter not valid"
104
  "Gateway request error: %s","Gateway request error: %s"
105
  "Error in capturing the payment","Error in capturing the payment"
106
- "Following steps are required to complete your payment","Following steps are required to complete your payment"
107
- "Step","Step"
108
- "including VAT","including VAT"
109
- "This call will cost","This call will cost"
110
- "Please call the telephone number displayed","Please call the telephone number displayed"
111
- "and it is possible only for German landline connection","and it is possible only for German landline connection"
112
- "Please wait for the beep and then hang up the listeners","Please wait for the beep and then hang up the listeners"
113
- "After your successful call, please proceed with the payment","After your successful call, please proceed with the payment"
114
- "Amounts below 0,99 Euros and above 10,00 Euros cannot be processed and are not accepted","Amounts below 0,99 Euros and above 10,00 Euros cannot be processed and are not accepted"
115
  "SEPA Due date is not valid","SEPA Due date is not valid"
116
  "Manual limit amount / Product-ID2 / Tariff-ID2 is not valid","Manual limit amount / Product-ID2 / Tariff-ID2 is not valid"
117
  "Customer name/email fields are not valid","Customer name/email fields are not valid"
118
- "Please reply to the e-mail","Please reply to the e-mail"
119
  "You will shortly receive a PIN by phone / SMS. Please enter the PIN in the appropriate text box","You will shortly receive a PIN by phone / SMS. Please enter the PIN in the appropriate text box"
120
- "You have changed the order amount after receiving telephone number","You have changed the order amount after receiving telephone number, please try again with a new call"
121
  "You have changed the order amount after getting PIN number, please try again with a new call","You have changed the order amount after getting PIN number, please try again with a new call"
122
  "You have changed the order amount after getting e-mail, please try again with a new call","You have changed the order amount after getting e-mail, please try again with a new call"
123
  "Please enter valid account details","Please enter valid account details"
@@ -130,4 +117,28 @@
130
  "cc3d description","(Please note that this procedure has a low acceptance among end customers.) As soon as 3D-Secure is activated for credit cards, the bank prompts the end customer for a password, to prevent credit card abuse. This can serve as a proof, that the customer is actually the owner of the credit card."
131
  "Enable cc3d","3D Secure(note : this has to be set up at Novalnet first. Please contact support@novalnet.de, in case you wish this.)"
132
  "Transaction deactivated successfully","Transaction deactivated successfully"
133
- "Invoice Due Date description","Enter the due date in days, it should be greater than 6. If you leave as empty or less than 7 means default value will be considered as 14 days."
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
27
  "Novalnet Instant Bank Transfer","Novalnet Instant Bank Transfer"
28
  "Novalnet PayPal","Novalnet PayPal"
29
  "Novalnet iDEAL","Novalnet iDEAL"
 
30
  "Enable Novalnet Module","Enable module"
31
  "Novalnet Title","Novalnet Title"
32
  "Enable cc3d","Enable Credit Card 3D Secure"
33
+ "Order Completion Status","Order Completion Status"
34
  "Order Status Before Payment","Order Status Before Payment"
35
  "Order Status After Successful Payment","Order Status After Successful Payment"
36
  "Set the status of orders made with this payment module to this value","Set the status of orders made with this payment module to this value"
73
  "Mobile phone number","Mobile phone number"
74
  "Ihre Telefon- / Mobil- Nummer","Phone Number"
75
  "Callback","Callback"
76
+ "Note for pin by sms and callback","After clicking the ""Continue"" button, you will shortly receive a PIN by phone / SMS. Please enter the PIN in the appropriate text box"
 
77
  "PIN","PIN"
78
  "Forgot PIN? [New PIN Request]","Forgot PIN? [New PIN Request]"
79
  "E-mail Address","E-mail Address"
80
  "Please Note: This transaction will run on TEST MODE and the amount will not be charged","Please Note: This transaction will run on TEST MODE and the amount will not be charged."
 
81
  "The amount will be booked immediately from your credit card.","The amount will be booked immediately from your credit card when you submit the order."
82
  "Your account will be debited upon delivery of goods.","Your account will be debited upon delivery of goods."
83
  "The Bank details will be emailed to you soon after the completion of checkout process","The Bank details will be emailed to you soon after the completion of checkout process."
84
+ "You will be redirected to Novalnet AG website when you place an order.","You will be redirected to Novalnet AG website when you place the order."
85
  "You will be redirected to Novalnet AG in a few seconds.","You will be redirected to Novalnet AG in a few seconds."
86
+ "Customer was redirected to Novalnet","Customer redirected to Novalnet."
87
  "Payment Failed","Payment Failed"
88
  "Payment was successful.","Payment was successful."
89
  "Customer successfully returned from Novalnet","Customer successfully returned from Novalnet"
90
  "Payment was not successfull","Payment was not successfull. An error occured."
91
  "successful","successful"
92
+ "Please transfer the invoice amount with the following information to our payment provider Novalnet AG","Please transfer the amount with the following details to our payment service provider Novalnet AG."
93
+ "Due Date","Due date"
94
+ "NN Account Holder","Account holder"
95
  "NN_Bank","Bank"
96
  "NN_Amount","Amount"
97
  "NN_Reference","Reference"
100
  "Required parameter not valid","Required parameter not valid"
101
  "Gateway request error: %s","Gateway request error: %s"
102
  "Error in capturing the payment","Error in capturing the payment"
 
 
 
 
 
 
 
 
 
103
  "SEPA Due date is not valid","SEPA Due date is not valid"
104
  "Manual limit amount / Product-ID2 / Tariff-ID2 is not valid","Manual limit amount / Product-ID2 / Tariff-ID2 is not valid"
105
  "Customer name/email fields are not valid","Customer name/email fields are not valid"
106
+ "Please reply to the e-mail","We have sent a email, please answer"
107
  "You will shortly receive a PIN by phone / SMS. Please enter the PIN in the appropriate text box","You will shortly receive a PIN by phone / SMS. Please enter the PIN in the appropriate text box"
 
108
  "You have changed the order amount after getting PIN number, please try again with a new call","You have changed the order amount after getting PIN number, please try again with a new call"
109
  "You have changed the order amount after getting e-mail, please try again with a new call","You have changed the order amount after getting e-mail, please try again with a new call"
110
  "Please enter valid account details","Please enter valid account details"
117
  "cc3d description","(Please note that this procedure has a low acceptance among end customers.) As soon as 3D-Secure is activated for credit cards, the bank prompts the end customer for a password, to prevent credit card abuse. This can serve as a proof, that the customer is actually the owner of the credit card."
118
  "Enable cc3d","3D Secure(note : this has to be set up at Novalnet first. Please contact support@novalnet.de, in case you wish this.)"
119
  "Transaction deactivated successfully","Transaction deactivated successfully"
120
+ "Invoice Due Date description","Enter the due date in days, it should be greater than 6. If you leave as empty or less than 7 means default value will be considered as 14 days."
121
+ "NN CC type","Credit Card type"
122
+ "NN CC holder","Credit Card Holder"
123
+ "NN CC number","Credit Card Number"
124
+ "NN Expiration Date","Expiration Date"
125
+ "NN CVC","CVC (Verification Code)"
126
+ "NN Country","Bank Country"
127
+ "NN Confirm","I hereby grant the mandate for the SEPA direct debit (electronic transmission) and confirm that the given IBAN and BIC are correct!"
128
+ "SEPA Direct Debit Mandate Confirmation","SEPA Direct Debit Mandate Confirmation"
129
+ "Creditor","Creditor"
130
+ "Credit Identification Number","Creditor identification number"
131
+ "Mandate Reference","Mandate reference"
132
+ "SEPA Confirm paragraph","I hereby authorize the payee to collect payments from my account by direct debit. At the same time I instruct my financial institution to redeem the conclusions drawn by the payee to my account debits."
133
+ "SEPA Confirm note","Note: I may request within eight weeks from the debit date, a refund of the amount charged from my account, as per my bank rules & regulations."
134
+ "Name of the payee","Name of the payee"
135
+ "Company","Company"
136
+ "Address","Address"
137
+ "Zip Code And City","Zipcode and city"
138
+ "Country","Country"
139
+ "Email","E-Mail"
140
+ "conirm_mandate","Confirm"
141
+ "NN cancel","Cancel"
142
+ "NN_Reference1","Reference 1"
143
+ "NN_Reference2","Reference 2"
144
+ "NN_Reference3","Reference 3"
callback_novalnet2magento.php CHANGED
@@ -7,7 +7,7 @@
7
  * This script is used for real time capturing of parameters passed
8
  * from Novalnet AG after Payment processing of customers.
9
  *
10
- * This script is only free to the use for Merchants of Novalnet AG
11
  *
12
  * If you have found this script useful a small recommendation as well
13
  * as a comment on merchant form would be greatly appreciated.
@@ -16,7 +16,7 @@
16
  *
17
  * ABSTRACT:
18
  * This script is called from Novalnet, as soon as a payment is finished for
19
- * payment methods, e.g. Prepayment, Invoice.
20
  *
21
  * This script is adapted for those cases where the money for Prepayment /
22
  * Invoice has been transferred to Novalnet.
@@ -31,11 +31,8 @@
31
  * @package Novalnet_Payment
32
  * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
33
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
34
- * @notice 1. This script must be placed in basic Magento folder
35
  * to avoid rewrite rules (mod_rewrite)
36
- * 2. You have to adapt the value of all the variables
37
- * commented with 'adapt ...'
38
- * 3. Set $test/$debug to false for live system
39
  */
40
  require_once 'app/Mage.php';
41
  $storeId = Mage_Core_Model_App::ADMIN_STORE_ID;
7
  * This script is used for real time capturing of parameters passed
8
  * from Novalnet AG after Payment processing of customers.
9
  *
10
+ * This script is only free to the use for Merchants of Novalnet
11
  *
12
  * If you have found this script useful a small recommendation as well
13
  * as a comment on merchant form would be greatly appreciated.
16
  *
17
  * ABSTRACT:
18
  * This script is called from Novalnet, as soon as a payment is finished for
19
+ * Novalnet payment methods.
20
  *
21
  * This script is adapted for those cases where the money for Prepayment /
22
  * Invoice has been transferred to Novalnet.
31
  * @package Novalnet_Payment
32
  * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
33
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
34
+ * @notice This script must be placed in basic Magento folder
35
  * to avoid rewrite rules (mod_rewrite)
 
 
 
36
  */
37
  require_once 'app/Mage.php';
38
  $storeId = Mage_Core_Model_App::ADMIN_STORE_ID;
js/novalnet/jquery-1.10.2.min.js ADDED
@@ -0,0 +1,2486 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ /*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
2
+ //@ sourceMappingURL=jquery-1.10.2.min.map
3
+ */
4
+ (function(e, t) {
5
+ var n, r, i = typeof t, o = e.location, a = e.document, s = a.documentElement, l = e.jQuery, u = e.$, c = {}, p = [], f = "1.10.2", d = p.concat, h = p.push, g = p.slice, m = p.indexOf, y = c.toString, v = c.hasOwnProperty, b = f.trim, x = function(e, t) {
6
+ return new x.fn.init(e, t, r)
7
+ }, w = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source, T = /\S+/g, C = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, N = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, k = /^<(\w+)\s*\/?>(?:<\/\1>|)$/, E = /^[\],:{}\s]*$/, S = /(?:^|:|,)(?:\s*\[)+/g, A = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g, j = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g, D = /^-ms-/, L = /-([\da-z])/gi, H = function(e, t) {
8
+ return t.toUpperCase()
9
+ }, q = function(e) {
10
+ (a.addEventListener || "load" === e.type || "complete" === a.readyState) && (_(), x.ready())
11
+ }, _ = function() {
12
+ a.addEventListener ? (a.removeEventListener("DOMContentLoaded", q, !1), e.removeEventListener("load", q, !1)) : (a.detachEvent("onreadystatechange", q), e.detachEvent("onload", q))
13
+ };
14
+ x.fn = x.prototype = {jquery: f, constructor: x, init: function(e, n, r) {
15
+ var i, o;
16
+ if (!e)
17
+ return this;
18
+ if ("string" == typeof e) {
19
+ if (i = "<" === e.charAt(0) && ">" === e.charAt(e.length - 1) && e.length >= 3 ? [null, e, null] : N.exec(e), !i || !i[1] && n)
20
+ return!n || n.jquery ? (n || r).find(e) : this.constructor(n).find(e);
21
+ if (i[1]) {
22
+ if (n = n instanceof x ? n[0] : n, x.merge(this, x.parseHTML(i[1], n && n.nodeType ? n.ownerDocument || n : a, !0)), k.test(i[1]) && x.isPlainObject(n))
23
+ for (i in n)
24
+ x.isFunction(this[i]) ? this[i](n[i]) : this.attr(i, n[i]);
25
+ return this
26
+ }
27
+ if (o = a.getElementById(i[2]), o && o.parentNode) {
28
+ if (o.id !== i[2])
29
+ return r.find(e);
30
+ this.length = 1, this[0] = o
31
+ }
32
+ return this.context = a, this.selector = e, this
33
+ }
34
+ return e.nodeType ? (this.context = this[0] = e, this.length = 1, this) : x.isFunction(e) ? r.ready(e) : (e.selector !== t && (this.selector = e.selector, this.context = e.context), x.makeArray(e, this))
35
+ }, selector: "", length: 0, toArray: function() {
36
+ return g.call(this)
37
+ }, get: function(e) {
38
+ return null == e ? this.toArray() : 0 > e ? this[this.length + e] : this[e]
39
+ }, pushStack: function(e) {
40
+ var t = x.merge(this.constructor(), e);
41
+ return t.prevObject = this, t.context = this.context, t
42
+ }, each: function(e, t) {
43
+ return x.each(this, e, t)
44
+ }, ready: function(e) {
45
+ return x.ready.promise().done(e), this
46
+ }, slice: function() {
47
+ return this.pushStack(g.apply(this, arguments))
48
+ }, first: function() {
49
+ return this.eq(0)
50
+ }, last: function() {
51
+ return this.eq(-1)
52
+ }, eq: function(e) {
53
+ var t = this.length, n = +e + (0 > e ? t : 0);
54
+ return this.pushStack(n >= 0 && t > n ? [this[n]] : [])
55
+ }, map: function(e) {
56
+ return this.pushStack(x.map(this, function(t, n) {
57
+ return e.call(t, n, t)
58
+ }))
59
+ }, end: function() {
60
+ return this.prevObject || this.constructor(null)
61
+ }, push: h, sort: [].sort, splice: [].splice}, x.fn.init.prototype = x.fn, x.extend = x.fn.extend = function() {
62
+ var e, n, r, i, o, a, s = arguments[0] || {}, l = 1, u = arguments.length, c = !1;
63
+ for ("boolean" == typeof s && (c = s, s = arguments[1] || {}, l = 2), "object" == typeof s || x.isFunction(s) || (s = {}), u === l && (s = this, --l); u > l; l++)
64
+ if (null != (o = arguments[l]))
65
+ for (i in o)
66
+ e = s[i], r = o[i], s !== r && (c && r && (x.isPlainObject(r) || (n = x.isArray(r))) ? (n ? (n = !1, a = e && x.isArray(e) ? e : []) : a = e && x.isPlainObject(e) ? e : {}, s[i] = x.extend(c, a, r)) : r !== t && (s[i] = r));
67
+ return s
68
+ }, x.extend({expando: "jQuery" + (f + Math.random()).replace(/\D/g, ""), noConflict: function(t) {
69
+ return e.$ === x && (e.$ = u), t && e.jQuery === x && (e.jQuery = l), x
70
+ }, isReady: !1, readyWait: 1, holdReady: function(e) {
71
+ e ? x.readyWait++ : x.ready(!0)
72
+ }, ready: function(e) {
73
+ if (e === !0 ? !--x.readyWait : !x.isReady) {
74
+ if (!a.body)
75
+ return setTimeout(x.ready);
76
+ x.isReady = !0, e !== !0 && --x.readyWait > 0 || (n.resolveWith(a, [x]), x.fn.trigger && x(a).trigger("ready").off("ready"))
77
+ }
78
+ }, isFunction: function(e) {
79
+ return"function" === x.type(e)
80
+ }, isArray: Array.isArray || function(e) {
81
+ return"array" === x.type(e)
82
+ }, isWindow: function(e) {
83
+ return null != e && e == e.window
84
+ }, isNumeric: function(e) {
85
+ return!isNaN(parseFloat(e)) && isFinite(e)
86
+ }, type: function(e) {
87
+ return null == e ? e + "" : "object" == typeof e || "function" == typeof e ? c[y.call(e)] || "object" : typeof e
88
+ }, isPlainObject: function(e) {
89
+ var n;
90
+ if (!e || "object" !== x.type(e) || e.nodeType || x.isWindow(e))
91
+ return!1;
92
+ try {
93
+ if (e.constructor && !v.call(e, "constructor") && !v.call(e.constructor.prototype, "isPrototypeOf"))
94
+ return!1
95
+ } catch (r) {
96
+ return!1
97
+ }
98
+ if (x.support.ownLast)
99
+ for (n in e)
100
+ return v.call(e, n);
101
+ for (n in e)
102
+ ;
103
+ return n === t || v.call(e, n)
104
+ }, isEmptyObject: function(e) {
105
+ var t;
106
+ for (t in e)
107
+ return!1;
108
+ return!0
109
+ }, error: function(e) {
110
+ throw Error(e)
111
+ }, parseHTML: function(e, t, n) {
112
+ if (!e || "string" != typeof e)
113
+ return null;
114
+ "boolean" == typeof t && (n = t, t = !1), t = t || a;
115
+ var r = k.exec(e), i = !n && [];
116
+ return r ? [t.createElement(r[1])] : (r = x.buildFragment([e], t, i), i && x(i).remove(), x.merge([], r.childNodes))
117
+ }, parseJSON: function(n) {
118
+ return e.JSON && e.JSON.parse ? e.JSON.parse(n) : null === n ? n : "string" == typeof n && (n = x.trim(n), n && E.test(n.replace(A, "@").replace(j, "]").replace(S, ""))) ? Function("return " + n)() : (x.error("Invalid JSON: " + n), t)
119
+ }, parseXML: function(n) {
120
+ var r, i;
121
+ if (!n || "string" != typeof n)
122
+ return null;
123
+ try {
124
+ e.DOMParser ? (i = new DOMParser, r = i.parseFromString(n, "text/xml")) : (r = new ActiveXObject("Microsoft.XMLDOM"), r.async = "false", r.loadXML(n))
125
+ } catch (o) {
126
+ r = t
127
+ }
128
+ return r && r.documentElement && !r.getElementsByTagName("parsererror").length || x.error("Invalid XML: " + n), r
129
+ }, noop: function() {
130
+ }, globalEval: function(t) {
131
+ t && x.trim(t) && (e.execScript || function(t) {
132
+ e.eval.call(e, t)
133
+ })(t)
134
+ }, camelCase: function(e) {
135
+ return e.replace(D, "ms-").replace(L, H)
136
+ }, nodeName: function(e, t) {
137
+ return e.nodeName && e.nodeName.toLowerCase() === t.toLowerCase()
138
+ }, each: function(e, t, n) {
139
+ var r, i = 0, o = e.length, a = M(e);
140
+ if (n) {
141
+ if (a) {
142
+ for (; o > i; i++)
143
+ if (r = t.apply(e[i], n), r === !1)
144
+ break
145
+ } else
146
+ for (i in e)
147
+ if (r = t.apply(e[i], n), r === !1)
148
+ break
149
+ } else if (a) {
150
+ for (; o > i; i++)
151
+ if (r = t.call(e[i], i, e[i]), r === !1)
152
+ break
153
+ } else
154
+ for (i in e)
155
+ if (r = t.call(e[i], i, e[i]), r === !1)
156
+ break;
157
+ return e
158
+ }, trim: b && !b.call("\ufeff\u00a0") ? function(e) {
159
+ return null == e ? "" : b.call(e)
160
+ } : function(e) {
161
+ return null == e ? "" : (e + "").replace(C, "")
162
+ }, makeArray: function(e, t) {
163
+ var n = t || [];
164
+ return null != e && (M(Object(e)) ? x.merge(n, "string" == typeof e ? [e] : e) : h.call(n, e)), n
165
+ }, inArray: function(e, t, n) {
166
+ var r;
167
+ if (t) {
168
+ if (m)
169
+ return m.call(t, e, n);
170
+ for (r = t.length, n = n?0 > n?Math.max(0, r + n):n:0; r > n; n++)
171
+ if (n in t && t[n] === e)
172
+ return n
173
+ }
174
+ return-1
175
+ }, merge: function(e, n) {
176
+ var r = n.length, i = e.length, o = 0;
177
+ if ("number" == typeof r)
178
+ for (; r > o; o++)
179
+ e[i++] = n[o];
180
+ else
181
+ while (n[o] !== t)
182
+ e[i++] = n[o++];
183
+ return e.length = i, e
184
+ }, grep: function(e, t, n) {
185
+ var r, i = [], o = 0, a = e.length;
186
+ for (n = !!n; a > o; o++)
187
+ r = !!t(e[o], o), n !== r && i.push(e[o]);
188
+ return i
189
+ }, map: function(e, t, n) {
190
+ var r, i = 0, o = e.length, a = M(e), s = [];
191
+ if (a)
192
+ for (; o > i; i++)
193
+ r = t(e[i], i, n), null != r && (s[s.length] = r);
194
+ else
195
+ for (i in e)
196
+ r = t(e[i], i, n), null != r && (s[s.length] = r);
197
+ return d.apply([], s)
198
+ }, guid: 1, proxy: function(e, n) {
199
+ var r, i, o;
200
+ return"string" == typeof n && (o = e[n], n = e, e = o), x.isFunction(e) ? (r = g.call(arguments, 2), i = function() {
201
+ return e.apply(n || this, r.concat(g.call(arguments)))
202
+ }, i.guid = e.guid = e.guid || x.guid++, i) : t
203
+ }, access: function(e, n, r, i, o, a, s) {
204
+ var l = 0, u = e.length, c = null == r;
205
+ if ("object" === x.type(r)) {
206
+ o = !0;
207
+ for (l in r)
208
+ x.access(e, n, l, r[l], !0, a, s)
209
+ } else if (i !== t && (o = !0, x.isFunction(i) || (s = !0), c && (s ? (n.call(e, i), n = null) : (c = n, n = function(e, t, n) {
210
+ return c.call(x(e), n)
211
+ })), n))
212
+ for (; u > l; l++)
213
+ n(e[l], r, s ? i : i.call(e[l], l, n(e[l], r)));
214
+ return o ? e : c ? n.call(e) : u ? n(e[0], r) : a
215
+ }, now: function() {
216
+ return(new Date).getTime()
217
+ }, swap: function(e, t, n, r) {
218
+ var i, o, a = {};
219
+ for (o in t)
220
+ a[o] = e.style[o], e.style[o] = t[o];
221
+ i = n.apply(e, r || []);
222
+ for (o in t)
223
+ e.style[o] = a[o];
224
+ return i
225
+ }}), x.ready.promise = function(t) {
226
+ if (!n)
227
+ if (n = x.Deferred(), "complete" === a.readyState)
228
+ setTimeout(x.ready);
229
+ else if (a.addEventListener)
230
+ a.addEventListener("DOMContentLoaded", q, !1), e.addEventListener("load", q, !1);
231
+ else {
232
+ a.attachEvent("onreadystatechange", q), e.attachEvent("onload", q);
233
+ var r = !1;
234
+ try {
235
+ r = null == e.frameElement && a.documentElement
236
+ } catch (i) {
237
+ }
238
+ r && r.doScroll && function o() {
239
+ if (!x.isReady) {
240
+ try {
241
+ r.doScroll("left")
242
+ } catch (e) {
243
+ return setTimeout(o, 50)
244
+ }
245
+ _(), x.ready()
246
+ }
247
+ }()
248
+ }
249
+ return n.promise(t)
250
+ }, x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(e, t) {
251
+ c["[object " + t + "]"] = t.toLowerCase()
252
+ });
253
+ function M(e) {
254
+ var t = e.length, n = x.type(e);
255
+ return x.isWindow(e) ? !1 : 1 === e.nodeType && t ? !0 : "array" === n || "function" !== n && (0 === t || "number" == typeof t && t > 0 && t - 1 in e)
256
+ }
257
+ r = x(a), function(e, t) {
258
+ var n, r, i, o, a, s, l, u, c, p, f, d, h, g, m, y, v, b = "sizzle" + -new Date, w = e.document, T = 0, C = 0, N = st(), k = st(), E = st(), S = !1, A = function(e, t) {
259
+ return e === t ? (S = !0, 0) : 0
260
+ }, j = typeof t, D = 1 << 31, L = {}.hasOwnProperty, H = [], q = H.pop, _ = H.push, M = H.push, O = H.slice, F = H.indexOf || function(e) {
261
+ var t = 0, n = this.length;
262
+ for (; n > t; t++)
263
+ if (this[t] === e)
264
+ return t;
265
+ return-1
266
+ }, B = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped", P = "[\\x20\\t\\r\\n\\f]", R = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", W = R.replace("w", "w#"), $ = "\\[" + P + "*(" + R + ")" + P + "*(?:([*^$|!~]?=)" + P + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + W + ")|)|)" + P + "*\\]", I = ":(" + R + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + $.replace(3, 8) + ")*)|.*)\\)|)", z = RegExp("^" + P + "+|((?:^|[^\\\\])(?:\\\\.)*)" + P + "+$", "g"), X = RegExp("^" + P + "*," + P + "*"), U = RegExp("^" + P + "*([>+~]|" + P + ")" + P + "*"), V = RegExp(P + "*[+~]"), Y = RegExp("=" + P + "*([^\\]'\"]*)" + P + "*\\]", "g"), J = RegExp(I), G = RegExp("^" + W + "$"), Q = {ID: RegExp("^#(" + R + ")"), CLASS: RegExp("^\\.(" + R + ")"), TAG: RegExp("^(" + R.replace("w", "w*") + ")"), ATTR: RegExp("^" + $), PSEUDO: RegExp("^" + I), CHILD: RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + P + "*(even|odd|(([+-]|)(\\d*)n|)" + P + "*(?:([+-]|)" + P + "*(\\d+)|))" + P + "*\\)|)", "i"), bool: RegExp("^(?:" + B + ")$", "i"), needsContext: RegExp("^" + P + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + P + "*((?:-\\d)?\\d*)" + P + "*\\)|)(?=[^-]|$)", "i")}, K = /^[^{]+\{\s*\[native \w/, Z = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, et = /^(?:input|select|textarea|button)$/i, tt = /^h\d$/i, nt = /'|\\/g, rt = RegExp("\\\\([\\da-f]{1,6}" + P + "?|(" + P + ")|.)", "ig"), it = function(e, t, n) {
267
+ var r = "0x" + t - 65536;
268
+ return r !== r || n ? t : 0 > r ? String.fromCharCode(r + 65536) : String.fromCharCode(55296 | r >> 10, 56320 | 1023 & r)
269
+ };
270
+ try {
271
+ M.apply(H = O.call(w.childNodes), w.childNodes), H[w.childNodes.length].nodeType
272
+ } catch (ot) {
273
+ M = {apply: H.length ? function(e, t) {
274
+ _.apply(e, O.call(t))
275
+ } : function(e, t) {
276
+ var n = e.length, r = 0;
277
+ while (e[n++] = t[r++])
278
+ ;
279
+ e.length = n - 1
280
+ }}
281
+ }
282
+ function at(e, t, n, i) {
283
+ var o, a, s, l, u, c, d, m, y, x;
284
+ if ((t ? t.ownerDocument || t : w) !== f && p(t), t = t || f, n = n || [], !e || "string" != typeof e)
285
+ return n;
286
+ if (1 !== (l = t.nodeType) && 9 !== l)
287
+ return[];
288
+ if (h && !i) {
289
+ if (o = Z.exec(e))
290
+ if (s = o[1]) {
291
+ if (9 === l) {
292
+ if (a = t.getElementById(s), !a || !a.parentNode)
293
+ return n;
294
+ if (a.id === s)
295
+ return n.push(a), n
296
+ } else if (t.ownerDocument && (a = t.ownerDocument.getElementById(s)) && v(t, a) && a.id === s)
297
+ return n.push(a), n
298
+ } else {
299
+ if (o[2])
300
+ return M.apply(n, t.getElementsByTagName(e)), n;
301
+ if ((s = o[3]) && r.getElementsByClassName && t.getElementsByClassName)
302
+ return M.apply(n, t.getElementsByClassName(s)), n
303
+ }
304
+ if (r.qsa && (!g || !g.test(e))) {
305
+ if (m = d = b, y = t, x = 9 === l && e, 1 === l && "object" !== t.nodeName.toLowerCase()) {
306
+ c = mt(e), (d = t.getAttribute("id")) ? m = d.replace(nt, "\\$&") : t.setAttribute("id", m), m = "[id='" + m + "'] ", u = c.length;
307
+ while (u--)
308
+ c[u] = m + yt(c[u]);
309
+ y = V.test(e) && t.parentNode || t, x = c.join(",")
310
+ }
311
+ if (x)
312
+ try {
313
+ return M.apply(n, y.querySelectorAll(x)), n
314
+ } catch (T) {
315
+ } finally {
316
+ d || t.removeAttribute("id")
317
+ }
318
+ }
319
+ }
320
+ return kt(e.replace(z, "$1"), t, n, i)
321
+ }
322
+ function st() {
323
+ var e = [];
324
+ function t(n, r) {
325
+ return e.push(n += " ") > o.cacheLength && delete t[e.shift()], t[n] = r
326
+ }
327
+ return t
328
+ }
329
+ function lt(e) {
330
+ return e[b] = !0, e
331
+ }
332
+ function ut(e) {
333
+ var t = f.createElement("div");
334
+ try {
335
+ return!!e(t)
336
+ } catch (n) {
337
+ return!1
338
+ } finally {
339
+ t.parentNode && t.parentNode.removeChild(t), t = null
340
+ }
341
+ }
342
+ function ct(e, t) {
343
+ var n = e.split("|"), r = e.length;
344
+ while (r--)
345
+ o.attrHandle[n[r]] = t
346
+ }
347
+ function pt(e, t) {
348
+ var n = t && e, r = n && 1 === e.nodeType && 1 === t.nodeType && (~t.sourceIndex || D) - (~e.sourceIndex || D);
349
+ if (r)
350
+ return r;
351
+ if (n)
352
+ while (n = n.nextSibling)
353
+ if (n === t)
354
+ return-1;
355
+ return e ? 1 : -1
356
+ }
357
+ function ft(e) {
358
+ return function(t) {
359
+ var n = t.nodeName.toLowerCase();
360
+ return"input" === n && t.type === e
361
+ }
362
+ }
363
+ function dt(e) {
364
+ return function(t) {
365
+ var n = t.nodeName.toLowerCase();
366
+ return("input" === n || "button" === n) && t.type === e
367
+ }
368
+ }
369
+ function ht(e) {
370
+ return lt(function(t) {
371
+ return t = +t, lt(function(n, r) {
372
+ var i, o = e([], n.length, t), a = o.length;
373
+ while (a--)
374
+ n[i = o[a]] && (n[i] = !(r[i] = n[i]))
375
+ })
376
+ })
377
+ }
378
+ s = at.isXML = function(e) {
379
+ var t = e && (e.ownerDocument || e).documentElement;
380
+ return t ? "HTML" !== t.nodeName : !1
381
+ }, r = at.support = {}, p = at.setDocument = function(e) {
382
+ var n = e ? e.ownerDocument || e : w, i = n.defaultView;
383
+ return n !== f && 9 === n.nodeType && n.documentElement ? (f = n, d = n.documentElement, h = !s(n), i && i.attachEvent && i !== i.top && i.attachEvent("onbeforeunload", function() {
384
+ p()
385
+ }), r.attributes = ut(function(e) {
386
+ return e.className = "i", !e.getAttribute("className")
387
+ }), r.getElementsByTagName = ut(function(e) {
388
+ return e.appendChild(n.createComment("")), !e.getElementsByTagName("*").length
389
+ }), r.getElementsByClassName = ut(function(e) {
390
+ return e.innerHTML = "<div class='a'></div><div class='a i'></div>", e.firstChild.className = "i", 2 === e.getElementsByClassName("i").length
391
+ }), r.getById = ut(function(e) {
392
+ return d.appendChild(e).id = b, !n.getElementsByName || !n.getElementsByName(b).length
393
+ }), r.getById ? (o.find.ID = function(e, t) {
394
+ if (typeof t.getElementById !== j && h) {
395
+ var n = t.getElementById(e);
396
+ return n && n.parentNode ? [n] : []
397
+ }
398
+ }, o.filter.ID = function(e) {
399
+ var t = e.replace(rt, it);
400
+ return function(e) {
401
+ return e.getAttribute("id") === t
402
+ }
403
+ }) : (delete o.find.ID, o.filter.ID = function(e) {
404
+ var t = e.replace(rt, it);
405
+ return function(e) {
406
+ var n = typeof e.getAttributeNode !== j && e.getAttributeNode("id");
407
+ return n && n.value === t
408
+ }
409
+ }), o.find.TAG = r.getElementsByTagName ? function(e, n) {
410
+ return typeof n.getElementsByTagName !== j ? n.getElementsByTagName(e) : t
411
+ } : function(e, t) {
412
+ var n, r = [], i = 0, o = t.getElementsByTagName(e);
413
+ if ("*" === e) {
414
+ while (n = o[i++])
415
+ 1 === n.nodeType && r.push(n);
416
+ return r
417
+ }
418
+ return o
419
+ }, o.find.CLASS = r.getElementsByClassName && function(e, n) {
420
+ return typeof n.getElementsByClassName !== j && h ? n.getElementsByClassName(e) : t
421
+ }, m = [], g = [], (r.qsa = K.test(n.querySelectorAll)) && (ut(function(e) {
422
+ e.innerHTML = "<select><option selected=''></option></select>", e.querySelectorAll("[selected]").length || g.push("\\[" + P + "*(?:value|" + B + ")"), e.querySelectorAll(":checked").length || g.push(":checked")
423
+ }), ut(function(e) {
424
+ var t = n.createElement("input");
425
+ t.setAttribute("type", "hidden"), e.appendChild(t).setAttribute("t", ""), e.querySelectorAll("[t^='']").length && g.push("[*^$]=" + P + "*(?:''|\"\")"), e.querySelectorAll(":enabled").length || g.push(":enabled", ":disabled"), e.querySelectorAll("*,:x"), g.push(",.*:")
426
+ })), (r.matchesSelector = K.test(y = d.webkitMatchesSelector || d.mozMatchesSelector || d.oMatchesSelector || d.msMatchesSelector)) && ut(function(e) {
427
+ r.disconnectedMatch = y.call(e, "div"), y.call(e, "[s!='']:x"), m.push("!=", I)
428
+ }), g = g.length && RegExp(g.join("|")), m = m.length && RegExp(m.join("|")), v = K.test(d.contains) || d.compareDocumentPosition ? function(e, t) {
429
+ var n = 9 === e.nodeType ? e.documentElement : e, r = t && t.parentNode;
430
+ return e === r || !(!r || 1 !== r.nodeType || !(n.contains ? n.contains(r) : e.compareDocumentPosition && 16 & e.compareDocumentPosition(r)))
431
+ } : function(e, t) {
432
+ if (t)
433
+ while (t = t.parentNode)
434
+ if (t === e)
435
+ return!0;
436
+ return!1
437
+ }, A = d.compareDocumentPosition ? function(e, t) {
438
+ if (e === t)
439
+ return S = !0, 0;
440
+ var i = t.compareDocumentPosition && e.compareDocumentPosition && e.compareDocumentPosition(t);
441
+ return i ? 1 & i || !r.sortDetached && t.compareDocumentPosition(e) === i ? e === n || v(w, e) ? -1 : t === n || v(w, t) ? 1 : c ? F.call(c, e) - F.call(c, t) : 0 : 4 & i ? -1 : 1 : e.compareDocumentPosition ? -1 : 1
442
+ } : function(e, t) {
443
+ var r, i = 0, o = e.parentNode, a = t.parentNode, s = [e], l = [t];
444
+ if (e === t)
445
+ return S = !0, 0;
446
+ if (!o || !a)
447
+ return e === n ? -1 : t === n ? 1 : o ? -1 : a ? 1 : c ? F.call(c, e) - F.call(c, t) : 0;
448
+ if (o === a)
449
+ return pt(e, t);
450
+ r = e;
451
+ while (r = r.parentNode)
452
+ s.unshift(r);
453
+ r = t;
454
+ while (r = r.parentNode)
455
+ l.unshift(r);
456
+ while (s[i] === l[i])
457
+ i++;
458
+ return i ? pt(s[i], l[i]) : s[i] === w ? -1 : l[i] === w ? 1 : 0
459
+ }, n) : f
460
+ }, at.matches = function(e, t) {
461
+ return at(e, null, null, t)
462
+ }, at.matchesSelector = function(e, t) {
463
+ if ((e.ownerDocument || e) !== f && p(e), t = t.replace(Y, "='$1']"), !(!r.matchesSelector || !h || m && m.test(t) || g && g.test(t)))
464
+ try {
465
+ var n = y.call(e, t);
466
+ if (n || r.disconnectedMatch || e.document && 11 !== e.document.nodeType)
467
+ return n
468
+ } catch (i) {
469
+ }
470
+ return at(t, f, null, [e]).length > 0
471
+ }, at.contains = function(e, t) {
472
+ return(e.ownerDocument || e) !== f && p(e), v(e, t)
473
+ }, at.attr = function(e, n) {
474
+ (e.ownerDocument || e) !== f && p(e);
475
+ var i = o.attrHandle[n.toLowerCase()], a = i && L.call(o.attrHandle, n.toLowerCase()) ? i(e, n, !h) : t;
476
+ return a === t ? r.attributes || !h ? e.getAttribute(n) : (a = e.getAttributeNode(n)) && a.specified ? a.value : null : a
477
+ }, at.error = function(e) {
478
+ throw Error("Syntax error, unrecognized expression: " + e)
479
+ }, at.uniqueSort = function(e) {
480
+ var t, n = [], i = 0, o = 0;
481
+ if (S = !r.detectDuplicates, c = !r.sortStable && e.slice(0), e.sort(A), S) {
482
+ while (t = e[o++])
483
+ t === e[o] && (i = n.push(o));
484
+ while (i--)
485
+ e.splice(n[i], 1)
486
+ }
487
+ return e
488
+ }, a = at.getText = function(e) {
489
+ var t, n = "", r = 0, i = e.nodeType;
490
+ if (i) {
491
+ if (1 === i || 9 === i || 11 === i) {
492
+ if ("string" == typeof e.textContent)
493
+ return e.textContent;
494
+ for (e = e.firstChild; e; e = e.nextSibling)
495
+ n += a(e)
496
+ } else if (3 === i || 4 === i)
497
+ return e.nodeValue
498
+ } else
499
+ for (; t = e[r]; r++)
500
+ n += a(t);
501
+ return n
502
+ }, o = at.selectors = {cacheLength: 50, createPseudo: lt, match: Q, attrHandle: {}, find: {}, relative: {">": {dir: "parentNode", first: !0}, " ": {dir: "parentNode"}, "+": {dir: "previousSibling", first: !0}, "~": {dir: "previousSibling"}}, preFilter: {ATTR: function(e) {
503
+ return e[1] = e[1].replace(rt, it), e[3] = (e[4] || e[5] || "").replace(rt, it), "~=" === e[2] && (e[3] = " " + e[3] + " "), e.slice(0, 4)
504
+ }, CHILD: function(e) {
505
+ return e[1] = e[1].toLowerCase(), "nth" === e[1].slice(0, 3) ? (e[3] || at.error(e[0]), e[4] = +(e[4] ? e[5] + (e[6] || 1) : 2 * ("even" === e[3] || "odd" === e[3])), e[5] = +(e[7] + e[8] || "odd" === e[3])) : e[3] && at.error(e[0]), e
506
+ }, PSEUDO: function(e) {
507
+ var n, r = !e[5] && e[2];
508
+ return Q.CHILD.test(e[0]) ? null : (e[3] && e[4] !== t ? e[2] = e[4] : r && J.test(r) && (n = mt(r, !0)) && (n = r.indexOf(")", r.length - n) - r.length) && (e[0] = e[0].slice(0, n), e[2] = r.slice(0, n)), e.slice(0, 3))
509
+ }}, filter: {TAG: function(e) {
510
+ var t = e.replace(rt, it).toLowerCase();
511
+ return"*" === e ? function() {
512
+ return!0
513
+ } : function(e) {
514
+ return e.nodeName && e.nodeName.toLowerCase() === t
515
+ }
516
+ }, CLASS: function(e) {
517
+ var t = N[e + " "];
518
+ return t || (t = RegExp("(^|" + P + ")" + e + "(" + P + "|$)")) && N(e, function(e) {
519
+ return t.test("string" == typeof e.className && e.className || typeof e.getAttribute !== j && e.getAttribute("class") || "")
520
+ })
521
+ }, ATTR: function(e, t, n) {
522
+ return function(r) {
523
+ var i = at.attr(r, e);
524
+ return null == i ? "!=" === t : t ? (i += "", "=" === t ? i === n : "!=" === t ? i !== n : "^=" === t ? n && 0 === i.indexOf(n) : "*=" === t ? n && i.indexOf(n) > -1 : "$=" === t ? n && i.slice(-n.length) === n : "~=" === t ? (" " + i + " ").indexOf(n) > -1 : "|=" === t ? i === n || i.slice(0, n.length + 1) === n + "-" : !1) : !0
525
+ }
526
+ }, CHILD: function(e, t, n, r, i) {
527
+ var o = "nth" !== e.slice(0, 3), a = "last" !== e.slice(-4), s = "of-type" === t;
528
+ return 1 === r && 0 === i ? function(e) {
529
+ return!!e.parentNode
530
+ } : function(t, n, l) {
531
+ var u, c, p, f, d, h, g = o !== a ? "nextSibling" : "previousSibling", m = t.parentNode, y = s && t.nodeName.toLowerCase(), v = !l && !s;
532
+ if (m) {
533
+ if (o) {
534
+ while (g) {
535
+ p = t;
536
+ while (p = p[g])
537
+ if (s ? p.nodeName.toLowerCase() === y : 1 === p.nodeType)
538
+ return!1;
539
+ h = g = "only" === e && !h && "nextSibling"
540
+ }
541
+ return!0
542
+ }
543
+ if (h = [a ? m.firstChild : m.lastChild], a && v) {
544
+ c = m[b] || (m[b] = {}), u = c[e] || [], d = u[0] === T && u[1], f = u[0] === T && u[2], p = d && m.childNodes[d];
545
+ while (p = ++d && p && p[g] || (f = d = 0) || h.pop())
546
+ if (1 === p.nodeType && ++f && p === t) {
547
+ c[e] = [T, d, f];
548
+ break
549
+ }
550
+ } else if (v && (u = (t[b] || (t[b] = {}))[e]) && u[0] === T)
551
+ f = u[1];
552
+ else
553
+ while (p = ++d && p && p[g] || (f = d = 0) || h.pop())
554
+ if ((s ? p.nodeName.toLowerCase() === y : 1 === p.nodeType) && ++f && (v && ((p[b] || (p[b] = {}))[e] = [T, f]), p === t))
555
+ break;
556
+ return f -= i, f === r || 0 === f % r && f / r >= 0
557
+ }
558
+ }
559
+ }, PSEUDO: function(e, t) {
560
+ var n, r = o.pseudos[e] || o.setFilters[e.toLowerCase()] || at.error("unsupported pseudo: " + e);
561
+ return r[b] ? r(t) : r.length > 1 ? (n = [e, e, "", t], o.setFilters.hasOwnProperty(e.toLowerCase()) ? lt(function(e, n) {
562
+ var i, o = r(e, t), a = o.length;
563
+ while (a--)
564
+ i = F.call(e, o[a]), e[i] = !(n[i] = o[a])
565
+ }) : function(e) {
566
+ return r(e, 0, n)
567
+ }) : r
568
+ }}, pseudos: {not: lt(function(e) {
569
+ var t = [], n = [], r = l(e.replace(z, "$1"));
570
+ return r[b] ? lt(function(e, t, n, i) {
571
+ var o, a = r(e, null, i, []), s = e.length;
572
+ while (s--)
573
+ (o = a[s]) && (e[s] = !(t[s] = o))
574
+ }) : function(e, i, o) {
575
+ return t[0] = e, r(t, null, o, n), !n.pop()
576
+ }
577
+ }), has: lt(function(e) {
578
+ return function(t) {
579
+ return at(e, t).length > 0
580
+ }
581
+ }), contains: lt(function(e) {
582
+ return function(t) {
583
+ return(t.textContent || t.innerText || a(t)).indexOf(e) > -1
584
+ }
585
+ }), lang: lt(function(e) {
586
+ return G.test(e || "") || at.error("unsupported lang: " + e), e = e.replace(rt, it).toLowerCase(), function(t) {
587
+ var n;
588
+ do
589
+ if (n = h ? t.lang : t.getAttribute("xml:lang") || t.getAttribute("lang"))
590
+ return n = n.toLowerCase(), n === e || 0 === n.indexOf(e + "-");
591
+ while ((t = t.parentNode) && 1 === t.nodeType);
592
+ return!1
593
+ }
594
+ }), target: function(t) {
595
+ var n = e.location && e.location.hash;
596
+ return n && n.slice(1) === t.id
597
+ }, root: function(e) {
598
+ return e === d
599
+ }, focus: function(e) {
600
+ return e === f.activeElement && (!f.hasFocus || f.hasFocus()) && !!(e.type || e.href || ~e.tabIndex)
601
+ }, enabled: function(e) {
602
+ return e.disabled === !1
603
+ }, disabled: function(e) {
604
+ return e.disabled === !0
605
+ }, checked: function(e) {
606
+ var t = e.nodeName.toLowerCase();
607
+ return"input" === t && !!e.checked || "option" === t && !!e.selected
608
+ }, selected: function(e) {
609
+ return e.parentNode && e.parentNode.selectedIndex, e.selected === !0
610
+ }, empty: function(e) {
611
+ for (e = e.firstChild; e; e = e.nextSibling)
612
+ if (e.nodeName > "@" || 3 === e.nodeType || 4 === e.nodeType)
613
+ return!1;
614
+ return!0
615
+ }, parent: function(e) {
616
+ return!o.pseudos.empty(e)
617
+ }, header: function(e) {
618
+ return tt.test(e.nodeName)
619
+ }, input: function(e) {
620
+ return et.test(e.nodeName)
621
+ }, button: function(e) {
622
+ var t = e.nodeName.toLowerCase();
623
+ return"input" === t && "button" === e.type || "button" === t
624
+ }, text: function(e) {
625
+ var t;
626
+ return"input" === e.nodeName.toLowerCase() && "text" === e.type && (null == (t = e.getAttribute("type")) || t.toLowerCase() === e.type)
627
+ }, first: ht(function() {
628
+ return[0]
629
+ }), last: ht(function(e, t) {
630
+ return[t - 1]
631
+ }), eq: ht(function(e, t, n) {
632
+ return[0 > n ? n + t : n]
633
+ }), even: ht(function(e, t) {
634
+ var n = 0;
635
+ for (; t > n; n += 2)
636
+ e.push(n);
637
+ return e
638
+ }), odd: ht(function(e, t) {
639
+ var n = 1;
640
+ for (; t > n; n += 2)
641
+ e.push(n);
642
+ return e
643
+ }), lt: ht(function(e, t, n) {
644
+ var r = 0 > n ? n + t : n;
645
+ for (; --r >= 0; )
646
+ e.push(r);
647
+ return e
648
+ }), gt: ht(function(e, t, n) {
649
+ var r = 0 > n ? n + t : n;
650
+ for (; t > ++r; )
651
+ e.push(r);
652
+ return e
653
+ })}}, o.pseudos.nth = o.pseudos.eq;
654
+ for (n in{radio:!0, checkbox:!0, file:!0, password:!0, image:!0})
655
+ o.pseudos[n] = ft(n);
656
+ for (n in{submit:!0, reset:!0})
657
+ o.pseudos[n] = dt(n);
658
+ function gt() {
659
+ }
660
+ gt.prototype = o.filters = o.pseudos, o.setFilters = new gt;
661
+ function mt(e, t) {
662
+ var n, r, i, a, s, l, u, c = k[e + " "];
663
+ if (c)
664
+ return t ? 0 : c.slice(0);
665
+ s = e, l = [], u = o.preFilter;
666
+ while (s) {
667
+ (!n || (r = X.exec(s))) && (r && (s = s.slice(r[0].length) || s), l.push(i = [])), n = !1, (r = U.exec(s)) && (n = r.shift(), i.push({value: n, type: r[0].replace(z, " ")}), s = s.slice(n.length));
668
+ for (a in o.filter)
669
+ !(r = Q[a].exec(s)) || u[a] && !(r = u[a](r)) || (n = r.shift(), i.push({value: n, type: a, matches: r}), s = s.slice(n.length));
670
+ if (!n)
671
+ break
672
+ }
673
+ return t ? s.length : s ? at.error(e) : k(e, l).slice(0)
674
+ }
675
+ function yt(e) {
676
+ var t = 0, n = e.length, r = "";
677
+ for (; n > t; t++)
678
+ r += e[t].value;
679
+ return r
680
+ }
681
+ function vt(e, t, n) {
682
+ var r = t.dir, o = n && "parentNode" === r, a = C++;
683
+ return t.first ? function(t, n, i) {
684
+ while (t = t[r])
685
+ if (1 === t.nodeType || o)
686
+ return e(t, n, i)
687
+ } : function(t, n, s) {
688
+ var l, u, c, p = T + " " + a;
689
+ if (s) {
690
+ while (t = t[r])
691
+ if ((1 === t.nodeType || o) && e(t, n, s))
692
+ return!0
693
+ } else
694
+ while (t = t[r])
695
+ if (1 === t.nodeType || o)
696
+ if (c = t[b] || (t[b] = {}), (u = c[r]) && u[0] === p) {
697
+ if ((l = u[1]) === !0 || l === i)
698
+ return l === !0
699
+ } else if (u = c[r] = [p], u[1] = e(t, n, s) || i, u[1] === !0)
700
+ return!0
701
+ }
702
+ }
703
+ function bt(e) {
704
+ return e.length > 1 ? function(t, n, r) {
705
+ var i = e.length;
706
+ while (i--)
707
+ if (!e[i](t, n, r))
708
+ return!1;
709
+ return!0
710
+ } : e[0]
711
+ }
712
+ function xt(e, t, n, r, i) {
713
+ var o, a = [], s = 0, l = e.length, u = null != t;
714
+ for (; l > s; s++)
715
+ (o = e[s]) && (!n || n(o, r, i)) && (a.push(o), u && t.push(s));
716
+ return a
717
+ }
718
+ function wt(e, t, n, r, i, o) {
719
+ return r && !r[b] && (r = wt(r)), i && !i[b] && (i = wt(i, o)), lt(function(o, a, s, l) {
720
+ var u, c, p, f = [], d = [], h = a.length, g = o || Nt(t || "*", s.nodeType ? [s] : s, []), m = !e || !o && t ? g : xt(g, f, e, s, l), y = n ? i || (o ? e : h || r) ? [] : a : m;
721
+ if (n && n(m, y, s, l), r) {
722
+ u = xt(y, d), r(u, [], s, l), c = u.length;
723
+ while (c--)
724
+ (p = u[c]) && (y[d[c]] = !(m[d[c]] = p))
725
+ }
726
+ if (o) {
727
+ if (i || e) {
728
+ if (i) {
729
+ u = [], c = y.length;
730
+ while (c--)
731
+ (p = y[c]) && u.push(m[c] = p);
732
+ i(null, y = [], u, l)
733
+ }
734
+ c = y.length;
735
+ while (c--)
736
+ (p = y[c]) && (u = i ? F.call(o, p) : f[c]) > -1 && (o[u] = !(a[u] = p))
737
+ }
738
+ } else
739
+ y = xt(y === a ? y.splice(h, y.length) : y), i ? i(null, a, y, l) : M.apply(a, y)
740
+ })
741
+ }
742
+ function Tt(e) {
743
+ var t, n, r, i = e.length, a = o.relative[e[0].type], s = a || o.relative[" "], l = a ? 1 : 0, c = vt(function(e) {
744
+ return e === t
745
+ }, s, !0), p = vt(function(e) {
746
+ return F.call(t, e) > -1
747
+ }, s, !0), f = [function(e, n, r) {
748
+ return!a && (r || n !== u) || ((t = n).nodeType ? c(e, n, r) : p(e, n, r))
749
+ }];
750
+ for (; i > l; l++)
751
+ if (n = o.relative[e[l].type])
752
+ f = [vt(bt(f), n)];
753
+ else {
754
+ if (n = o.filter[e[l].type].apply(null, e[l].matches), n[b]) {
755
+ for (r = ++l; i > r; r++)
756
+ if (o.relative[e[r].type])
757
+ break;
758
+ return wt(l > 1 && bt(f), l > 1 && yt(e.slice(0, l - 1).concat({value: " " === e[l - 2].type ? "*" : ""})).replace(z, "$1"), n, r > l && Tt(e.slice(l, r)), i > r && Tt(e = e.slice(r)), i > r && yt(e))
759
+ }
760
+ f.push(n)
761
+ }
762
+ return bt(f)
763
+ }
764
+ function Ct(e, t) {
765
+ var n = 0, r = t.length > 0, a = e.length > 0, s = function(s, l, c, p, d) {
766
+ var h, g, m, y = [], v = 0, b = "0", x = s && [], w = null != d, C = u, N = s || a && o.find.TAG("*", d && l.parentNode || l), k = T += null == C ? 1 : Math.random() || .1;
767
+ for (w && (u = l !== f && l, i = n); null != (h = N[b]); b++) {
768
+ if (a && h) {
769
+ g = 0;
770
+ while (m = e[g++])
771
+ if (m(h, l, c)) {
772
+ p.push(h);
773
+ break
774
+ }
775
+ w && (T = k, i = ++n)
776
+ }
777
+ r && ((h = !m && h) && v--, s && x.push(h))
778
+ }
779
+ if (v += b, r && b !== v) {
780
+ g = 0;
781
+ while (m = t[g++])
782
+ m(x, y, l, c);
783
+ if (s) {
784
+ if (v > 0)
785
+ while (b--)
786
+ x[b] || y[b] || (y[b] = q.call(p));
787
+ y = xt(y)
788
+ }
789
+ M.apply(p, y), w && !s && y.length > 0 && v + t.length > 1 && at.uniqueSort(p)
790
+ }
791
+ return w && (T = k, u = C), x
792
+ };
793
+ return r ? lt(s) : s
794
+ }
795
+ l = at.compile = function(e, t) {
796
+ var n, r = [], i = [], o = E[e + " "];
797
+ if (!o) {
798
+ t || (t = mt(e)), n = t.length;
799
+ while (n--)
800
+ o = Tt(t[n]), o[b] ? r.push(o) : i.push(o);
801
+ o = E(e, Ct(i, r))
802
+ }
803
+ return o
804
+ };
805
+ function Nt(e, t, n) {
806
+ var r = 0, i = t.length;
807
+ for (; i > r; r++)
808
+ at(e, t[r], n);
809
+ return n
810
+ }
811
+ function kt(e, t, n, i) {
812
+ var a, s, u, c, p, f = mt(e);
813
+ if (!i && 1 === f.length) {
814
+ if (s = f[0] = f[0].slice(0), s.length > 2 && "ID" === (u = s[0]).type && r.getById && 9 === t.nodeType && h && o.relative[s[1].type]) {
815
+ if (t = (o.find.ID(u.matches[0].replace(rt, it), t) || [])[0], !t)
816
+ return n;
817
+ e = e.slice(s.shift().value.length)
818
+ }
819
+ a = Q.needsContext.test(e) ? 0 : s.length;
820
+ while (a--) {
821
+ if (u = s[a], o.relative[c = u.type])
822
+ break;
823
+ if ((p = o.find[c]) && (i = p(u.matches[0].replace(rt, it), V.test(s[0].type) && t.parentNode || t))) {
824
+ if (s.splice(a, 1), e = i.length && yt(s), !e)
825
+ return M.apply(n, i), n;
826
+ break
827
+ }
828
+ }
829
+ }
830
+ return l(e, f)(i, t, !h, n, V.test(e)), n
831
+ }
832
+ r.sortStable = b.split("").sort(A).join("") === b, r.detectDuplicates = S, p(), r.sortDetached = ut(function(e) {
833
+ return 1 & e.compareDocumentPosition(f.createElement("div"))
834
+ }), ut(function(e) {
835
+ return e.innerHTML = "<a href='#'></a>", "#" === e.firstChild.getAttribute("href")
836
+ }) || ct("type|href|height|width", function(e, n, r) {
837
+ return r ? t : e.getAttribute(n, "type" === n.toLowerCase() ? 1 : 2)
838
+ }), r.attributes && ut(function(e) {
839
+ return e.innerHTML = "<input/>", e.firstChild.setAttribute("value", ""), "" === e.firstChild.getAttribute("value")
840
+ }) || ct("value", function(e, n, r) {
841
+ return r || "input" !== e.nodeName.toLowerCase() ? t : e.defaultValue
842
+ }), ut(function(e) {
843
+ return null == e.getAttribute("disabled")
844
+ }) || ct(B, function(e, n, r) {
845
+ var i;
846
+ return r ? t : (i = e.getAttributeNode(n)) && i.specified ? i.value : e[n] === !0 ? n.toLowerCase() : null
847
+ }), x.find = at, x.expr = at.selectors, x.expr[":"] = x.expr.pseudos, x.unique = at.uniqueSort, x.text = at.getText, x.isXMLDoc = at.isXML, x.contains = at.contains
848
+ }(e);
849
+ var O = {};
850
+ function F(e) {
851
+ var t = O[e] = {};
852
+ return x.each(e.match(T) || [], function(e, n) {
853
+ t[n] = !0
854
+ }), t
855
+ }
856
+ x.Callbacks = function(e) {
857
+ e = "string" == typeof e ? O[e] || F(e) : x.extend({}, e);
858
+ var n, r, i, o, a, s, l = [], u = !e.once && [], c = function(t) {
859
+ for (r = e.memory && t, i = !0, a = s || 0, s = 0, o = l.length, n = !0; l && o > a; a++)
860
+ if (l[a].apply(t[0], t[1]) === !1 && e.stopOnFalse) {
861
+ r = !1;
862
+ break
863
+ }
864
+ n = !1, l && (u ? u.length && c(u.shift()) : r ? l = [] : p.disable())
865
+ }, p = {add: function() {
866
+ if (l) {
867
+ var t = l.length;
868
+ (function i(t) {
869
+ x.each(t, function(t, n) {
870
+ var r = x.type(n);
871
+ "function" === r ? e.unique && p.has(n) || l.push(n) : n && n.length && "string" !== r && i(n)
872
+ })
873
+ })(arguments), n ? o = l.length : r && (s = t, c(r))
874
+ }
875
+ return this
876
+ }, remove: function() {
877
+ return l && x.each(arguments, function(e, t) {
878
+ var r;
879
+ while ((r = x.inArray(t, l, r)) > - 1)
880
+ l.splice(r, 1), n && (o >= r && o--, a >= r && a--)
881
+ }), this
882
+ }, has: function(e) {
883
+ return e ? x.inArray(e, l) > -1 : !(!l || !l.length)
884
+ }, empty: function() {
885
+ return l = [], o = 0, this
886
+ }, disable: function() {
887
+ return l = u = r = t, this
888
+ }, disabled: function() {
889
+ return!l
890
+ }, lock: function() {
891
+ return u = t, r || p.disable(), this
892
+ }, locked: function() {
893
+ return!u
894
+ }, fireWith: function(e, t) {
895
+ return!l || i && !u || (t = t || [], t = [e, t.slice ? t.slice() : t], n ? u.push(t) : c(t)), this
896
+ }, fire: function() {
897
+ return p.fireWith(this, arguments), this
898
+ }, fired: function() {
899
+ return!!i
900
+ }};
901
+ return p
902
+ }, x.extend({Deferred: function(e) {
903
+ var t = [["resolve", "done", x.Callbacks("once memory"), "resolved"], ["reject", "fail", x.Callbacks("once memory"), "rejected"], ["notify", "progress", x.Callbacks("memory")]], n = "pending", r = {state: function() {
904
+ return n
905
+ }, always: function() {
906
+ return i.done(arguments).fail(arguments), this
907
+ }, then: function() {
908
+ var e = arguments;
909
+ return x.Deferred(function(n) {
910
+ x.each(t, function(t, o) {
911
+ var a = o[0], s = x.isFunction(e[t]) && e[t];
912
+ i[o[1]](function() {
913
+ var e = s && s.apply(this, arguments);
914
+ e && x.isFunction(e.promise) ? e.promise().done(n.resolve).fail(n.reject).progress(n.notify) : n[a + "With"](this === r ? n.promise() : this, s ? [e] : arguments)
915
+ })
916
+ }), e = null
917
+ }).promise()
918
+ }, promise: function(e) {
919
+ return null != e ? x.extend(e, r) : r
920
+ }}, i = {};
921
+ return r.pipe = r.then, x.each(t, function(e, o) {
922
+ var a = o[2], s = o[3];
923
+ r[o[1]] = a.add, s && a.add(function() {
924
+ n = s
925
+ }, t[1 ^ e][2].disable, t[2][2].lock), i[o[0]] = function() {
926
+ return i[o[0] + "With"](this === i ? r : this, arguments), this
927
+ }, i[o[0] + "With"] = a.fireWith
928
+ }), r.promise(i), e && e.call(i, i), i
929
+ }, when: function(e) {
930
+ var t = 0, n = g.call(arguments), r = n.length, i = 1 !== r || e && x.isFunction(e.promise) ? r : 0, o = 1 === i ? e : x.Deferred(), a = function(e, t, n) {
931
+ return function(r) {
932
+ t[e] = this, n[e] = arguments.length > 1 ? g.call(arguments) : r, n === s ? o.notifyWith(t, n) : --i || o.resolveWith(t, n)
933
+ }
934
+ }, s, l, u;
935
+ if (r > 1)
936
+ for (s = Array(r), l = Array(r), u = Array(r); r > t; t++)
937
+ n[t] && x.isFunction(n[t].promise) ? n[t].promise().done(a(t, u, n)).fail(o.reject).progress(a(t, l, s)) : --i;
938
+ return i || o.resolveWith(u, n), o.promise()
939
+ }}), x.support = function(t) {
940
+ var n, r, o, s, l, u, c, p, f, d = a.createElement("div");
941
+ if (d.setAttribute("className", "t"), d.innerHTML = " <link/><table></table><a href='/a'>a</a><input type='checkbox'/>", n = d.getElementsByTagName("*") || [], r = d.getElementsByTagName("a")[0], !r || !r.style || !n.length)
942
+ return t;
943
+ s = a.createElement("select"), u = s.appendChild(a.createElement("option")), o = d.getElementsByTagName("input")[0], r.style.cssText = "top:1px;float:left;opacity:.5", t.getSetAttribute = "t" !== d.className, t.leadingWhitespace = 3 === d.firstChild.nodeType, t.tbody = !d.getElementsByTagName("tbody").length, t.htmlSerialize = !!d.getElementsByTagName("link").length, t.style = /top/.test(r.getAttribute("style")), t.hrefNormalized = "/a" === r.getAttribute("href"), t.opacity = /^0.5/.test(r.style.opacity), t.cssFloat = !!r.style.cssFloat, t.checkOn = !!o.value, t.optSelected = u.selected, t.enctype = !!a.createElement("form").enctype, t.html5Clone = "<:nav></:nav>" !== a.createElement("nav").cloneNode(!0).outerHTML, t.inlineBlockNeedsLayout = !1, t.shrinkWrapBlocks = !1, t.pixelPosition = !1, t.deleteExpando = !0, t.noCloneEvent = !0, t.reliableMarginRight = !0, t.boxSizingReliable = !0, o.checked = !0, t.noCloneChecked = o.cloneNode(!0).checked, s.disabled = !0, t.optDisabled = !u.disabled;
944
+ try {
945
+ delete d.test
946
+ } catch (h) {
947
+ t.deleteExpando = !1
948
+ }
949
+ o = a.createElement("input"), o.setAttribute("value", ""), t.input = "" === o.getAttribute("value"), o.value = "t", o.setAttribute("type", "radio"), t.radioValue = "t" === o.value, o.setAttribute("checked", "t"), o.setAttribute("name", "t"), l = a.createDocumentFragment(), l.appendChild(o), t.appendChecked = o.checked, t.checkClone = l.cloneNode(!0).cloneNode(!0).lastChild.checked, d.attachEvent && (d.attachEvent("onclick", function() {
950
+ t.noCloneEvent = !1
951
+ }), d.cloneNode(!0).click());
952
+ for (f in{submit:!0, change:!0, focusin:!0})
953
+ d.setAttribute(c = "on" + f, "t"), t[f + "Bubbles"] = c in e || d.attributes[c].expando === !1;
954
+ d.style.backgroundClip = "content-box", d.cloneNode(!0).style.backgroundClip = "", t.clearCloneStyle = "content-box" === d.style.backgroundClip;
955
+ for (f in x(t))
956
+ break;
957
+ return t.ownLast = "0" !== f, x(function() {
958
+ var n, r, o, s = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;", l = a.getElementsByTagName("body")[0];
959
+ l && (n = a.createElement("div"), n.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px", l.appendChild(n).appendChild(d), d.innerHTML = "<table><tr><td></td><td>t</td></tr></table>", o = d.getElementsByTagName("td"), o[0].style.cssText = "padding:0;margin:0;border:0;display:none", p = 0 === o[0].offsetHeight, o[0].style.display = "", o[1].style.display = "none", t.reliableHiddenOffsets = p && 0 === o[0].offsetHeight, d.innerHTML = "", d.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;", x.swap(l, null != l.style.zoom ? {zoom: 1} : {}, function() {
960
+ t.boxSizing = 4 === d.offsetWidth
961
+ }), e.getComputedStyle && (t.pixelPosition = "1%" !== (e.getComputedStyle(d, null) || {}).top, t.boxSizingReliable = "4px" === (e.getComputedStyle(d, null) || {width: "4px"}).width, r = d.appendChild(a.createElement("div")), r.style.cssText = d.style.cssText = s, r.style.marginRight = r.style.width = "0", d.style.width = "1px", t.reliableMarginRight = !parseFloat((e.getComputedStyle(r, null) || {}).marginRight)), typeof d.style.zoom !== i && (d.innerHTML = "", d.style.cssText = s + "width:1px;padding:1px;display:inline;zoom:1", t.inlineBlockNeedsLayout = 3 === d.offsetWidth, d.style.display = "block", d.innerHTML = "<div></div>", d.firstChild.style.width = "5px", t.shrinkWrapBlocks = 3 !== d.offsetWidth, t.inlineBlockNeedsLayout && (l.style.zoom = 1)), l.removeChild(n), n = d = o = r = null)
962
+ }), n = s = l = u = r = o = null, t
963
+ }({});
964
+ var B = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/, P = /([A-Z])/g;
965
+ function R(e, n, r, i) {
966
+ if (x.acceptData(e)) {
967
+ var o, a, s = x.expando, l = e.nodeType, u = l ? x.cache : e, c = l ? e[s] : e[s] && s;
968
+ if (c && u[c] && (i || u[c].data) || r !== t || "string" != typeof n)
969
+ return c || (c = l ? e[s] = p.pop() || x.guid++ : s), u[c] || (u[c] = l ? {} : {toJSON: x.noop}), ("object" == typeof n || "function" == typeof n) && (i ? u[c] = x.extend(u[c], n) : u[c].data = x.extend(u[c].data, n)), a = u[c], i || (a.data || (a.data = {}), a = a.data), r !== t && (a[x.camelCase(n)] = r), "string" == typeof n ? (o = a[n], null == o && (o = a[x.camelCase(n)])) : o = a, o
970
+ }
971
+ }
972
+ function W(e, t, n) {
973
+ if (x.acceptData(e)) {
974
+ var r, i, o = e.nodeType, a = o ? x.cache : e, s = o ? e[x.expando] : x.expando;
975
+ if (a[s]) {
976
+ if (t && (r = n ? a[s] : a[s].data)) {
977
+ x.isArray(t) ? t = t.concat(x.map(t, x.camelCase)) : t in r ? t = [t] : (t = x.camelCase(t), t = t in r ? [t] : t.split(" ")), i = t.length;
978
+ while (i--)
979
+ delete r[t[i]];
980
+ if (n ? !I(r) : !x.isEmptyObject(r))
981
+ return
982
+ }
983
+ (n || (delete a[s].data, I(a[s]))) && (o ? x.cleanData([e], !0) : x.support.deleteExpando || a != a.window ? delete a[s] : a[s] = null)
984
+ }
985
+ }
986
+ }
987
+ x.extend({cache: {}, noData: {applet: !0, embed: !0, object: "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"}, hasData: function(e) {
988
+ return e = e.nodeType ? x.cache[e[x.expando]] : e[x.expando], !!e && !I(e)
989
+ }, data: function(e, t, n) {
990
+ return R(e, t, n)
991
+ }, removeData: function(e, t) {
992
+ return W(e, t)
993
+ }, _data: function(e, t, n) {
994
+ return R(e, t, n, !0)
995
+ }, _removeData: function(e, t) {
996
+ return W(e, t, !0)
997
+ }, acceptData: function(e) {
998
+ if (e.nodeType && 1 !== e.nodeType && 9 !== e.nodeType)
999
+ return!1;
1000
+ var t = e.nodeName && x.noData[e.nodeName.toLowerCase()];
1001
+ return!t || t !== !0 && e.getAttribute("classid") === t
1002
+ }}), x.fn.extend({data: function(e, n) {
1003
+ var r, i, o = null, a = 0, s = this[0];
1004
+ if (e === t) {
1005
+ if (this.length && (o = x.data(s), 1 === s.nodeType && !x._data(s, "parsedAttrs"))) {
1006
+ for (r = s.attributes; r.length > a; a++)
1007
+ i = r[a].name, 0 === i.indexOf("data-") && (i = x.camelCase(i.slice(5)), $(s, i, o[i]));
1008
+ x._data(s, "parsedAttrs", !0)
1009
+ }
1010
+ return o
1011
+ }
1012
+ return"object" == typeof e ? this.each(function() {
1013
+ x.data(this, e)
1014
+ }) : arguments.length > 1 ? this.each(function() {
1015
+ x.data(this, e, n)
1016
+ }) : s ? $(s, e, x.data(s, e)) : null
1017
+ }, removeData: function(e) {
1018
+ return this.each(function() {
1019
+ x.removeData(this, e)
1020
+ })
1021
+ }});
1022
+ function $(e, n, r) {
1023
+ if (r === t && 1 === e.nodeType) {
1024
+ var i = "data-" + n.replace(P, "-$1").toLowerCase();
1025
+ if (r = e.getAttribute(i), "string" == typeof r) {
1026
+ try {
1027
+ r = "true" === r ? !0 : "false" === r ? !1 : "null" === r ? null : +r + "" === r ? +r : B.test(r) ? x.parseJSON(r) : r
1028
+ } catch (o) {
1029
+ }
1030
+ x.data(e, n, r)
1031
+ } else
1032
+ r = t
1033
+ }
1034
+ return r
1035
+ }
1036
+ function I(e) {
1037
+ var t;
1038
+ for (t in e)
1039
+ if (("data" !== t || !x.isEmptyObject(e[t])) && "toJSON" !== t)
1040
+ return!1;
1041
+ return!0
1042
+ }
1043
+ x.extend({queue: function(e, n, r) {
1044
+ var i;
1045
+ return e ? (n = (n || "fx") + "queue", i = x._data(e, n), r && (!i || x.isArray(r) ? i = x._data(e, n, x.makeArray(r)) : i.push(r)), i || []) : t
1046
+ }, dequeue: function(e, t) {
1047
+ t = t || "fx";
1048
+ var n = x.queue(e, t), r = n.length, i = n.shift(), o = x._queueHooks(e, t), a = function() {
1049
+ x.dequeue(e, t)
1050
+ };
1051
+ "inprogress" === i && (i = n.shift(), r--), i && ("fx" === t && n.unshift("inprogress"), delete o.stop, i.call(e, a, o)), !r && o && o.empty.fire()
1052
+ }, _queueHooks: function(e, t) {
1053
+ var n = t + "queueHooks";
1054
+ return x._data(e, n) || x._data(e, n, {empty: x.Callbacks("once memory").add(function() {
1055
+ x._removeData(e, t + "queue"), x._removeData(e, n)
1056
+ })})
1057
+ }}), x.fn.extend({queue: function(e, n) {
1058
+ var r = 2;
1059
+ return"string" != typeof e && (n = e, e = "fx", r--), r > arguments.length ? x.queue(this[0], e) : n === t ? this : this.each(function() {
1060
+ var t = x.queue(this, e, n);
1061
+ x._queueHooks(this, e), "fx" === e && "inprogress" !== t[0] && x.dequeue(this, e)
1062
+ })
1063
+ }, dequeue: function(e) {
1064
+ return this.each(function() {
1065
+ x.dequeue(this, e)
1066
+ })
1067
+ }, delay: function(e, t) {
1068
+ return e = x.fx ? x.fx.speeds[e] || e : e, t = t || "fx", this.queue(t, function(t, n) {
1069
+ var r = setTimeout(t, e);
1070
+ n.stop = function() {
1071
+ clearTimeout(r)
1072
+ }
1073
+ })
1074
+ }, clearQueue: function(e) {
1075
+ return this.queue(e || "fx", [])
1076
+ }, promise: function(e, n) {
1077
+ var r, i = 1, o = x.Deferred(), a = this, s = this.length, l = function() {
1078
+ --i || o.resolveWith(a, [a])
1079
+ };
1080
+ "string" != typeof e && (n = e, e = t), e = e || "fx";
1081
+ while (s--)
1082
+ r = x._data(a[s], e + "queueHooks"), r && r.empty && (i++, r.empty.add(l));
1083
+ return l(), o.promise(n)
1084
+ }});
1085
+ var z, X, U = /[\t\r\n\f]/g, V = /\r/g, Y = /^(?:input|select|textarea|button|object)$/i, J = /^(?:a|area)$/i, G = /^(?:checked|selected)$/i, Q = x.support.getSetAttribute, K = x.support.input;
1086
+ x.fn.extend({attr: function(e, t) {
1087
+ return x.access(this, x.attr, e, t, arguments.length > 1)
1088
+ }, removeAttr: function(e) {
1089
+ return this.each(function() {
1090
+ x.removeAttr(this, e)
1091
+ })
1092
+ }, prop: function(e, t) {
1093
+ return x.access(this, x.prop, e, t, arguments.length > 1)
1094
+ }, removeProp: function(e) {
1095
+ return e = x.propFix[e] || e, this.each(function() {
1096
+ try {
1097
+ this[e] = t, delete this[e]
1098
+ } catch (n) {
1099
+ }
1100
+ })
1101
+ }, addClass: function(e) {
1102
+ var t, n, r, i, o, a = 0, s = this.length, l = "string" == typeof e && e;
1103
+ if (x.isFunction(e))
1104
+ return this.each(function(t) {
1105
+ x(this).addClass(e.call(this, t, this.className))
1106
+ });
1107
+ if (l)
1108
+ for (t = (e || "").match(T) || []; s > a; a++)
1109
+ if (n = this[a], r = 1 === n.nodeType && (n.className ? (" " + n.className + " ").replace(U, " ") : " ")) {
1110
+ o = 0;
1111
+ while (i = t[o++])
1112
+ 0 > r.indexOf(" " + i + " ") && (r += i + " ");
1113
+ n.className = x.trim(r)
1114
+ }
1115
+ return this
1116
+ }, removeClass: function(e) {
1117
+ var t, n, r, i, o, a = 0, s = this.length, l = 0 === arguments.length || "string" == typeof e && e;
1118
+ if (x.isFunction(e))
1119
+ return this.each(function(t) {
1120
+ x(this).removeClass(e.call(this, t, this.className))
1121
+ });
1122
+ if (l)
1123
+ for (t = (e || "").match(T) || []; s > a; a++)
1124
+ if (n = this[a], r = 1 === n.nodeType && (n.className ? (" " + n.className + " ").replace(U, " ") : "")) {
1125
+ o = 0;
1126
+ while (i = t[o++])
1127
+ while (r.indexOf(" " + i + " ") >= 0)
1128
+ r = r.replace(" " + i + " ", " ");
1129
+ n.className = e ? x.trim(r) : ""
1130
+ }
1131
+ return this
1132
+ }, toggleClass: function(e, t) {
1133
+ var n = typeof e;
1134
+ return"boolean" == typeof t && "string" === n ? t ? this.addClass(e) : this.removeClass(e) : x.isFunction(e) ? this.each(function(n) {
1135
+ x(this).toggleClass(e.call(this, n, this.className, t), t)
1136
+ }) : this.each(function() {
1137
+ if ("string" === n) {
1138
+ var t, r = 0, o = x(this), a = e.match(T) || [];
1139
+ while (t = a[r++])
1140
+ o.hasClass(t) ? o.removeClass(t) : o.addClass(t)
1141
+ } else
1142
+ (n === i || "boolean" === n) && (this.className && x._data(this, "__className__", this.className), this.className = this.className || e === !1 ? "" : x._data(this, "__className__") || "")
1143
+ })
1144
+ }, hasClass: function(e) {
1145
+ var t = " " + e + " ", n = 0, r = this.length;
1146
+ for (; r > n; n++)
1147
+ if (1 === this[n].nodeType && (" " + this[n].className + " ").replace(U, " ").indexOf(t) >= 0)
1148
+ return!0;
1149
+ return!1
1150
+ }, val: function(e) {
1151
+ var n, r, i, o = this[0];
1152
+ {
1153
+ if (arguments.length)
1154
+ return i = x.isFunction(e), this.each(function(n) {
1155
+ var o;
1156
+ 1 === this.nodeType && (o = i ? e.call(this, n, x(this).val()) : e, null == o ? o = "" : "number" == typeof o ? o += "" : x.isArray(o) && (o = x.map(o, function(e) {
1157
+ return null == e ? "" : e + ""
1158
+ })), r = x.valHooks[this.type] || x.valHooks[this.nodeName.toLowerCase()], r && "set"in r && r.set(this, o, "value") !== t || (this.value = o))
1159
+ });
1160
+ if (o)
1161
+ return r = x.valHooks[o.type] || x.valHooks[o.nodeName.toLowerCase()], r && "get"in r && (n = r.get(o, "value")) !== t ? n : (n = o.value, "string" == typeof n ? n.replace(V, "") : null == n ? "" : n)
1162
+ }
1163
+ }}), x.extend({valHooks: {option: {get: function(e) {
1164
+ var t = x.find.attr(e, "value");
1165
+ return null != t ? t : e.text
1166
+ }}, select: {get: function(e) {
1167
+ var t, n, r = e.options, i = e.selectedIndex, o = "select-one" === e.type || 0 > i, a = o ? null : [], s = o ? i + 1 : r.length, l = 0 > i ? s : o ? i : 0;
1168
+ for (; s > l; l++)
1169
+ if (n = r[l], !(!n.selected && l !== i || (x.support.optDisabled ? n.disabled : null !== n.getAttribute("disabled")) || n.parentNode.disabled && x.nodeName(n.parentNode, "optgroup"))) {
1170
+ if (t = x(n).val(), o)
1171
+ return t;
1172
+ a.push(t)
1173
+ }
1174
+ return a
1175
+ }, set: function(e, t) {
1176
+ var n, r, i = e.options, o = x.makeArray(t), a = i.length;
1177
+ while (a--)
1178
+ r = i[a], (r.selected = x.inArray(x(r).val(), o) >= 0) && (n = !0);
1179
+ return n || (e.selectedIndex = -1), o
1180
+ }}}, attr: function(e, n, r) {
1181
+ var o, a, s = e.nodeType;
1182
+ if (e && 3 !== s && 8 !== s && 2 !== s)
1183
+ return typeof e.getAttribute === i ? x.prop(e, n, r) : (1 === s && x.isXMLDoc(e) || (n = n.toLowerCase(), o = x.attrHooks[n] || (x.expr.match.bool.test(n) ? X : z)), r === t ? o && "get"in o && null !== (a = o.get(e, n)) ? a : (a = x.find.attr(e, n), null == a ? t : a) : null !== r ? o && "set"in o && (a = o.set(e, r, n)) !== t ? a : (e.setAttribute(n, r + ""), r) : (x.removeAttr(e, n), t))
1184
+ }, removeAttr: function(e, t) {
1185
+ var n, r, i = 0, o = t && t.match(T);
1186
+ if (o && 1 === e.nodeType)
1187
+ while (n = o[i++])
1188
+ r = x.propFix[n] || n, x.expr.match.bool.test(n) ? K && Q || !G.test(n) ? e[r] = !1 : e[x.camelCase("default-" + n)] = e[r] = !1 : x.attr(e, n, ""), e.removeAttribute(Q ? n : r)
1189
+ }, attrHooks: {type: {set: function(e, t) {
1190
+ if (!x.support.radioValue && "radio" === t && x.nodeName(e, "input")) {
1191
+ var n = e.value;
1192
+ return e.setAttribute("type", t), n && (e.value = n), t
1193
+ }
1194
+ }}}, propFix: {"for": "htmlFor", "class": "className"}, prop: function(e, n, r) {
1195
+ var i, o, a, s = e.nodeType;
1196
+ if (e && 3 !== s && 8 !== s && 2 !== s)
1197
+ return a = 1 !== s || !x.isXMLDoc(e), a && (n = x.propFix[n] || n, o = x.propHooks[n]), r !== t ? o && "set"in o && (i = o.set(e, r, n)) !== t ? i : e[n] = r : o && "get"in o && null !== (i = o.get(e, n)) ? i : e[n]
1198
+ }, propHooks: {tabIndex: {get: function(e) {
1199
+ var t = x.find.attr(e, "tabindex");
1200
+ return t ? parseInt(t, 10) : Y.test(e.nodeName) || J.test(e.nodeName) && e.href ? 0 : -1
1201
+ }}}}), X = {set: function(e, t, n) {
1202
+ return t === !1 ? x.removeAttr(e, n) : K && Q || !G.test(n) ? e.setAttribute(!Q && x.propFix[n] || n, n) : e[x.camelCase("default-" + n)] = e[n] = !0, n
1203
+ }}, x.each(x.expr.match.bool.source.match(/\w+/g), function(e, n) {
1204
+ var r = x.expr.attrHandle[n] || x.find.attr;
1205
+ x.expr.attrHandle[n] = K && Q || !G.test(n) ? function(e, n, i) {
1206
+ var o = x.expr.attrHandle[n], a = i ? t : (x.expr.attrHandle[n] = t) != r(e, n, i) ? n.toLowerCase() : null;
1207
+ return x.expr.attrHandle[n] = o, a
1208
+ } : function(e, n, r) {
1209
+ return r ? t : e[x.camelCase("default-" + n)] ? n.toLowerCase() : null
1210
+ }
1211
+ }), K && Q || (x.attrHooks.value = {set: function(e, n, r) {
1212
+ return x.nodeName(e, "input") ? (e.defaultValue = n, t) : z && z.set(e, n, r)
1213
+ }}), Q || (z = {set: function(e, n, r) {
1214
+ var i = e.getAttributeNode(r);
1215
+ return i || e.setAttributeNode(i = e.ownerDocument.createAttribute(r)), i.value = n += "", "value" === r || n === e.getAttribute(r) ? n : t
1216
+ }}, x.expr.attrHandle.id = x.expr.attrHandle.name = x.expr.attrHandle.coords = function(e, n, r) {
1217
+ var i;
1218
+ return r ? t : (i = e.getAttributeNode(n)) && "" !== i.value ? i.value : null
1219
+ }, x.valHooks.button = {get: function(e, n) {
1220
+ var r = e.getAttributeNode(n);
1221
+ return r && r.specified ? r.value : t
1222
+ }, set: z.set}, x.attrHooks.contenteditable = {set: function(e, t, n) {
1223
+ z.set(e, "" === t ? !1 : t, n)
1224
+ }}, x.each(["width", "height"], function(e, n) {
1225
+ x.attrHooks[n] = {set: function(e, r) {
1226
+ return"" === r ? (e.setAttribute(n, "auto"), r) : t
1227
+ }}
1228
+ })), x.support.hrefNormalized || x.each(["href", "src"], function(e, t) {
1229
+ x.propHooks[t] = {get: function(e) {
1230
+ return e.getAttribute(t, 4)
1231
+ }}
1232
+ }), x.support.style || (x.attrHooks.style = {get: function(e) {
1233
+ return e.style.cssText || t
1234
+ }, set: function(e, t) {
1235
+ return e.style.cssText = t + ""
1236
+ }}), x.support.optSelected || (x.propHooks.selected = {get: function(e) {
1237
+ var t = e.parentNode;
1238
+ return t && (t.selectedIndex, t.parentNode && t.parentNode.selectedIndex), null
1239
+ }}), x.each(["tabIndex", "readOnly", "maxLength", "cellSpacing", "cellPadding", "rowSpan", "colSpan", "useMap", "frameBorder", "contentEditable"], function() {
1240
+ x.propFix[this.toLowerCase()] = this
1241
+ }), x.support.enctype || (x.propFix.enctype = "encoding"), x.each(["radio", "checkbox"], function() {
1242
+ x.valHooks[this] = {set: function(e, n) {
1243
+ return x.isArray(n) ? e.checked = x.inArray(x(e).val(), n) >= 0 : t
1244
+ }}, x.support.checkOn || (x.valHooks[this].get = function(e) {
1245
+ return null === e.getAttribute("value") ? "on" : e.value
1246
+ })
1247
+ });
1248
+ var Z = /^(?:input|select|textarea)$/i, et = /^key/, tt = /^(?:mouse|contextmenu)|click/, nt = /^(?:focusinfocus|focusoutblur)$/, rt = /^([^.]*)(?:\.(.+)|)$/;
1249
+ function it() {
1250
+ return!0
1251
+ }
1252
+ function ot() {
1253
+ return!1
1254
+ }
1255
+ function at() {
1256
+ try {
1257
+ return a.activeElement
1258
+ } catch (e) {
1259
+ }
1260
+ }
1261
+ x.event = {global: {}, add: function(e, n, r, o, a) {
1262
+ var s, l, u, c, p, f, d, h, g, m, y, v = x._data(e);
1263
+ if (v) {
1264
+ r.handler && (c = r, r = c.handler, a = c.selector), r.guid || (r.guid = x.guid++), (l = v.events) || (l = v.events = {}), (f = v.handle) || (f = v.handle = function(e) {
1265
+ return typeof x === i || e && x.event.triggered === e.type ? t : x.event.dispatch.apply(f.elem, arguments)
1266
+ }, f.elem = e), n = (n || "").match(T) || [""], u = n.length;
1267
+ while (u--)
1268
+ s = rt.exec(n[u]) || [], g = y = s[1], m = (s[2] || "").split(".").sort(), g && (p = x.event.special[g] || {}, g = (a ? p.delegateType : p.bindType) || g, p = x.event.special[g] || {}, d = x.extend({type: g, origType: y, data: o, handler: r, guid: r.guid, selector: a, needsContext: a && x.expr.match.needsContext.test(a), namespace: m.join(".")}, c), (h = l[g]) || (h = l[g] = [], h.delegateCount = 0, p.setup && p.setup.call(e, o, m, f) !== !1 || (e.addEventListener ? e.addEventListener(g, f, !1) : e.attachEvent && e.attachEvent("on" + g, f))), p.add && (p.add.call(e, d), d.handler.guid || (d.handler.guid = r.guid)), a ? h.splice(h.delegateCount++, 0, d) : h.push(d), x.event.global[g] = !0);
1269
+ e = null
1270
+ }
1271
+ }, remove: function(e, t, n, r, i) {
1272
+ var o, a, s, l, u, c, p, f, d, h, g, m = x.hasData(e) && x._data(e);
1273
+ if (m && (c = m.events)) {
1274
+ t = (t || "").match(T) || [""], u = t.length;
1275
+ while (u--)
1276
+ if (s = rt.exec(t[u]) || [], d = g = s[1], h = (s[2] || "").split(".").sort(), d) {
1277
+ p = x.event.special[d] || {}, d = (r ? p.delegateType : p.bindType) || d, f = c[d] || [], s = s[2] && RegExp("(^|\\.)" + h.join("\\.(?:.*\\.|)") + "(\\.|$)"), l = o = f.length;
1278
+ while (o--)
1279
+ a = f[o], !i && g !== a.origType || n && n.guid !== a.guid || s && !s.test(a.namespace) || r && r !== a.selector && ("**" !== r || !a.selector) || (f.splice(o, 1), a.selector && f.delegateCount--, p.remove && p.remove.call(e, a));
1280
+ l && !f.length && (p.teardown && p.teardown.call(e, h, m.handle) !== !1 || x.removeEvent(e, d, m.handle), delete c[d])
1281
+ } else
1282
+ for (d in c)
1283
+ x.event.remove(e, d + t[u], n, r, !0);
1284
+ x.isEmptyObject(c) && (delete m.handle, x._removeData(e, "events"))
1285
+ }
1286
+ }, trigger: function(n, r, i, o) {
1287
+ var s, l, u, c, p, f, d, h = [i || a], g = v.call(n, "type") ? n.type : n, m = v.call(n, "namespace") ? n.namespace.split(".") : [];
1288
+ if (u = f = i = i || a, 3 !== i.nodeType && 8 !== i.nodeType && !nt.test(g + x.event.triggered) && (g.indexOf(".") >= 0 && (m = g.split("."), g = m.shift(), m.sort()), l = 0 > g.indexOf(":") && "on" + g, n = n[x.expando] ? n : new x.Event(g, "object" == typeof n && n), n.isTrigger = o ? 2 : 3, n.namespace = m.join("."), n.namespace_re = n.namespace ? RegExp("(^|\\.)" + m.join("\\.(?:.*\\.|)") + "(\\.|$)") : null, n.result = t, n.target || (n.target = i), r = null == r ? [n] : x.makeArray(r, [n]), p = x.event.special[g] || {}, o || !p.trigger || p.trigger.apply(i, r) !== !1)) {
1289
+ if (!o && !p.noBubble && !x.isWindow(i)) {
1290
+ for (c = p.delegateType || g, nt.test(c + g) || (u = u.parentNode); u; u = u.parentNode)
1291
+ h.push(u), f = u;
1292
+ f === (i.ownerDocument || a) && h.push(f.defaultView || f.parentWindow || e)
1293
+ }
1294
+ d = 0;
1295
+ while ((u = h[d++]) && !n.isPropagationStopped())
1296
+ n.type = d > 1 ? c : p.bindType || g, s = (x._data(u, "events") || {})[n.type] && x._data(u, "handle"), s && s.apply(u, r), s = l && u[l], s && x.acceptData(u) && s.apply && s.apply(u, r) === !1 && n.preventDefault();
1297
+ if (n.type = g, !o && !n.isDefaultPrevented() && (!p._default || p._default.apply(h.pop(), r) === !1) && x.acceptData(i) && l && i[g] && !x.isWindow(i)) {
1298
+ f = i[l], f && (i[l] = null), x.event.triggered = g;
1299
+ try {
1300
+ i[g]()
1301
+ } catch (y) {
1302
+ }
1303
+ x.event.triggered = t, f && (i[l] = f)
1304
+ }
1305
+ return n.result
1306
+ }
1307
+ }, dispatch: function(e) {
1308
+ e = x.event.fix(e);
1309
+ var n, r, i, o, a, s = [], l = g.call(arguments), u = (x._data(this, "events") || {})[e.type] || [], c = x.event.special[e.type] || {};
1310
+ if (l[0] = e, e.delegateTarget = this, !c.preDispatch || c.preDispatch.call(this, e) !== !1) {
1311
+ s = x.event.handlers.call(this, e, u), n = 0;
1312
+ while ((o = s[n++]) && !e.isPropagationStopped()) {
1313
+ e.currentTarget = o.elem, a = 0;
1314
+ while ((i = o.handlers[a++]) && !e.isImmediatePropagationStopped())
1315
+ (!e.namespace_re || e.namespace_re.test(i.namespace)) && (e.handleObj = i, e.data = i.data, r = ((x.event.special[i.origType] || {}).handle || i.handler).apply(o.elem, l), r !== t && (e.result = r) === !1 && (e.preventDefault(), e.stopPropagation()))
1316
+ }
1317
+ return c.postDispatch && c.postDispatch.call(this, e), e.result
1318
+ }
1319
+ }, handlers: function(e, n) {
1320
+ var r, i, o, a, s = [], l = n.delegateCount, u = e.target;
1321
+ if (l && u.nodeType && (!e.button || "click" !== e.type))
1322
+ for (; u != this; u = u.parentNode || this)
1323
+ if (1 === u.nodeType && (u.disabled !== !0 || "click" !== e.type)) {
1324
+ for (o = [], a = 0; l > a; a++)
1325
+ i = n[a], r = i.selector + " ", o[r] === t && (o[r] = i.needsContext ? x(r, this).index(u) >= 0 : x.find(r, this, null, [u]).length), o[r] && o.push(i);
1326
+ o.length && s.push({elem: u, handlers: o})
1327
+ }
1328
+ return n.length > l && s.push({elem: this, handlers: n.slice(l)}), s
1329
+ }, fix: function(e) {
1330
+ if (e[x.expando])
1331
+ return e;
1332
+ var t, n, r, i = e.type, o = e, s = this.fixHooks[i];
1333
+ s || (this.fixHooks[i] = s = tt.test(i) ? this.mouseHooks : et.test(i) ? this.keyHooks : {}), r = s.props ? this.props.concat(s.props) : this.props, e = new x.Event(o), t = r.length;
1334
+ while (t--)
1335
+ n = r[t], e[n] = o[n];
1336
+ return e.target || (e.target = o.srcElement || a), 3 === e.target.nodeType && (e.target = e.target.parentNode), e.metaKey = !!e.metaKey, s.filter ? s.filter(e, o) : e
1337
+ }, props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), fixHooks: {}, keyHooks: {props: "char charCode key keyCode".split(" "), filter: function(e, t) {
1338
+ return null == e.which && (e.which = null != t.charCode ? t.charCode : t.keyCode), e
1339
+ }}, mouseHooks: {props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "), filter: function(e, n) {
1340
+ var r, i, o, s = n.button, l = n.fromElement;
1341
+ return null == e.pageX && null != n.clientX && (i = e.target.ownerDocument || a, o = i.documentElement, r = i.body, e.pageX = n.clientX + (o && o.scrollLeft || r && r.scrollLeft || 0) - (o && o.clientLeft || r && r.clientLeft || 0), e.pageY = n.clientY + (o && o.scrollTop || r && r.scrollTop || 0) - (o && o.clientTop || r && r.clientTop || 0)), !e.relatedTarget && l && (e.relatedTarget = l === e.target ? n.toElement : l), e.which || s === t || (e.which = 1 & s ? 1 : 2 & s ? 3 : 4 & s ? 2 : 0), e
1342
+ }}, special: {load: {noBubble: !0}, focus: {trigger: function() {
1343
+ if (this !== at() && this.focus)
1344
+ try {
1345
+ return this.focus(), !1
1346
+ } catch (e) {
1347
+ }
1348
+ }, delegateType: "focusin"}, blur: {trigger: function() {
1349
+ return this === at() && this.blur ? (this.blur(), !1) : t
1350
+ }, delegateType: "focusout"}, click: {trigger: function() {
1351
+ return x.nodeName(this, "input") && "checkbox" === this.type && this.click ? (this.click(), !1) : t
1352
+ }, _default: function(e) {
1353
+ return x.nodeName(e.target, "a")
1354
+ }}, beforeunload: {postDispatch: function(e) {
1355
+ e.result !== t && (e.originalEvent.returnValue = e.result)
1356
+ }}}, simulate: function(e, t, n, r) {
1357
+ var i = x.extend(new x.Event, n, {type: e, isSimulated: !0, originalEvent: {}});
1358
+ r ? x.event.trigger(i, null, t) : x.event.dispatch.call(t, i), i.isDefaultPrevented() && n.preventDefault()
1359
+ }}, x.removeEvent = a.removeEventListener ? function(e, t, n) {
1360
+ e.removeEventListener && e.removeEventListener(t, n, !1)
1361
+ } : function(e, t, n) {
1362
+ var r = "on" + t;
1363
+ e.detachEvent && (typeof e[r] === i && (e[r] = null), e.detachEvent(r, n))
1364
+ }, x.Event = function(e, n) {
1365
+ return this instanceof x.Event ? (e && e.type ? (this.originalEvent = e, this.type = e.type, this.isDefaultPrevented = e.defaultPrevented || e.returnValue === !1 || e.getPreventDefault && e.getPreventDefault() ? it : ot) : this.type = e, n && x.extend(this, n), this.timeStamp = e && e.timeStamp || x.now(), this[x.expando] = !0, t) : new x.Event(e, n)
1366
+ }, x.Event.prototype = {isDefaultPrevented: ot, isPropagationStopped: ot, isImmediatePropagationStopped: ot, preventDefault: function() {
1367
+ var e = this.originalEvent;
1368
+ this.isDefaultPrevented = it, e && (e.preventDefault ? e.preventDefault() : e.returnValue = !1)
1369
+ }, stopPropagation: function() {
1370
+ var e = this.originalEvent;
1371
+ this.isPropagationStopped = it, e && (e.stopPropagation && e.stopPropagation(), e.cancelBubble = !0)
1372
+ }, stopImmediatePropagation: function() {
1373
+ this.isImmediatePropagationStopped = it, this.stopPropagation()
1374
+ }}, x.each({mouseenter: "mouseover", mouseleave: "mouseout"}, function(e, t) {
1375
+ x.event.special[e] = {delegateType: t, bindType: t, handle: function(e) {
1376
+ var n, r = this, i = e.relatedTarget, o = e.handleObj;
1377
+ return(!i || i !== r && !x.contains(r, i)) && (e.type = o.origType, n = o.handler.apply(this, arguments), e.type = t), n
1378
+ }}
1379
+ }), x.support.submitBubbles || (x.event.special.submit = {setup: function() {
1380
+ return x.nodeName(this, "form") ? !1 : (x.event.add(this, "click._submit keypress._submit", function(e) {
1381
+ var n = e.target, r = x.nodeName(n, "input") || x.nodeName(n, "button") ? n.form : t;
1382
+ r && !x._data(r, "submitBubbles") && (x.event.add(r, "submit._submit", function(e) {
1383
+ e._submit_bubble = !0
1384
+ }), x._data(r, "submitBubbles", !0))
1385
+ }), t)
1386
+ }, postDispatch: function(e) {
1387
+ e._submit_bubble && (delete e._submit_bubble, this.parentNode && !e.isTrigger && x.event.simulate("submit", this.parentNode, e, !0))
1388
+ }, teardown: function() {
1389
+ return x.nodeName(this, "form") ? !1 : (x.event.remove(this, "._submit"), t)
1390
+ }}), x.support.changeBubbles || (x.event.special.change = {setup: function() {
1391
+ return Z.test(this.nodeName) ? (("checkbox" === this.type || "radio" === this.type) && (x.event.add(this, "propertychange._change", function(e) {
1392
+ "checked" === e.originalEvent.propertyName && (this._just_changed = !0)
1393
+ }), x.event.add(this, "click._change", function(e) {
1394
+ this._just_changed && !e.isTrigger && (this._just_changed = !1), x.event.simulate("change", this, e, !0)
1395
+ })), !1) : (x.event.add(this, "beforeactivate._change", function(e) {
1396
+ var t = e.target;
1397
+ Z.test(t.nodeName) && !x._data(t, "changeBubbles") && (x.event.add(t, "change._change", function(e) {
1398
+ !this.parentNode || e.isSimulated || e.isTrigger || x.event.simulate("change", this.parentNode, e, !0)
1399
+ }), x._data(t, "changeBubbles", !0))
1400
+ }), t)
1401
+ }, handle: function(e) {
1402
+ var n = e.target;
1403
+ return this !== n || e.isSimulated || e.isTrigger || "radio" !== n.type && "checkbox" !== n.type ? e.handleObj.handler.apply(this, arguments) : t
1404
+ }, teardown: function() {
1405
+ return x.event.remove(this, "._change"), !Z.test(this.nodeName)
1406
+ }}), x.support.focusinBubbles || x.each({focus: "focusin", blur: "focusout"}, function(e, t) {
1407
+ var n = 0, r = function(e) {
1408
+ x.event.simulate(t, e.target, x.event.fix(e), !0)
1409
+ };
1410
+ x.event.special[t] = {setup: function() {
1411
+ 0 === n++ && a.addEventListener(e, r, !0)
1412
+ }, teardown: function() {
1413
+ 0 === --n && a.removeEventListener(e, r, !0)
1414
+ }}
1415
+ }), x.fn.extend({on: function(e, n, r, i, o) {
1416
+ var a, s;
1417
+ if ("object" == typeof e) {
1418
+ "string" != typeof n && (r = r || n, n = t);
1419
+ for (a in e)
1420
+ this.on(a, n, r, e[a], o);
1421
+ return this
1422
+ }
1423
+ if (null == r && null == i ? (i = n, r = n = t) : null == i && ("string" == typeof n ? (i = r, r = t) : (i = r, r = n, n = t)), i === !1)
1424
+ i = ot;
1425
+ else if (!i)
1426
+ return this;
1427
+ return 1 === o && (s = i, i = function(e) {
1428
+ return x().off(e), s.apply(this, arguments)
1429
+ }, i.guid = s.guid || (s.guid = x.guid++)), this.each(function() {
1430
+ x.event.add(this, e, i, r, n)
1431
+ })
1432
+ }, one: function(e, t, n, r) {
1433
+ return this.on(e, t, n, r, 1)
1434
+ }, off: function(e, n, r) {
1435
+ var i, o;
1436
+ if (e && e.preventDefault && e.handleObj)
1437
+ return i = e.handleObj, x(e.delegateTarget).off(i.namespace ? i.origType + "." + i.namespace : i.origType, i.selector, i.handler), this;
1438
+ if ("object" == typeof e) {
1439
+ for (o in e)
1440
+ this.off(o, n, e[o]);
1441
+ return this
1442
+ }
1443
+ return(n === !1 || "function" == typeof n) && (r = n, n = t), r === !1 && (r = ot), this.each(function() {
1444
+ x.event.remove(this, e, r, n)
1445
+ })
1446
+ }, trigger: function(e, t) {
1447
+ return this.each(function() {
1448
+ x.event.trigger(e, t, this)
1449
+ })
1450
+ }, triggerHandler: function(e, n) {
1451
+ var r = this[0];
1452
+ return r ? x.event.trigger(e, n, r, !0) : t
1453
+ }});
1454
+ var st = /^.[^:#\[\.,]*$/, lt = /^(?:parents|prev(?:Until|All))/, ut = x.expr.match.needsContext, ct = {children: !0, contents: !0, next: !0, prev: !0};
1455
+ x.fn.extend({find: function(e) {
1456
+ var t, n = [], r = this, i = r.length;
1457
+ if ("string" != typeof e)
1458
+ return this.pushStack(x(e).filter(function() {
1459
+ for (t = 0; i > t; t++)
1460
+ if (x.contains(r[t], this))
1461
+ return!0
1462
+ }));
1463
+ for (t = 0; i > t; t++)
1464
+ x.find(e, r[t], n);
1465
+ return n = this.pushStack(i > 1 ? x.unique(n) : n), n.selector = this.selector ? this.selector + " " + e : e, n
1466
+ }, has: function(e) {
1467
+ var t, n = x(e, this), r = n.length;
1468
+ return this.filter(function() {
1469
+ for (t = 0; r > t; t++)
1470
+ if (x.contains(this, n[t]))
1471
+ return!0
1472
+ })
1473
+ }, not: function(e) {
1474
+ return this.pushStack(ft(this, e || [], !0))
1475
+ }, filter: function(e) {
1476
+ return this.pushStack(ft(this, e || [], !1))
1477
+ }, is: function(e) {
1478
+ return!!ft(this, "string" == typeof e && ut.test(e) ? x(e) : e || [], !1).length
1479
+ }, closest: function(e, t) {
1480
+ var n, r = 0, i = this.length, o = [], a = ut.test(e) || "string" != typeof e ? x(e, t || this.context) : 0;
1481
+ for (; i > r; r++)
1482
+ for (n = this[r]; n && n !== t; n = n.parentNode)
1483
+ if (11 > n.nodeType && (a ? a.index(n) > -1 : 1 === n.nodeType && x.find.matchesSelector(n, e))) {
1484
+ n = o.push(n);
1485
+ break
1486
+ }
1487
+ return this.pushStack(o.length > 1 ? x.unique(o) : o)
1488
+ }, index: function(e) {
1489
+ return e ? "string" == typeof e ? x.inArray(this[0], x(e)) : x.inArray(e.jquery ? e[0] : e, this) : this[0] && this[0].parentNode ? this.first().prevAll().length : -1
1490
+ }, add: function(e, t) {
1491
+ var n = "string" == typeof e ? x(e, t) : x.makeArray(e && e.nodeType ? [e] : e), r = x.merge(this.get(), n);
1492
+ return this.pushStack(x.unique(r))
1493
+ }, addBack: function(e) {
1494
+ return this.add(null == e ? this.prevObject : this.prevObject.filter(e))
1495
+ }});
1496
+ function pt(e, t) {
1497
+ do
1498
+ e = e[t];
1499
+ while (e && 1 !== e.nodeType);
1500
+ return e
1501
+ }
1502
+ x.each({parent: function(e) {
1503
+ var t = e.parentNode;
1504
+ return t && 11 !== t.nodeType ? t : null
1505
+ }, parents: function(e) {
1506
+ return x.dir(e, "parentNode")
1507
+ }, parentsUntil: function(e, t, n) {
1508
+ return x.dir(e, "parentNode", n)
1509
+ }, next: function(e) {
1510
+ return pt(e, "nextSibling")
1511
+ }, prev: function(e) {
1512
+ return pt(e, "previousSibling")
1513
+ }, nextAll: function(e) {
1514
+ return x.dir(e, "nextSibling")
1515
+ }, prevAll: function(e) {
1516
+ return x.dir(e, "previousSibling")
1517
+ }, nextUntil: function(e, t, n) {
1518
+ return x.dir(e, "nextSibling", n)
1519
+ }, prevUntil: function(e, t, n) {
1520
+ return x.dir(e, "previousSibling", n)
1521
+ }, siblings: function(e) {
1522
+ return x.sibling((e.parentNode || {}).firstChild, e)
1523
+ }, children: function(e) {
1524
+ return x.sibling(e.firstChild)
1525
+ }, contents: function(e) {
1526
+ return x.nodeName(e, "iframe") ? e.contentDocument || e.contentWindow.document : x.merge([], e.childNodes)
1527
+ }}, function(e, t) {
1528
+ x.fn[e] = function(n, r) {
1529
+ var i = x.map(this, t, n);
1530
+ return"Until" !== e.slice(-5) && (r = n), r && "string" == typeof r && (i = x.filter(r, i)), this.length > 1 && (ct[e] || (i = x.unique(i)), lt.test(e) && (i = i.reverse())), this.pushStack(i)
1531
+ }
1532
+ }), x.extend({filter: function(e, t, n) {
1533
+ var r = t[0];
1534
+ return n && (e = ":not(" + e + ")"), 1 === t.length && 1 === r.nodeType ? x.find.matchesSelector(r, e) ? [r] : [] : x.find.matches(e, x.grep(t, function(e) {
1535
+ return 1 === e.nodeType
1536
+ }))
1537
+ }, dir: function(e, n, r) {
1538
+ var i = [], o = e[n];
1539
+ while (o && 9 !== o.nodeType && (r === t || 1 !== o.nodeType || !x(o).is(r)))
1540
+ 1 === o.nodeType && i.push(o), o = o[n];
1541
+ return i
1542
+ }, sibling: function(e, t) {
1543
+ var n = [];
1544
+ for (; e; e = e.nextSibling)
1545
+ 1 === e.nodeType && e !== t && n.push(e);
1546
+ return n
1547
+ }});
1548
+ function ft(e, t, n) {
1549
+ if (x.isFunction(t))
1550
+ return x.grep(e, function(e, r) {
1551
+ return!!t.call(e, r, e) !== n
1552
+ });
1553
+ if (t.nodeType)
1554
+ return x.grep(e, function(e) {
1555
+ return e === t !== n
1556
+ });
1557
+ if ("string" == typeof t) {
1558
+ if (st.test(t))
1559
+ return x.filter(t, e, n);
1560
+ t = x.filter(t, e)
1561
+ }
1562
+ return x.grep(e, function(e) {
1563
+ return x.inArray(e, t) >= 0 !== n
1564
+ })
1565
+ }
1566
+ function dt(e) {
1567
+ var t = ht.split("|"), n = e.createDocumentFragment();
1568
+ if (n.createElement)
1569
+ while (t.length)
1570
+ n.createElement(t.pop());
1571
+ return n
1572
+ }
1573
+ var ht = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video", gt = / jQuery\d+="(?:null|\d+)"/g, mt = RegExp("<(?:" + ht + ")[\\s/>]", "i"), yt = /^\s+/, vt = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi, bt = /<([\w:]+)/, xt = /<tbody/i, wt = /<|&#?\w+;/, Tt = /<(?:script|style|link)/i, Ct = /^(?:checkbox|radio)$/i, Nt = /checked\s*(?:[^=]|=\s*.checked.)/i, kt = /^$|\/(?:java|ecma)script/i, Et = /^true\/(.*)/, St = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g, At = {option: [1, "<select multiple='multiple'>", "</select>"], legend: [1, "<fieldset>", "</fieldset>"], area: [1, "<map>", "</map>"], param: [1, "<object>", "</object>"], thead: [1, "<table>", "</table>"], tr: [2, "<table><tbody>", "</tbody></table>"], col: [2, "<table><tbody></tbody><colgroup>", "</colgroup></table>"], td: [3, "<table><tbody><tr>", "</tr></tbody></table>"], _default: x.support.htmlSerialize ? [0, "", ""] : [1, "X<div>", "</div>"]}, jt = dt(a), Dt = jt.appendChild(a.createElement("div"));
1574
+ At.optgroup = At.option, At.tbody = At.tfoot = At.colgroup = At.caption = At.thead, At.th = At.td, x.fn.extend({text: function(e) {
1575
+ return x.access(this, function(e) {
1576
+ return e === t ? x.text(this) : this.empty().append((this[0] && this[0].ownerDocument || a).createTextNode(e))
1577
+ }, null, e, arguments.length)
1578
+ }, append: function() {
1579
+ return this.domManip(arguments, function(e) {
1580
+ if (1 === this.nodeType || 11 === this.nodeType || 9 === this.nodeType) {
1581
+ var t = Lt(this, e);
1582
+ t.appendChild(e)
1583
+ }
1584
+ })
1585
+ }, prepend: function() {
1586
+ return this.domManip(arguments, function(e) {
1587
+ if (1 === this.nodeType || 11 === this.nodeType || 9 === this.nodeType) {
1588
+ var t = Lt(this, e);
1589
+ t.insertBefore(e, t.firstChild)
1590
+ }
1591
+ })
1592
+ }, before: function() {
1593
+ return this.domManip(arguments, function(e) {
1594
+ this.parentNode && this.parentNode.insertBefore(e, this)
1595
+ })
1596
+ }, after: function() {
1597
+ return this.domManip(arguments, function(e) {
1598
+ this.parentNode && this.parentNode.insertBefore(e, this.nextSibling)
1599
+ })
1600
+ }, remove: function(e, t) {
1601
+ var n, r = e ? x.filter(e, this) : this, i = 0;
1602
+ for (; null != (n = r[i]); i++)
1603
+ t || 1 !== n.nodeType || x.cleanData(Ft(n)), n.parentNode && (t && x.contains(n.ownerDocument, n) && _t(Ft(n, "script")), n.parentNode.removeChild(n));
1604
+ return this
1605
+ }, empty: function() {
1606
+ var e, t = 0;
1607
+ for (; null != (e = this[t]); t++) {
1608
+ 1 === e.nodeType && x.cleanData(Ft(e, !1));
1609
+ while (e.firstChild)
1610
+ e.removeChild(e.firstChild);
1611
+ e.options && x.nodeName(e, "select") && (e.options.length = 0)
1612
+ }
1613
+ return this
1614
+ }, clone: function(e, t) {
1615
+ return e = null == e ? !1 : e, t = null == t ? e : t, this.map(function() {
1616
+ return x.clone(this, e, t)
1617
+ })
1618
+ }, html: function(e) {
1619
+ return x.access(this, function(e) {
1620
+ var n = this[0] || {}, r = 0, i = this.length;
1621
+ if (e === t)
1622
+ return 1 === n.nodeType ? n.innerHTML.replace(gt, "") : t;
1623
+ if (!("string" != typeof e || Tt.test(e) || !x.support.htmlSerialize && mt.test(e) || !x.support.leadingWhitespace && yt.test(e) || At[(bt.exec(e) || ["", ""])[1].toLowerCase()])) {
1624
+ e = e.replace(vt, "<$1></$2>");
1625
+ try {
1626
+ for (; i > r; r++)
1627
+ n = this[r] || {}, 1 === n.nodeType && (x.cleanData(Ft(n, !1)), n.innerHTML = e);
1628
+ n = 0
1629
+ } catch (o) {
1630
+ }
1631
+ }
1632
+ n && this.empty().append(e)
1633
+ }, null, e, arguments.length)
1634
+ }, replaceWith: function() {
1635
+ var e = x.map(this, function(e) {
1636
+ return[e.nextSibling, e.parentNode]
1637
+ }), t = 0;
1638
+ return this.domManip(arguments, function(n) {
1639
+ var r = e[t++], i = e[t++];
1640
+ i && (r && r.parentNode !== i && (r = this.nextSibling), x(this).remove(), i.insertBefore(n, r))
1641
+ }, !0), t ? this : this.remove()
1642
+ }, detach: function(e) {
1643
+ return this.remove(e, !0)
1644
+ }, domManip: function(e, t, n) {
1645
+ e = d.apply([], e);
1646
+ var r, i, o, a, s, l, u = 0, c = this.length, p = this, f = c - 1, h = e[0], g = x.isFunction(h);
1647
+ if (g || !(1 >= c || "string" != typeof h || x.support.checkClone) && Nt.test(h))
1648
+ return this.each(function(r) {
1649
+ var i = p.eq(r);
1650
+ g && (e[0] = h.call(this, r, i.html())), i.domManip(e, t, n)
1651
+ });
1652
+ if (c && (l = x.buildFragment(e, this[0].ownerDocument, !1, !n && this), r = l.firstChild, 1 === l.childNodes.length && (l = r), r)) {
1653
+ for (a = x.map(Ft(l, "script"), Ht), o = a.length; c > u; u++)
1654
+ i = l, u !== f && (i = x.clone(i, !0, !0), o && x.merge(a, Ft(i, "script"))), t.call(this[u], i, u);
1655
+ if (o)
1656
+ for (s = a[a.length - 1].ownerDocument, x.map(a, qt), u = 0; o > u; u++)
1657
+ i = a[u], kt.test(i.type || "") && !x._data(i, "globalEval") && x.contains(s, i) && (i.src ? x._evalUrl(i.src) : x.globalEval((i.text || i.textContent || i.innerHTML || "").replace(St, "")));
1658
+ l = r = null
1659
+ }
1660
+ return this
1661
+ }});
1662
+ function Lt(e, t) {
1663
+ return x.nodeName(e, "table") && x.nodeName(1 === t.nodeType ? t : t.firstChild, "tr") ? e.getElementsByTagName("tbody")[0] || e.appendChild(e.ownerDocument.createElement("tbody")) : e
1664
+ }
1665
+ function Ht(e) {
1666
+ return e.type = (null !== x.find.attr(e, "type")) + "/" + e.type, e
1667
+ }
1668
+ function qt(e) {
1669
+ var t = Et.exec(e.type);
1670
+ return t ? e.type = t[1] : e.removeAttribute("type"), e
1671
+ }
1672
+ function _t(e, t) {
1673
+ var n, r = 0;
1674
+ for (; null != (n = e[r]); r++)
1675
+ x._data(n, "globalEval", !t || x._data(t[r], "globalEval"))
1676
+ }
1677
+ function Mt(e, t) {
1678
+ if (1 === t.nodeType && x.hasData(e)) {
1679
+ var n, r, i, o = x._data(e), a = x._data(t, o), s = o.events;
1680
+ if (s) {
1681
+ delete a.handle, a.events = {};
1682
+ for (n in s)
1683
+ for (r = 0, i = s[n].length; i > r; r++)
1684
+ x.event.add(t, n, s[n][r])
1685
+ }
1686
+ a.data && (a.data = x.extend({}, a.data))
1687
+ }
1688
+ }
1689
+ function Ot(e, t) {
1690
+ var n, r, i;
1691
+ if (1 === t.nodeType) {
1692
+ if (n = t.nodeName.toLowerCase(), !x.support.noCloneEvent && t[x.expando]) {
1693
+ i = x._data(t);
1694
+ for (r in i.events)
1695
+ x.removeEvent(t, r, i.handle);
1696
+ t.removeAttribute(x.expando)
1697
+ }
1698
+ "script" === n && t.text !== e.text ? (Ht(t).text = e.text, qt(t)) : "object" === n ? (t.parentNode && (t.outerHTML = e.outerHTML), x.support.html5Clone && e.innerHTML && !x.trim(t.innerHTML) && (t.innerHTML = e.innerHTML)) : "input" === n && Ct.test(e.type) ? (t.defaultChecked = t.checked = e.checked, t.value !== e.value && (t.value = e.value)) : "option" === n ? t.defaultSelected = t.selected = e.defaultSelected : ("input" === n || "textarea" === n) && (t.defaultValue = e.defaultValue)
1699
+ }
1700
+ }
1701
+ x.each({appendTo: "append", prependTo: "prepend", insertBefore: "before", insertAfter: "after", replaceAll: "replaceWith"}, function(e, t) {
1702
+ x.fn[e] = function(e) {
1703
+ var n, r = 0, i = [], o = x(e), a = o.length - 1;
1704
+ for (; a >= r; r++)
1705
+ n = r === a ? this : this.clone(!0), x(o[r])[t](n), h.apply(i, n.get());
1706
+ return this.pushStack(i)
1707
+ }
1708
+ });
1709
+ function Ft(e, n) {
1710
+ var r, o, a = 0, s = typeof e.getElementsByTagName !== i ? e.getElementsByTagName(n || "*") : typeof e.querySelectorAll !== i ? e.querySelectorAll(n || "*") : t;
1711
+ if (!s)
1712
+ for (s = [], r = e.childNodes || e; null != (o = r[a]); a++)
1713
+ !n || x.nodeName(o, n) ? s.push(o) : x.merge(s, Ft(o, n));
1714
+ return n === t || n && x.nodeName(e, n) ? x.merge([e], s) : s
1715
+ }
1716
+ function Bt(e) {
1717
+ Ct.test(e.type) && (e.defaultChecked = e.checked)
1718
+ }
1719
+ x.extend({clone: function(e, t, n) {
1720
+ var r, i, o, a, s, l = x.contains(e.ownerDocument, e);
1721
+ if (x.support.html5Clone || x.isXMLDoc(e) || !mt.test("<" + e.nodeName + ">") ? o = e.cloneNode(!0) : (Dt.innerHTML = e.outerHTML, Dt.removeChild(o = Dt.firstChild)), !(x.support.noCloneEvent && x.support.noCloneChecked || 1 !== e.nodeType && 11 !== e.nodeType || x.isXMLDoc(e)))
1722
+ for (r = Ft(o), s = Ft(e), a = 0; null != (i = s[a]); ++a)
1723
+ r[a] && Ot(i, r[a]);
1724
+ if (t)
1725
+ if (n)
1726
+ for (s = s || Ft(e), r = r || Ft(o), a = 0; null != (i = s[a]); a++)
1727
+ Mt(i, r[a]);
1728
+ else
1729
+ Mt(e, o);
1730
+ return r = Ft(o, "script"), r.length > 0 && _t(r, !l && Ft(e, "script")), r = s = i = null, o
1731
+ }, buildFragment: function(e, t, n, r) {
1732
+ var i, o, a, s, l, u, c, p = e.length, f = dt(t), d = [], h = 0;
1733
+ for (; p > h; h++)
1734
+ if (o = e[h], o || 0 === o)
1735
+ if ("object" === x.type(o))
1736
+ x.merge(d, o.nodeType ? [o] : o);
1737
+ else if (wt.test(o)) {
1738
+ s = s || f.appendChild(t.createElement("div")), l = (bt.exec(o) || ["", ""])[1].toLowerCase(), c = At[l] || At._default, s.innerHTML = c[1] + o.replace(vt, "<$1></$2>") + c[2], i = c[0];
1739
+ while (i--)
1740
+ s = s.lastChild;
1741
+ if (!x.support.leadingWhitespace && yt.test(o) && d.push(t.createTextNode(yt.exec(o)[0])), !x.support.tbody) {
1742
+ o = "table" !== l || xt.test(o) ? "<table>" !== c[1] || xt.test(o) ? 0 : s : s.firstChild, i = o && o.childNodes.length;
1743
+ while (i--)
1744
+ x.nodeName(u = o.childNodes[i], "tbody") && !u.childNodes.length && o.removeChild(u)
1745
+ }
1746
+ x.merge(d, s.childNodes), s.textContent = "";
1747
+ while (s.firstChild)
1748
+ s.removeChild(s.firstChild);
1749
+ s = f.lastChild
1750
+ } else
1751
+ d.push(t.createTextNode(o));
1752
+ s && f.removeChild(s), x.support.appendChecked || x.grep(Ft(d, "input"), Bt), h = 0;
1753
+ while (o = d[h++])
1754
+ if ((!r || -1 === x.inArray(o, r)) && (a = x.contains(o.ownerDocument, o), s = Ft(f.appendChild(o), "script"), a && _t(s), n)) {
1755
+ i = 0;
1756
+ while (o = s[i++])
1757
+ kt.test(o.type || "") && n.push(o)
1758
+ }
1759
+ return s = null, f
1760
+ }, cleanData: function(e, t) {
1761
+ var n, r, o, a, s = 0, l = x.expando, u = x.cache, c = x.support.deleteExpando, f = x.event.special;
1762
+ for (; null != (n = e[s]); s++)
1763
+ if ((t || x.acceptData(n)) && (o = n[l], a = o && u[o])) {
1764
+ if (a.events)
1765
+ for (r in a.events)
1766
+ f[r] ? x.event.remove(n, r) : x.removeEvent(n, r, a.handle);
1767
+ u[o] && (delete u[o], c ? delete n[l] : typeof n.removeAttribute !== i ? n.removeAttribute(l) : n[l] = null, p.push(o))
1768
+ }
1769
+ }, _evalUrl: function(e) {
1770
+ return x.ajax({url: e, type: "GET", dataType: "script", async: !1, global: !1, "throws": !0})
1771
+ }}), x.fn.extend({wrapAll: function(e) {
1772
+ if (x.isFunction(e))
1773
+ return this.each(function(t) {
1774
+ x(this).wrapAll(e.call(this, t))
1775
+ });
1776
+ if (this[0]) {
1777
+ var t = x(e, this[0].ownerDocument).eq(0).clone(!0);
1778
+ this[0].parentNode && t.insertBefore(this[0]), t.map(function() {
1779
+ var e = this;
1780
+ while (e.firstChild && 1 === e.firstChild.nodeType)
1781
+ e = e.firstChild;
1782
+ return e
1783
+ }).append(this)
1784
+ }
1785
+ return this
1786
+ }, wrapInner: function(e) {
1787
+ return x.isFunction(e) ? this.each(function(t) {
1788
+ x(this).wrapInner(e.call(this, t))
1789
+ }) : this.each(function() {
1790
+ var t = x(this), n = t.contents();
1791
+ n.length ? n.wrapAll(e) : t.append(e)
1792
+ })
1793
+ }, wrap: function(e) {
1794
+ var t = x.isFunction(e);
1795
+ return this.each(function(n) {
1796
+ x(this).wrapAll(t ? e.call(this, n) : e)
1797
+ })
1798
+ }, unwrap: function() {
1799
+ return this.parent().each(function() {
1800
+ x.nodeName(this, "body") || x(this).replaceWith(this.childNodes)
1801
+ }).end()
1802
+ }});
1803
+ var Pt, Rt, Wt, $t = /alpha\([^)]*\)/i, It = /opacity\s*=\s*([^)]*)/, zt = /^(top|right|bottom|left)$/, Xt = /^(none|table(?!-c[ea]).+)/, Ut = /^margin/, Vt = RegExp("^(" + w + ")(.*)$", "i"), Yt = RegExp("^(" + w + ")(?!px)[a-z%]+$", "i"), Jt = RegExp("^([+-])=(" + w + ")", "i"), Gt = {BODY: "block"}, Qt = {position: "absolute", visibility: "hidden", display: "block"}, Kt = {letterSpacing: 0, fontWeight: 400}, Zt = ["Top", "Right", "Bottom", "Left"], en = ["Webkit", "O", "Moz", "ms"];
1804
+ function tn(e, t) {
1805
+ if (t in e)
1806
+ return t;
1807
+ var n = t.charAt(0).toUpperCase() + t.slice(1), r = t, i = en.length;
1808
+ while (i--)
1809
+ if (t = en[i] + n, t in e)
1810
+ return t;
1811
+ return r
1812
+ }
1813
+ function nn(e, t) {
1814
+ return e = t || e, "none" === x.css(e, "display") || !x.contains(e.ownerDocument, e)
1815
+ }
1816
+ function rn(e, t) {
1817
+ var n, r, i, o = [], a = 0, s = e.length;
1818
+ for (; s > a; a++)
1819
+ r = e[a], r.style && (o[a] = x._data(r, "olddisplay"), n = r.style.display, t ? (o[a] || "none" !== n || (r.style.display = ""), "" === r.style.display && nn(r) && (o[a] = x._data(r, "olddisplay", ln(r.nodeName)))) : o[a] || (i = nn(r), (n && "none" !== n || !i) && x._data(r, "olddisplay", i ? n : x.css(r, "display"))));
1820
+ for (a = 0; s > a; a++)
1821
+ r = e[a], r.style && (t && "none" !== r.style.display && "" !== r.style.display || (r.style.display = t ? o[a] || "" : "none"));
1822
+ return e
1823
+ }
1824
+ x.fn.extend({css: function(e, n) {
1825
+ return x.access(this, function(e, n, r) {
1826
+ var i, o, a = {}, s = 0;
1827
+ if (x.isArray(n)) {
1828
+ for (o = Rt(e), i = n.length; i > s; s++)
1829
+ a[n[s]] = x.css(e, n[s], !1, o);
1830
+ return a
1831
+ }
1832
+ return r !== t ? x.style(e, n, r) : x.css(e, n)
1833
+ }, e, n, arguments.length > 1)
1834
+ }, show: function() {
1835
+ return rn(this, !0)
1836
+ }, hide: function() {
1837
+ return rn(this)
1838
+ }, toggle: function(e) {
1839
+ return"boolean" == typeof e ? e ? this.show() : this.hide() : this.each(function() {
1840
+ nn(this) ? x(this).show() : x(this).hide()
1841
+ })
1842
+ }}), x.extend({cssHooks: {opacity: {get: function(e, t) {
1843
+ if (t) {
1844
+ var n = Wt(e, "opacity");
1845
+ return"" === n ? "1" : n
1846
+ }
1847
+ }}}, cssNumber: {columnCount: !0, fillOpacity: !0, fontWeight: !0, lineHeight: !0, opacity: !0, order: !0, orphans: !0, widows: !0, zIndex: !0, zoom: !0}, cssProps: {"float": x.support.cssFloat ? "cssFloat" : "styleFloat"}, style: function(e, n, r, i) {
1848
+ if (e && 3 !== e.nodeType && 8 !== e.nodeType && e.style) {
1849
+ var o, a, s, l = x.camelCase(n), u = e.style;
1850
+ if (n = x.cssProps[l] || (x.cssProps[l] = tn(u, l)), s = x.cssHooks[n] || x.cssHooks[l], r === t)
1851
+ return s && "get"in s && (o = s.get(e, !1, i)) !== t ? o : u[n];
1852
+ if (a = typeof r, "string" === a && (o = Jt.exec(r)) && (r = (o[1] + 1) * o[2] + parseFloat(x.css(e, n)), a = "number"), !(null == r || "number" === a && isNaN(r) || ("number" !== a || x.cssNumber[l] || (r += "px"), x.support.clearCloneStyle || "" !== r || 0 !== n.indexOf("background") || (u[n] = "inherit"), s && "set"in s && (r = s.set(e, r, i)) === t)))
1853
+ try {
1854
+ u[n] = r
1855
+ } catch (c) {
1856
+ }
1857
+ }
1858
+ }, css: function(e, n, r, i) {
1859
+ var o, a, s, l = x.camelCase(n);
1860
+ return n = x.cssProps[l] || (x.cssProps[l] = tn(e.style, l)), s = x.cssHooks[n] || x.cssHooks[l], s && "get"in s && (a = s.get(e, !0, r)), a === t && (a = Wt(e, n, i)), "normal" === a && n in Kt && (a = Kt[n]), "" === r || r ? (o = parseFloat(a), r === !0 || x.isNumeric(o) ? o || 0 : a) : a
1861
+ }}), e.getComputedStyle ? (Rt = function(t) {
1862
+ return e.getComputedStyle(t, null)
1863
+ }, Wt = function(e, n, r) {
1864
+ var i, o, a, s = r || Rt(e), l = s ? s.getPropertyValue(n) || s[n] : t, u = e.style;
1865
+ return s && ("" !== l || x.contains(e.ownerDocument, e) || (l = x.style(e, n)), Yt.test(l) && Ut.test(n) && (i = u.width, o = u.minWidth, a = u.maxWidth, u.minWidth = u.maxWidth = u.width = l, l = s.width, u.width = i, u.minWidth = o, u.maxWidth = a)), l
1866
+ }) : a.documentElement.currentStyle && (Rt = function(e) {
1867
+ return e.currentStyle
1868
+ }, Wt = function(e, n, r) {
1869
+ var i, o, a, s = r || Rt(e), l = s ? s[n] : t, u = e.style;
1870
+ return null == l && u && u[n] && (l = u[n]), Yt.test(l) && !zt.test(n) && (i = u.left, o = e.runtimeStyle, a = o && o.left, a && (o.left = e.currentStyle.left), u.left = "fontSize" === n ? "1em" : l, l = u.pixelLeft + "px", u.left = i, a && (o.left = a)), "" === l ? "auto" : l
1871
+ });
1872
+ function on(e, t, n) {
1873
+ var r = Vt.exec(t);
1874
+ return r ? Math.max(0, r[1] - (n || 0)) + (r[2] || "px") : t
1875
+ }
1876
+ function an(e, t, n, r, i) {
1877
+ var o = n === (r ? "border" : "content") ? 4 : "width" === t ? 1 : 0, a = 0;
1878
+ for (; 4 > o; o += 2)
1879
+ "margin" === n && (a += x.css(e, n + Zt[o], !0, i)), r ? ("content" === n && (a -= x.css(e, "padding" + Zt[o], !0, i)), "margin" !== n && (a -= x.css(e, "border" + Zt[o] + "Width", !0, i))) : (a += x.css(e, "padding" + Zt[o], !0, i), "padding" !== n && (a += x.css(e, "border" + Zt[o] + "Width", !0, i)));
1880
+ return a
1881
+ }
1882
+ function sn(e, t, n) {
1883
+ var r = !0, i = "width" === t ? e.offsetWidth : e.offsetHeight, o = Rt(e), a = x.support.boxSizing && "border-box" === x.css(e, "boxSizing", !1, o);
1884
+ if (0 >= i || null == i) {
1885
+ if (i = Wt(e, t, o), (0 > i || null == i) && (i = e.style[t]), Yt.test(i))
1886
+ return i;
1887
+ r = a && (x.support.boxSizingReliable || i === e.style[t]), i = parseFloat(i) || 0
1888
+ }
1889
+ return i + an(e, t, n || (a ? "border" : "content"), r, o) + "px"
1890
+ }
1891
+ function ln(e) {
1892
+ var t = a, n = Gt[e];
1893
+ return n || (n = un(e, t), "none" !== n && n || (Pt = (Pt || x("<iframe frameborder='0' width='0' height='0'/>").css("cssText", "display:block !important")).appendTo(t.documentElement), t = (Pt[0].contentWindow || Pt[0].contentDocument).document, t.write("<!doctype html><html><body>"), t.close(), n = un(e, t), Pt.detach()), Gt[e] = n), n
1894
+ }
1895
+ function un(e, t) {
1896
+ var n = x(t.createElement(e)).appendTo(t.body), r = x.css(n[0], "display");
1897
+ return n.remove(), r
1898
+ }
1899
+ x.each(["height", "width"], function(e, n) {
1900
+ x.cssHooks[n] = {get: function(e, r, i) {
1901
+ return r ? 0 === e.offsetWidth && Xt.test(x.css(e, "display")) ? x.swap(e, Qt, function() {
1902
+ return sn(e, n, i)
1903
+ }) : sn(e, n, i) : t
1904
+ }, set: function(e, t, r) {
1905
+ var i = r && Rt(e);
1906
+ return on(e, t, r ? an(e, n, r, x.support.boxSizing && "border-box" === x.css(e, "boxSizing", !1, i), i) : 0)
1907
+ }}
1908
+ }), x.support.opacity || (x.cssHooks.opacity = {get: function(e, t) {
1909
+ return It.test((t && e.currentStyle ? e.currentStyle.filter : e.style.filter) || "") ? .01 * parseFloat(RegExp.$1) + "" : t ? "1" : ""
1910
+ }, set: function(e, t) {
1911
+ var n = e.style, r = e.currentStyle, i = x.isNumeric(t) ? "alpha(opacity=" + 100 * t + ")" : "", o = r && r.filter || n.filter || "";
1912
+ n.zoom = 1, (t >= 1 || "" === t) && "" === x.trim(o.replace($t, "")) && n.removeAttribute && (n.removeAttribute("filter"), "" === t || r && !r.filter) || (n.filter = $t.test(o) ? o.replace($t, i) : o + " " + i)
1913
+ }}), x(function() {
1914
+ x.support.reliableMarginRight || (x.cssHooks.marginRight = {get: function(e, n) {
1915
+ return n ? x.swap(e, {display: "inline-block"}, Wt, [e, "marginRight"]) : t
1916
+ }}), !x.support.pixelPosition && x.fn.position && x.each(["top", "left"], function(e, n) {
1917
+ x.cssHooks[n] = {get: function(e, r) {
1918
+ return r ? (r = Wt(e, n), Yt.test(r) ? x(e).position()[n] + "px" : r) : t
1919
+ }}
1920
+ })
1921
+ }), x.expr && x.expr.filters && (x.expr.filters.hidden = function(e) {
1922
+ return 0 >= e.offsetWidth && 0 >= e.offsetHeight || !x.support.reliableHiddenOffsets && "none" === (e.style && e.style.display || x.css(e, "display"))
1923
+ }, x.expr.filters.visible = function(e) {
1924
+ return!x.expr.filters.hidden(e)
1925
+ }), x.each({margin: "", padding: "", border: "Width"}, function(e, t) {
1926
+ x.cssHooks[e + t] = {expand: function(n) {
1927
+ var r = 0, i = {}, o = "string" == typeof n ? n.split(" ") : [n];
1928
+ for (; 4 > r; r++)
1929
+ i[e + Zt[r] + t] = o[r] || o[r - 2] || o[0];
1930
+ return i
1931
+ }}, Ut.test(e) || (x.cssHooks[e + t].set = on)
1932
+ });
1933
+ var cn = /%20/g, pn = /\[\]$/, fn = /\r?\n/g, dn = /^(?:submit|button|image|reset|file)$/i, hn = /^(?:input|select|textarea|keygen)/i;
1934
+ x.fn.extend({serialize: function() {
1935
+ return x.param(this.serializeArray())
1936
+ }, serializeArray: function() {
1937
+ return this.map(function() {
1938
+ var e = x.prop(this, "elements");
1939
+ return e ? x.makeArray(e) : this
1940
+ }).filter(function() {
1941
+ var e = this.type;
1942
+ return this.name && !x(this).is(":disabled") && hn.test(this.nodeName) && !dn.test(e) && (this.checked || !Ct.test(e))
1943
+ }).map(function(e, t) {
1944
+ var n = x(this).val();
1945
+ return null == n ? null : x.isArray(n) ? x.map(n, function(e) {
1946
+ return{name: t.name, value: e.replace(fn, "\r\n")}
1947
+ }) : {name: t.name, value: n.replace(fn, "\r\n")}
1948
+ }).get()
1949
+ }}), x.param = function(e, n) {
1950
+ var r, i = [], o = function(e, t) {
1951
+ t = x.isFunction(t) ? t() : null == t ? "" : t, i[i.length] = encodeURIComponent(e) + "=" + encodeURIComponent(t)
1952
+ };
1953
+ if (n === t && (n = x.ajaxSettings && x.ajaxSettings.traditional), x.isArray(e) || e.jquery && !x.isPlainObject(e))
1954
+ x.each(e, function() {
1955
+ o(this.name, this.value)
1956
+ });
1957
+ else
1958
+ for (r in e)
1959
+ gn(r, e[r], n, o);
1960
+ return i.join("&").replace(cn, "+")
1961
+ };
1962
+ function gn(e, t, n, r) {
1963
+ var i;
1964
+ if (x.isArray(t))
1965
+ x.each(t, function(t, i) {
1966
+ n || pn.test(e) ? r(e, i) : gn(e + "[" + ("object" == typeof i ? t : "") + "]", i, n, r)
1967
+ });
1968
+ else if (n || "object" !== x.type(t))
1969
+ r(e, t);
1970
+ else
1971
+ for (i in t)
1972
+ gn(e + "[" + i + "]", t[i], n, r)
1973
+ }
1974
+ x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "), function(e, t) {
1975
+ x.fn[t] = function(e, n) {
1976
+ return arguments.length > 0 ? this.on(t, null, e, n) : this.trigger(t)
1977
+ }
1978
+ }), x.fn.extend({hover: function(e, t) {
1979
+ return this.mouseenter(e).mouseleave(t || e)
1980
+ }, bind: function(e, t, n) {
1981
+ return this.on(e, null, t, n)
1982
+ }, unbind: function(e, t) {
1983
+ return this.off(e, null, t)
1984
+ }, delegate: function(e, t, n, r) {
1985
+ return this.on(t, e, n, r)
1986
+ }, undelegate: function(e, t, n) {
1987
+ return 1 === arguments.length ? this.off(e, "**") : this.off(t, e || "**", n)
1988
+ }});
1989
+ var mn, yn, vn = x.now(), bn = /\?/, xn = /#.*$/, wn = /([?&])_=[^&]*/, Tn = /^(.*?):[ \t]*([^\r\n]*)\r?$/gm, Cn = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/, Nn = /^(?:GET|HEAD)$/, kn = /^\/\//, En = /^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/, Sn = x.fn.load, An = {}, jn = {}, Dn = "*/".concat("*");
1990
+ try {
1991
+ yn = o.href
1992
+ } catch (Ln) {
1993
+ yn = a.createElement("a"), yn.href = "", yn = yn.href
1994
+ }
1995
+ mn = En.exec(yn.toLowerCase()) || [];
1996
+ function Hn(e) {
1997
+ return function(t, n) {
1998
+ "string" != typeof t && (n = t, t = "*");
1999
+ var r, i = 0, o = t.toLowerCase().match(T) || [];
2000
+ if (x.isFunction(n))
2001
+ while (r = o[i++])
2002
+ "+" === r[0] ? (r = r.slice(1) || "*", (e[r] = e[r] || []).unshift(n)) : (e[r] = e[r] || []).push(n)
2003
+ }
2004
+ }
2005
+ function qn(e, n, r, i) {
2006
+ var o = {}, a = e === jn;
2007
+ function s(l) {
2008
+ var u;
2009
+ return o[l] = !0, x.each(e[l] || [], function(e, l) {
2010
+ var c = l(n, r, i);
2011
+ return"string" != typeof c || a || o[c] ? a ? !(u = c) : t : (n.dataTypes.unshift(c), s(c), !1)
2012
+ }), u
2013
+ }
2014
+ return s(n.dataTypes[0]) || !o["*"] && s("*")
2015
+ }
2016
+ function _n(e, n) {
2017
+ var r, i, o = x.ajaxSettings.flatOptions || {};
2018
+ for (i in n)
2019
+ n[i] !== t && ((o[i] ? e : r || (r = {}))[i] = n[i]);
2020
+ return r && x.extend(!0, e, r), e
2021
+ }
2022
+ x.fn.load = function(e, n, r) {
2023
+ if ("string" != typeof e && Sn)
2024
+ return Sn.apply(this, arguments);
2025
+ var i, o, a, s = this, l = e.indexOf(" ");
2026
+ return l >= 0 && (i = e.slice(l, e.length), e = e.slice(0, l)), x.isFunction(n) ? (r = n, n = t) : n && "object" == typeof n && (a = "POST"), s.length > 0 && x.ajax({url: e, type: a, dataType: "html", data: n}).done(function(e) {
2027
+ o = arguments, s.html(i ? x("<div>").append(x.parseHTML(e)).find(i) : e)
2028
+ }).complete(r && function(e, t) {
2029
+ s.each(r, o || [e.responseText, t, e])
2030
+ }), this
2031
+ }, x.each(["ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend"], function(e, t) {
2032
+ x.fn[t] = function(e) {
2033
+ return this.on(t, e)
2034
+ }
2035
+ }), x.extend({active: 0, lastModified: {}, etag: {}, ajaxSettings: {url: yn, type: "GET", isLocal: Cn.test(mn[1]), global: !0, processData: !0, async: !0, contentType: "application/x-www-form-urlencoded; charset=UTF-8", accepts: {"*": Dn, text: "text/plain", html: "text/html", xml: "application/xml, text/xml", json: "application/json, text/javascript"}, contents: {xml: /xml/, html: /html/, json: /json/}, responseFields: {xml: "responseXML", text: "responseText", json: "responseJSON"}, converters: {"* text": String, "text html": !0, "text json": x.parseJSON, "text xml": x.parseXML}, flatOptions: {url: !0, context: !0}}, ajaxSetup: function(e, t) {
2036
+ return t ? _n(_n(e, x.ajaxSettings), t) : _n(x.ajaxSettings, e)
2037
+ }, ajaxPrefilter: Hn(An), ajaxTransport: Hn(jn), ajax: function(e, n) {
2038
+ "object" == typeof e && (n = e, e = t), n = n || {};
2039
+ var r, i, o, a, s, l, u, c, p = x.ajaxSetup({}, n), f = p.context || p, d = p.context && (f.nodeType || f.jquery) ? x(f) : x.event, h = x.Deferred(), g = x.Callbacks("once memory"), m = p.statusCode || {}, y = {}, v = {}, b = 0, w = "canceled", C = {readyState: 0, getResponseHeader: function(e) {
2040
+ var t;
2041
+ if (2 === b) {
2042
+ if (!c) {
2043
+ c = {};
2044
+ while (t = Tn.exec(a))
2045
+ c[t[1].toLowerCase()] = t[2]
2046
+ }
2047
+ t = c[e.toLowerCase()]
2048
+ }
2049
+ return null == t ? null : t
2050
+ }, getAllResponseHeaders: function() {
2051
+ return 2 === b ? a : null
2052
+ }, setRequestHeader: function(e, t) {
2053
+ var n = e.toLowerCase();
2054
+ return b || (e = v[n] = v[n] || e, y[e] = t), this
2055
+ }, overrideMimeType: function(e) {
2056
+ return b || (p.mimeType = e), this
2057
+ }, statusCode: function(e) {
2058
+ var t;
2059
+ if (e)
2060
+ if (2 > b)
2061
+ for (t in e)
2062
+ m[t] = [m[t], e[t]];
2063
+ else
2064
+ C.always(e[C.status]);
2065
+ return this
2066
+ }, abort: function(e) {
2067
+ var t = e || w;
2068
+ return u && u.abort(t), k(0, t), this
2069
+ }};
2070
+ if (h.promise(C).complete = g.add, C.success = C.done, C.error = C.fail, p.url = ((e || p.url || yn) + "").replace(xn, "").replace(kn, mn[1] + "//"), p.type = n.method || n.type || p.method || p.type, p.dataTypes = x.trim(p.dataType || "*").toLowerCase().match(T) || [""], null == p.crossDomain && (r = En.exec(p.url.toLowerCase()), p.crossDomain = !(!r || r[1] === mn[1] && r[2] === mn[2] && (r[3] || ("http:" === r[1] ? "80" : "443")) === (mn[3] || ("http:" === mn[1] ? "80" : "443")))), p.data && p.processData && "string" != typeof p.data && (p.data = x.param(p.data, p.traditional)), qn(An, p, n, C), 2 === b)
2071
+ return C;
2072
+ l = p.global, l && 0 === x.active++ && x.event.trigger("ajaxStart"), p.type = p.type.toUpperCase(), p.hasContent = !Nn.test(p.type), o = p.url, p.hasContent || (p.data && (o = p.url += (bn.test(o) ? "&" : "?") + p.data, delete p.data), p.cache === !1 && (p.url = wn.test(o) ? o.replace(wn, "$1_=" + vn++) : o + (bn.test(o) ? "&" : "?") + "_=" + vn++)), p.ifModified && (x.lastModified[o] && C.setRequestHeader("If-Modified-Since", x.lastModified[o]), x.etag[o] && C.setRequestHeader("If-None-Match", x.etag[o])), (p.data && p.hasContent && p.contentType !== !1 || n.contentType) && C.setRequestHeader("Content-Type", p.contentType), C.setRequestHeader("Accept", p.dataTypes[0] && p.accepts[p.dataTypes[0]] ? p.accepts[p.dataTypes[0]] + ("*" !== p.dataTypes[0] ? ", " + Dn + "; q=0.01" : "") : p.accepts["*"]);
2073
+ for (i in p.headers)
2074
+ C.setRequestHeader(i, p.headers[i]);
2075
+ if (p.beforeSend && (p.beforeSend.call(f, C, p) === !1 || 2 === b))
2076
+ return C.abort();
2077
+ w = "abort";
2078
+ for (i in{success:1, error:1, complete:1})
2079
+ C[i](p[i]);
2080
+ if (u = qn(jn, p, n, C)) {
2081
+ C.readyState = 1, l && d.trigger("ajaxSend", [C, p]), p.async && p.timeout > 0 && (s = setTimeout(function() {
2082
+ C.abort("timeout")
2083
+ }, p.timeout));
2084
+ try {
2085
+ b = 1, u.send(y, k)
2086
+ } catch (N) {
2087
+ if (!(2 > b))
2088
+ throw N;
2089
+ k(-1, N)
2090
+ }
2091
+ } else
2092
+ k(-1, "No Transport");
2093
+ function k(e, n, r, i) {
2094
+ var c, y, v, w, T, N = n;
2095
+ 2 !== b && (b = 2, s && clearTimeout(s), u = t, a = i || "", C.readyState = e > 0 ? 4 : 0, c = e >= 200 && 300 > e || 304 === e, r && (w = Mn(p, C, r)), w = On(p, w, C, c), c ? (p.ifModified && (T = C.getResponseHeader("Last-Modified"), T && (x.lastModified[o] = T), T = C.getResponseHeader("etag"), T && (x.etag[o] = T)), 204 === e || "HEAD" === p.type ? N = "nocontent" : 304 === e ? N = "notmodified" : (N = w.state, y = w.data, v = w.error, c = !v)) : (v = N, (e || !N) && (N = "error", 0 > e && (e = 0))), C.status = e, C.statusText = (n || N) + "", c ? h.resolveWith(f, [y, N, C]) : h.rejectWith(f, [C, N, v]), C.statusCode(m), m = t, l && d.trigger(c ? "ajaxSuccess" : "ajaxError", [C, p, c ? y : v]), g.fireWith(f, [C, N]), l && (d.trigger("ajaxComplete", [C, p]), --x.active || x.event.trigger("ajaxStop")))
2096
+ }
2097
+ return C
2098
+ }, getJSON: function(e, t, n) {
2099
+ return x.get(e, t, n, "json")
2100
+ }, getScript: function(e, n) {
2101
+ return x.get(e, t, n, "script")
2102
+ }}), x.each(["get", "post"], function(e, n) {
2103
+ x[n] = function(e, r, i, o) {
2104
+ return x.isFunction(r) && (o = o || i, i = r, r = t), x.ajax({url: e, type: n, dataType: o, data: r, success: i})
2105
+ }
2106
+ });
2107
+ function Mn(e, n, r) {
2108
+ var i, o, a, s, l = e.contents, u = e.dataTypes;
2109
+ while ("*" === u[0])
2110
+ u.shift(), o === t && (o = e.mimeType || n.getResponseHeader("Content-Type"));
2111
+ if (o)
2112
+ for (s in l)
2113
+ if (l[s] && l[s].test(o)) {
2114
+ u.unshift(s);
2115
+ break
2116
+ }
2117
+ if (u[0]in r)
2118
+ a = u[0];
2119
+ else {
2120
+ for (s in r) {
2121
+ if (!u[0] || e.converters[s + " " + u[0]]) {
2122
+ a = s;
2123
+ break
2124
+ }
2125
+ i || (i = s)
2126
+ }
2127
+ a = a || i
2128
+ }
2129
+ return a ? (a !== u[0] && u.unshift(a), r[a]) : t
2130
+ }
2131
+ function On(e, t, n, r) {
2132
+ var i, o, a, s, l, u = {}, c = e.dataTypes.slice();
2133
+ if (c[1])
2134
+ for (a in e.converters)
2135
+ u[a.toLowerCase()] = e.converters[a];
2136
+ o = c.shift();
2137
+ while (o)
2138
+ if (e.responseFields[o] && (n[e.responseFields[o]] = t), !l && r && e.dataFilter && (t = e.dataFilter(t, e.dataType)), l = o, o = c.shift())
2139
+ if ("*" === o)
2140
+ o = l;
2141
+ else if ("*" !== l && l !== o) {
2142
+ if (a = u[l + " " + o] || u["* " + o], !a)
2143
+ for (i in u)
2144
+ if (s = i.split(" "), s[1] === o && (a = u[l + " " + s[0]] || u["* " + s[0]])) {
2145
+ a === !0 ? a = u[i] : u[i] !== !0 && (o = s[0], c.unshift(s[1]));
2146
+ break
2147
+ }
2148
+ if (a !== !0)
2149
+ if (a && e["throws"])
2150
+ t = a(t);
2151
+ else
2152
+ try {
2153
+ t = a(t)
2154
+ } catch (p) {
2155
+ return{state: "parsererror", error: a ? p : "No conversion from " + l + " to " + o}
2156
+ }
2157
+ }
2158
+ return{state: "success", data: t}
2159
+ }
2160
+ x.ajaxSetup({accepts: {script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"}, contents: {script: /(?:java|ecma)script/}, converters: {"text script": function(e) {
2161
+ return x.globalEval(e), e
2162
+ }}}), x.ajaxPrefilter("script", function(e) {
2163
+ e.cache === t && (e.cache = !1), e.crossDomain && (e.type = "GET", e.global = !1)
2164
+ }), x.ajaxTransport("script", function(e) {
2165
+ if (e.crossDomain) {
2166
+ var n, r = a.head || x("head")[0] || a.documentElement;
2167
+ return{send: function(t, i) {
2168
+ n = a.createElement("script"), n.async = !0, e.scriptCharset && (n.charset = e.scriptCharset), n.src = e.url, n.onload = n.onreadystatechange = function(e, t) {
2169
+ (t || !n.readyState || /loaded|complete/.test(n.readyState)) && (n.onload = n.onreadystatechange = null, n.parentNode && n.parentNode.removeChild(n), n = null, t || i(200, "success"))
2170
+ }, r.insertBefore(n, r.firstChild)
2171
+ }, abort: function() {
2172
+ n && n.onload(t, !0)
2173
+ }}
2174
+ }
2175
+ });
2176
+ var Fn = [], Bn = /(=)\?(?=&|$)|\?\?/;
2177
+ x.ajaxSetup({jsonp: "callback", jsonpCallback: function() {
2178
+ var e = Fn.pop() || x.expando + "_" + vn++;
2179
+ return this[e] = !0, e
2180
+ }}), x.ajaxPrefilter("json jsonp", function(n, r, i) {
2181
+ var o, a, s, l = n.jsonp !== !1 && (Bn.test(n.url) ? "url" : "string" == typeof n.data && !(n.contentType || "").indexOf("application/x-www-form-urlencoded") && Bn.test(n.data) && "data");
2182
+ return l || "jsonp" === n.dataTypes[0] ? (o = n.jsonpCallback = x.isFunction(n.jsonpCallback) ? n.jsonpCallback() : n.jsonpCallback, l ? n[l] = n[l].replace(Bn, "$1" + o) : n.jsonp !== !1 && (n.url += (bn.test(n.url) ? "&" : "?") + n.jsonp + "=" + o), n.converters["script json"] = function() {
2183
+ return s || x.error(o + " was not called"), s[0]
2184
+ }, n.dataTypes[0] = "json", a = e[o], e[o] = function() {
2185
+ s = arguments
2186
+ }, i.always(function() {
2187
+ e[o] = a, n[o] && (n.jsonpCallback = r.jsonpCallback, Fn.push(o)), s && x.isFunction(a) && a(s[0]), s = a = t
2188
+ }), "script") : t
2189
+ });
2190
+ var Pn, Rn, Wn = 0, $n = e.ActiveXObject && function() {
2191
+ var e;
2192
+ for (e in Pn)
2193
+ Pn[e](t, !0)
2194
+ };
2195
+ function In() {
2196
+ try {
2197
+ return new e.XMLHttpRequest
2198
+ } catch (t) {
2199
+ }
2200
+ }
2201
+ function zn() {
2202
+ try {
2203
+ return new e.ActiveXObject("Microsoft.XMLHTTP")
2204
+ } catch (t) {
2205
+ }
2206
+ }
2207
+ x.ajaxSettings.xhr = e.ActiveXObject ? function() {
2208
+ return!this.isLocal && In() || zn()
2209
+ } : In, Rn = x.ajaxSettings.xhr(), x.support.cors = !!Rn && "withCredentials"in Rn, Rn = x.support.ajax = !!Rn, Rn && x.ajaxTransport(function(n) {
2210
+ if (!n.crossDomain || x.support.cors) {
2211
+ var r;
2212
+ return{send: function(i, o) {
2213
+ var a, s, l = n.xhr();
2214
+ if (n.username ? l.open(n.type, n.url, n.async, n.username, n.password) : l.open(n.type, n.url, n.async), n.xhrFields)
2215
+ for (s in n.xhrFields)
2216
+ l[s] = n.xhrFields[s];
2217
+ n.mimeType && l.overrideMimeType && l.overrideMimeType(n.mimeType), n.crossDomain || i["X-Requested-With"] || (i["X-Requested-With"] = "XMLHttpRequest");
2218
+ try {
2219
+ for (s in i)
2220
+ l.setRequestHeader(s, i[s])
2221
+ } catch (u) {
2222
+ }
2223
+ l.send(n.hasContent && n.data || null), r = function(e, i) {
2224
+ var s, u, c, p;
2225
+ try {
2226
+ if (r && (i || 4 === l.readyState))
2227
+ if (r = t, a && (l.onreadystatechange = x.noop, $n && delete Pn[a]), i)
2228
+ 4 !== l.readyState && l.abort();
2229
+ else {
2230
+ p = {}, s = l.status, u = l.getAllResponseHeaders(), "string" == typeof l.responseText && (p.text = l.responseText);
2231
+ try {
2232
+ c = l.statusText
2233
+ } catch (f) {
2234
+ c = ""
2235
+ }
2236
+ s || !n.isLocal || n.crossDomain ? 1223 === s && (s = 204) : s = p.text ? 200 : 404
2237
+ }
2238
+ } catch (d) {
2239
+ i || o(-1, d)
2240
+ }
2241
+ p && o(s, c, p, u)
2242
+ }, n.async ? 4 === l.readyState ? setTimeout(r) : (a = ++Wn, $n && (Pn || (Pn = {}, x(e).unload($n)), Pn[a] = r), l.onreadystatechange = r) : r()
2243
+ }, abort: function() {
2244
+ r && r(t, !0)
2245
+ }}
2246
+ }
2247
+ });
2248
+ var Xn, Un, Vn = /^(?:toggle|show|hide)$/, Yn = RegExp("^(?:([+-])=|)(" + w + ")([a-z%]*)$", "i"), Jn = /queueHooks$/, Gn = [nr], Qn = {"*": [function(e, t) {
2249
+ var n = this.createTween(e, t), r = n.cur(), i = Yn.exec(t), o = i && i[3] || (x.cssNumber[e] ? "" : "px"), a = (x.cssNumber[e] || "px" !== o && +r) && Yn.exec(x.css(n.elem, e)), s = 1, l = 20;
2250
+ if (a && a[3] !== o) {
2251
+ o = o || a[3], i = i || [], a = +r || 1;
2252
+ do
2253
+ s = s || ".5", a /= s, x.style(n.elem, e, a + o);
2254
+ while (s !== (s = n.cur() / r) && 1 !== s && --l)
2255
+ }
2256
+ return i && (a = n.start = +a || +r || 0, n.unit = o, n.end = i[1] ? a + (i[1] + 1) * i[2] : +i[2]), n
2257
+ }]};
2258
+ function Kn() {
2259
+ return setTimeout(function() {
2260
+ Xn = t
2261
+ }), Xn = x.now()
2262
+ }
2263
+ function Zn(e, t, n) {
2264
+ var r, i = (Qn[t] || []).concat(Qn["*"]), o = 0, a = i.length;
2265
+ for (; a > o; o++)
2266
+ if (r = i[o].call(n, t, e))
2267
+ return r
2268
+ }
2269
+ function er(e, t, n) {
2270
+ var r, i, o = 0, a = Gn.length, s = x.Deferred().always(function() {
2271
+ delete l.elem
2272
+ }), l = function() {
2273
+ if (i)
2274
+ return!1;
2275
+ var t = Xn || Kn(), n = Math.max(0, u.startTime + u.duration - t), r = n / u.duration || 0, o = 1 - r, a = 0, l = u.tweens.length;
2276
+ for (; l > a; a++)
2277
+ u.tweens[a].run(o);
2278
+ return s.notifyWith(e, [u, o, n]), 1 > o && l ? n : (s.resolveWith(e, [u]), !1)
2279
+ }, u = s.promise({elem: e, props: x.extend({}, t), opts: x.extend(!0, {specialEasing: {}}, n), originalProperties: t, originalOptions: n, startTime: Xn || Kn(), duration: n.duration, tweens: [], createTween: function(t, n) {
2280
+ var r = x.Tween(e, u.opts, t, n, u.opts.specialEasing[t] || u.opts.easing);
2281
+ return u.tweens.push(r), r
2282
+ }, stop: function(t) {
2283
+ var n = 0, r = t ? u.tweens.length : 0;
2284
+ if (i)
2285
+ return this;
2286
+ for (i = !0; r > n; n++)
2287
+ u.tweens[n].run(1);
2288
+ return t ? s.resolveWith(e, [u, t]) : s.rejectWith(e, [u, t]), this
2289
+ }}), c = u.props;
2290
+ for (tr(c, u.opts.specialEasing); a > o; o++)
2291
+ if (r = Gn[o].call(u, e, c, u.opts))
2292
+ return r;
2293
+ return x.map(c, Zn, u), x.isFunction(u.opts.start) && u.opts.start.call(e, u), x.fx.timer(x.extend(l, {elem: e, anim: u, queue: u.opts.queue})), u.progress(u.opts.progress).done(u.opts.done, u.opts.complete).fail(u.opts.fail).always(u.opts.always)
2294
+ }
2295
+ function tr(e, t) {
2296
+ var n, r, i, o, a;
2297
+ for (n in e)
2298
+ if (r = x.camelCase(n), i = t[r], o = e[n], x.isArray(o) && (i = o[1], o = e[n] = o[0]), n !== r && (e[r] = o, delete e[n]), a = x.cssHooks[r], a && "expand"in a) {
2299
+ o = a.expand(o), delete e[r];
2300
+ for (n in o)
2301
+ n in e || (e[n] = o[n], t[n] = i)
2302
+ } else
2303
+ t[r] = i
2304
+ }
2305
+ x.Animation = x.extend(er, {tweener: function(e, t) {
2306
+ x.isFunction(e) ? (t = e, e = ["*"]) : e = e.split(" ");
2307
+ var n, r = 0, i = e.length;
2308
+ for (; i > r; r++)
2309
+ n = e[r], Qn[n] = Qn[n] || [], Qn[n].unshift(t)
2310
+ }, prefilter: function(e, t) {
2311
+ t ? Gn.unshift(e) : Gn.push(e)
2312
+ }});
2313
+ function nr(e, t, n) {
2314
+ var r, i, o, a, s, l, u = this, c = {}, p = e.style, f = e.nodeType && nn(e), d = x._data(e, "fxshow");
2315
+ n.queue || (s = x._queueHooks(e, "fx"), null == s.unqueued && (s.unqueued = 0, l = s.empty.fire, s.empty.fire = function() {
2316
+ s.unqueued || l()
2317
+ }), s.unqueued++, u.always(function() {
2318
+ u.always(function() {
2319
+ s.unqueued--, x.queue(e, "fx").length || s.empty.fire()
2320
+ })
2321
+ })), 1 === e.nodeType && ("height"in t || "width"in t) && (n.overflow = [p.overflow, p.overflowX, p.overflowY], "inline" === x.css(e, "display") && "none" === x.css(e, "float") && (x.support.inlineBlockNeedsLayout && "inline" !== ln(e.nodeName) ? p.zoom = 1 : p.display = "inline-block")), n.overflow && (p.overflow = "hidden", x.support.shrinkWrapBlocks || u.always(function() {
2322
+ p.overflow = n.overflow[0], p.overflowX = n.overflow[1], p.overflowY = n.overflow[2]
2323
+ }));
2324
+ for (r in t)
2325
+ if (i = t[r], Vn.exec(i)) {
2326
+ if (delete t[r], o = o || "toggle" === i, i === (f ? "hide" : "show"))
2327
+ continue;
2328
+ c[r] = d && d[r] || x.style(e, r)
2329
+ }
2330
+ if (!x.isEmptyObject(c)) {
2331
+ d ? "hidden"in d && (f = d.hidden) : d = x._data(e, "fxshow", {}), o && (d.hidden = !f), f ? x(e).show() : u.done(function() {
2332
+ x(e).hide()
2333
+ }), u.done(function() {
2334
+ var t;
2335
+ x._removeData(e, "fxshow");
2336
+ for (t in c)
2337
+ x.style(e, t, c[t])
2338
+ });
2339
+ for (r in c)
2340
+ a = Zn(f ? d[r] : 0, r, u), r in d || (d[r] = a.start, f && (a.end = a.start, a.start = "width" === r || "height" === r ? 1 : 0))
2341
+ }
2342
+ }
2343
+ function rr(e, t, n, r, i) {
2344
+ return new rr.prototype.init(e, t, n, r, i)
2345
+ }
2346
+ x.Tween = rr, rr.prototype = {constructor: rr, init: function(e, t, n, r, i, o) {
2347
+ this.elem = e, this.prop = n, this.easing = i || "swing", this.options = t, this.start = this.now = this.cur(), this.end = r, this.unit = o || (x.cssNumber[n] ? "" : "px")
2348
+ }, cur: function() {
2349
+ var e = rr.propHooks[this.prop];
2350
+ return e && e.get ? e.get(this) : rr.propHooks._default.get(this)
2351
+ }, run: function(e) {
2352
+ var t, n = rr.propHooks[this.prop];
2353
+ return this.pos = t = this.options.duration ? x.easing[this.easing](e, this.options.duration * e, 0, 1, this.options.duration) : e, this.now = (this.end - this.start) * t + this.start, this.options.step && this.options.step.call(this.elem, this.now, this), n && n.set ? n.set(this) : rr.propHooks._default.set(this), this
2354
+ }}, rr.prototype.init.prototype = rr.prototype, rr.propHooks = {_default: {get: function(e) {
2355
+ var t;
2356
+ return null == e.elem[e.prop] || e.elem.style && null != e.elem.style[e.prop] ? (t = x.css(e.elem, e.prop, ""), t && "auto" !== t ? t : 0) : e.elem[e.prop]
2357
+ }, set: function(e) {
2358
+ x.fx.step[e.prop] ? x.fx.step[e.prop](e) : e.elem.style && (null != e.elem.style[x.cssProps[e.prop]] || x.cssHooks[e.prop]) ? x.style(e.elem, e.prop, e.now + e.unit) : e.elem[e.prop] = e.now
2359
+ }}}, rr.propHooks.scrollTop = rr.propHooks.scrollLeft = {set: function(e) {
2360
+ e.elem.nodeType && e.elem.parentNode && (e.elem[e.prop] = e.now)
2361
+ }}, x.each(["toggle", "show", "hide"], function(e, t) {
2362
+ var n = x.fn[t];
2363
+ x.fn[t] = function(e, r, i) {
2364
+ return null == e || "boolean" == typeof e ? n.apply(this, arguments) : this.animate(ir(t, !0), e, r, i)
2365
+ }
2366
+ }), x.fn.extend({fadeTo: function(e, t, n, r) {
2367
+ return this.filter(nn).css("opacity", 0).show().end().animate({opacity: t}, e, n, r)
2368
+ }, animate: function(e, t, n, r) {
2369
+ var i = x.isEmptyObject(e), o = x.speed(t, n, r), a = function() {
2370
+ var t = er(this, x.extend({}, e), o);
2371
+ (i || x._data(this, "finish")) && t.stop(!0)
2372
+ };
2373
+ return a.finish = a, i || o.queue === !1 ? this.each(a) : this.queue(o.queue, a)
2374
+ }, stop: function(e, n, r) {
2375
+ var i = function(e) {
2376
+ var t = e.stop;
2377
+ delete e.stop, t(r)
2378
+ };
2379
+ return"string" != typeof e && (r = n, n = e, e = t), n && e !== !1 && this.queue(e || "fx", []), this.each(function() {
2380
+ var t = !0, n = null != e && e + "queueHooks", o = x.timers, a = x._data(this);
2381
+ if (n)
2382
+ a[n] && a[n].stop && i(a[n]);
2383
+ else
2384
+ for (n in a)
2385
+ a[n] && a[n].stop && Jn.test(n) && i(a[n]);
2386
+ for (n = o.length; n--; )
2387
+ o[n].elem !== this || null != e && o[n].queue !== e || (o[n].anim.stop(r), t = !1, o.splice(n, 1));
2388
+ (t || !r) && x.dequeue(this, e)
2389
+ })
2390
+ }, finish: function(e) {
2391
+ return e !== !1 && (e = e || "fx"), this.each(function() {
2392
+ var t, n = x._data(this), r = n[e + "queue"], i = n[e + "queueHooks"], o = x.timers, a = r ? r.length : 0;
2393
+ for (n.finish = !0, x.queue(this, e, []), i && i.stop && i.stop.call(this, !0), t = o.length; t--; )
2394
+ o[t].elem === this && o[t].queue === e && (o[t].anim.stop(!0), o.splice(t, 1));
2395
+ for (t = 0; a > t; t++)
2396
+ r[t] && r[t].finish && r[t].finish.call(this);
2397
+ delete n.finish
2398
+ })
2399
+ }});
2400
+ function ir(e, t) {
2401
+ var n, r = {height: e}, i = 0;
2402
+ for (t = t?1:0; 4 > i; i += 2 - t)
2403
+ n = Zt[i], r["margin" + n] = r["padding" + n] = e;
2404
+ return t && (r.opacity = r.width = e), r
2405
+ }
2406
+ x.each({slideDown: ir("show"), slideUp: ir("hide"), slideToggle: ir("toggle"), fadeIn: {opacity: "show"}, fadeOut: {opacity: "hide"}, fadeToggle: {opacity: "toggle"}}, function(e, t) {
2407
+ x.fn[e] = function(e, n, r) {
2408
+ return this.animate(t, e, n, r)
2409
+ }
2410
+ }), x.speed = function(e, t, n) {
2411
+ var r = e && "object" == typeof e ? x.extend({}, e) : {complete: n || !n && t || x.isFunction(e) && e, duration: e, easing: n && t || t && !x.isFunction(t) && t};
2412
+ return r.duration = x.fx.off ? 0 : "number" == typeof r.duration ? r.duration : r.duration in x.fx.speeds ? x.fx.speeds[r.duration] : x.fx.speeds._default, (null == r.queue || r.queue === !0) && (r.queue = "fx"), r.old = r.complete, r.complete = function() {
2413
+ x.isFunction(r.old) && r.old.call(this), r.queue && x.dequeue(this, r.queue)
2414
+ }, r
2415
+ }, x.easing = {linear: function(e) {
2416
+ return e
2417
+ }, swing: function(e) {
2418
+ return.5 - Math.cos(e * Math.PI) / 2
2419
+ }}, x.timers = [], x.fx = rr.prototype.init, x.fx.tick = function() {
2420
+ var e, n = x.timers, r = 0;
2421
+ for (Xn = x.now(); n.length > r; r++)
2422
+ e = n[r], e() || n[r] !== e || n.splice(r--, 1);
2423
+ n.length || x.fx.stop(), Xn = t
2424
+ }, x.fx.timer = function(e) {
2425
+ e() && x.timers.push(e) && x.fx.start()
2426
+ }, x.fx.interval = 13, x.fx.start = function() {
2427
+ Un || (Un = setInterval(x.fx.tick, x.fx.interval))
2428
+ }, x.fx.stop = function() {
2429
+ clearInterval(Un), Un = null
2430
+ }, x.fx.speeds = {slow: 600, fast: 200, _default: 400}, x.fx.step = {}, x.expr && x.expr.filters && (x.expr.filters.animated = function(e) {
2431
+ return x.grep(x.timers, function(t) {
2432
+ return e === t.elem
2433
+ }).length
2434
+ }), x.fn.offset = function(e) {
2435
+ if (arguments.length)
2436
+ return e === t ? this : this.each(function(t) {
2437
+ x.offset.setOffset(this, e, t)
2438
+ });
2439
+ var n, r, o = {top: 0, left: 0}, a = this[0], s = a && a.ownerDocument;
2440
+ if (s)
2441
+ return n = s.documentElement, x.contains(n, a) ? (typeof a.getBoundingClientRect !== i && (o = a.getBoundingClientRect()), r = or(s), {top: o.top + (r.pageYOffset || n.scrollTop) - (n.clientTop || 0), left: o.left + (r.pageXOffset || n.scrollLeft) - (n.clientLeft || 0)}) : o
2442
+ }, x.offset = {setOffset: function(e, t, n) {
2443
+ var r = x.css(e, "position");
2444
+ "static" === r && (e.style.position = "relative");
2445
+ var i = x(e), o = i.offset(), a = x.css(e, "top"), s = x.css(e, "left"), l = ("absolute" === r || "fixed" === r) && x.inArray("auto", [a, s]) > -1, u = {}, c = {}, p, f;
2446
+ l ? (c = i.position(), p = c.top, f = c.left) : (p = parseFloat(a) || 0, f = parseFloat(s) || 0), x.isFunction(t) && (t = t.call(e, n, o)), null != t.top && (u.top = t.top - o.top + p), null != t.left && (u.left = t.left - o.left + f), "using"in t ? t.using.call(e, u) : i.css(u)
2447
+ }}, x.fn.extend({position: function() {
2448
+ if (this[0]) {
2449
+ var e, t, n = {top: 0, left: 0}, r = this[0];
2450
+ return"fixed" === x.css(r, "position") ? t = r.getBoundingClientRect() : (e = this.offsetParent(), t = this.offset(), x.nodeName(e[0], "html") || (n = e.offset()), n.top += x.css(e[0], "borderTopWidth", !0), n.left += x.css(e[0], "borderLeftWidth", !0)), {top: t.top - n.top - x.css(r, "marginTop", !0), left: t.left - n.left - x.css(r, "marginLeft", !0)}
2451
+ }
2452
+ }, offsetParent: function() {
2453
+ return this.map(function() {
2454
+ var e = this.offsetParent || s;
2455
+ while (e && !x.nodeName(e, "html") && "static" === x.css(e, "position"))
2456
+ e = e.offsetParent;
2457
+ return e || s
2458
+ })
2459
+ }}), x.each({scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function(e, n) {
2460
+ var r = /Y/.test(n);
2461
+ x.fn[e] = function(i) {
2462
+ return x.access(this, function(e, i, o) {
2463
+ var a = or(e);
2464
+ return o === t ? a ? n in a ? a[n] : a.document.documentElement[i] : e[i] : (a ? a.scrollTo(r ? x(a).scrollLeft() : o, r ? o : x(a).scrollTop()) : e[i] = o, t)
2465
+ }, e, i, arguments.length, null)
2466
+ }
2467
+ });
2468
+ function or(e) {
2469
+ return x.isWindow(e) ? e : 9 === e.nodeType ? e.defaultView || e.parentWindow : !1
2470
+ }
2471
+ x.each({Height: "height", Width: "width"}, function(e, n) {
2472
+ x.each({padding: "inner" + e, content: n, "": "outer" + e}, function(r, i) {
2473
+ x.fn[i] = function(i, o) {
2474
+ var a = arguments.length && (r || "boolean" != typeof i), s = r || (i === !0 || o === !0 ? "margin" : "border");
2475
+ return x.access(this, function(n, r, i) {
2476
+ var o;
2477
+ return x.isWindow(n) ? n.document.documentElement["client" + e] : 9 === n.nodeType ? (o = n.documentElement, Math.max(n.body["scroll" + e], o["scroll" + e], n.body["offset" + e], o["offset" + e], o["client" + e])) : i === t ? x.css(n, r, s) : x.style(n, r, i, s)
2478
+ }, n, a ? i : t, a, null)
2479
+ }
2480
+ })
2481
+ }), x.fn.size = function() {
2482
+ return this.length
2483
+ }, x.fn.andSelf = x.fn.addBack, "object" == typeof module && module && "object" == typeof module.exports ? module.exports = x : (e.jQuery = e.$ = x, "function" == typeof define && define.amd && define("jquery", [], function() {
2484
+ return x
2485
+ }))
2486
+ })(window);
js/novalnet/novalnetcc.js CHANGED
@@ -11,111 +11,211 @@
11
  * obtain it through the world-wide-web, please send an email
12
  * to license@magentocommerce.com so we can send you a copy immediately.
13
  *
14
- * Part of the Paymentmodul of Novalnet AG
15
  * https://www.novalnet.de
16
- * If you have found this script usefull a small
17
  * recommendation as well as a comment on merchant form
18
  * would be greatly appreciated.
19
  *
20
  * @category js
21
  * @package Novalnet_Payment
22
- * @copyright Novalnet AG
23
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
24
  */
 
25
 
26
- function novalnet_cc_iframe(iframe) {
27
- document.getElementById('nncc_loading').style.display = 'none';
28
- var frameObj = (iframe.contentWindow || iframe.contentDocument);
29
- if (frameObj.document)
30
- frameObj = frameObj.document;
31
-
32
- var card_type = frameObj.getElementById("novalnetCc_cc_type");
33
- var card_owner = frameObj.getElementById("novalnetCc_cc_owner");
34
- var card_exp_month = frameObj.getElementById("novalnetCc_expiration");
35
- var card_exp_year = frameObj.getElementById("novalnetCc_expiration_yr");
36
- var card_cid = frameObj.getElementById("novalnetCc_cc_cid");
37
- var card_no = frameObj.getElementById("novalnetCc_cc_number");
38
- var nncc_unique_id = frameObj.getElementById("nncc_unique_id");
39
- var nncc_hash_id = frameObj.getElementById("nncc_cardno_id");
40
-
41
- card_type.onchange = function() {
42
- setFormFieldsValue(card_type, card_owner, card_exp_month, card_exp_year, card_cid, card_no, nncc_unique_id, nncc_hash_id);
43
- }
44
- card_owner.onkeyup = function() {
45
- setFormFieldsValue(card_type, card_owner, card_exp_month, card_exp_year, card_cid, card_no, nncc_unique_id, nncc_hash_id);
46
  }
47
- card_no.onblur = function() {
48
- setFormFieldsValue(card_type, card_owner, card_exp_month, card_exp_year, card_cid, card_no, nncc_unique_id, nncc_hash_id);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
49
  }
50
- card_exp_month.onchange = function() {
51
- setFormFieldsValue(card_type, card_owner, card_exp_month, card_exp_year, card_cid, card_no, nncc_unique_id, nncc_hash_id);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
52
  }
53
- card_exp_year.onchange = function() {
54
- setFormFieldsValue(card_type, card_owner, card_exp_month, card_exp_year, card_cid, card_no, nncc_unique_id, nncc_hash_id);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
55
  }
56
- card_cid.onkeyup = function() {
57
- setFormFieldsValue(card_type, card_owner, card_exp_month, card_exp_year, card_cid, card_no, nncc_unique_id, nncc_hash_id);
 
 
 
 
 
58
  }
59
  }
60
 
61
- function setFormFieldsValue(card_type, card_owner, card_exp_month, card_exp_year, card_cid, card_no, nncc_unique_id, nncc_hash_id) {
62
- document.getElementById('novalnet_cc_type').value = card_type.value;
63
- document.getElementById('novalnet_cc_type').disabled = false;
 
64
 
65
- document.getElementById('novalnet_cc_owner').value = card_owner.value;
66
- document.getElementById('novalnet_cc_owner').disabled = false;
 
 
 
67
 
68
- document.getElementById('novalnet_cc_exp_month').value = card_exp_month.value;
69
- document.getElementById('novalnet_cc_exp_month').disabled = false;
 
 
 
 
 
70
 
71
- document.getElementById('novalnet_cc_exp_year').value = card_exp_year.value;
72
- document.getElementById('novalnet_cc_exp_year').disabled = false;
 
 
73
 
74
- document.getElementById('novalnet_cc_cid').value = card_cid.value;
75
- document.getElementById('novalnet_cc_cid').disabled = false;
 
 
 
 
 
 
 
 
 
 
 
76
 
77
- if (card_type.value != '' && card_owner.value != '' && card_exp_month.value != '' && card_exp_year.value != ''
78
- && card_cid.value != '' && card_no.value != '') {
79
- document.getElementById('novalnet_cc_pan_hash').value = nncc_hash_id.value;
80
- document.getElementById('novalnet_cc_pan_hash').disabled = false;
81
- document.getElementById('novalnet_cc_unique_id').value = nncc_unique_id.value;
82
- document.getElementById('novalnet_cc_unique_id').disabled = false;
83
  } else {
84
- document.getElementById('novalnet_cc_pan_hash').value = '';
85
- document.getElementById('novalnet_cc_pan_hash').disabled = false;
86
- document.getElementById('novalnet_cc_unique_id').value = '';
87
- document.getElementById('novalnet_cc_unique_id').disabled = false;
88
  }
89
 
90
- var iframe = document.getElementById("ifm_payment_form_novalnetCc");
91
- var ccIframe = (iframe.contentWindow || iframe.contentDocument);
92
- if (ccIframe.document)
93
- ccIframe = ccIframe.document;
94
-
95
- if (typeof nncc_hash_id != 'undefined' && nncc_hash_id.value != '') {
96
-
97
- var cc_type = 0;
98
- var cc_owner = 0;
99
- var cc_no = 0;
100
- var cc_hash = 0;
101
- var cc_month = 0;
102
- var cc_year = 0;
103
- var cc_cid = 0;
104
-
105
- if (card_type.value != '')
106
- cc_type = 1;
107
- if (card_owner.value != '')
108
- cc_owner = 1;
109
- if (card_no.value != '')
110
- cc_no = 1;
111
- if (card_exp_month.value != '')
112
- cc_month = 1;
113
- if (card_exp_year.value != '')
114
- cc_year = 1;
115
- if (card_cid.value != '')
116
- cc_cid = 1;
117
-
118
- document.getElementById('novalnet_cc_field_validator').value = cc_type + ',' + cc_owner + ',' + cc_no + ',' + cc_month + ',' + cc_year + ',' + cc_cid;
119
- document.getElementById('novalnet_cc_field_validator').disabled = false;
120
  }
 
 
121
  }
 
 
 
 
 
 
 
 
 
 
 
11
  * obtain it through the world-wide-web, please send an email
12
  * to license@magentocommerce.com so we can send you a copy immediately.
13
  *
14
+ * Part of the payment module of Novalnet AG
15
  * https://www.novalnet.de
16
+ * If you have found this script useful a small
17
  * recommendation as well as a comment on merchant form
18
  * would be greatly appreciated.
19
  *
20
  * @category js
21
  * @package Novalnet_Payment
22
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
23
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
24
  */
25
+ var $nncc_j = jQuery.noConflict();
26
 
27
+ function ccHashCall()
28
+ {
29
+ $nncc_j('#novalnet_cc_hash').val('');
30
+ $nncc_j('#novalnet_cc_unique_id').val('');
31
+ var merchantVendor = $nncc_j('#original_vendor_id').val();
32
+ var merchantAuthcode = $nncc_j('#original_vendor_authcode').val();
33
+
34
+ if (merchantVendor == undefined || merchantVendor == '' || merchantAuthcode == undefined || merchantAuthcode == '') {
35
+ alert($nncc_j('#nn_cc_merchant_validate_error_message').val());
36
+ return false;
 
 
 
 
 
 
 
 
 
 
37
  }
38
+
39
+ var ccParams = {'ccType':'cc_type', 'ccHolder':'cc_owner', 'ccNo':'cc_number', 'ccExpMonth':'expiration', 'ccExpYear':'expiration_yr'};
40
+
41
+ var isNotEmpty = true;
42
+ $nncc_j.each(ccParams, function( key, value ) {
43
+ if (key == 'ccHolder' && (/[\/\\|\]\[|#,+()@$~%.`'":;*?<>!^{}=_-]/g).test($nncc_j('#novalnetCc_'+value).val())) {
44
+ alert($nncc_j('#nn_cc_validate_error_message').val());
45
+ isNotEmpty = false;
46
+ return isNotEmpty;
47
+ }
48
+ ccParams[key] = $nncc_j.trim($nncc_j('#novalnetCc_'+value).val());
49
+ if (ccParams[key] == undefined || ccParams[key] == '') {
50
+ isNotEmpty = false;
51
+ return isNotEmpty;
52
+ }
53
+ });
54
+
55
+ if (isNotEmpty) {
56
+ var currentDateVal = new Date();
57
+ if (ccParams['ccExpYear'] == currentDateVal.getFullYear() && ccParams['ccExpMonth'] < (currentDateVal.getMonth()+1)) {
58
+ alert($nncc_j('#nn_cc_validate_error_message').val());
59
+ return false;
60
+ }
61
+
62
+ $nncc_j('#cc_loading').show();
63
+ var ccUniqueId = generateUniqueId();
64
+ var ccPayportParams = {"noval_cc_exp_month" : ccParams['ccExpMonth'], "noval_cc_exp_year" : ccParams['ccExpYear'], "noval_cc_holder" : ccParams['ccHolder'], "noval_cc_no" : ccParams['ccNo'], "noval_cc_type" : ccParams['ccType'], "unique_id": ccUniqueId, "vendor_authcode" : merchantAuthcode,"vendor_id" : merchantVendor};
65
+
66
+ ccPayportParams = $nncc_j.param(ccPayportParams);
67
+
68
+ ccCrossDomainAjax(ccPayportParams, 'hash_call');
69
  }
70
+ }
71
+
72
+ function ccCrossDomainAjax(reqData, reqCall)
73
+ {
74
+ // IE8 & 9 only Cross domain JSON GET request
75
+ if ('XDomainRequest' in window && window.XDomainRequest !== '') {
76
+ var xdr = new XDomainRequest(); // Use Microsoft XDR
77
+ var payportUrl = getCcHttpProtocol();
78
+ xdr.open('POST', payportUrl);
79
+ xdr.onload = function() {
80
+ getCcHashResult($nnsepa_j.parseJSON(this.responseText), reqCall);
81
+ };
82
+
83
+ xdr.onerror = function() {
84
+ result = false;
85
+ };
86
+
87
+ xdr.send(reqData);
88
+ } else {
89
+ var payportUrl = getCcHttpProtocol();
90
+ $nncc_j.ajax({
91
+ type: 'POST',
92
+ url: payportUrl,
93
+ data: reqData,
94
+ dataType: 'json',
95
+ success: function(data) {
96
+ getCcHashResult(data, reqCall);
97
+ }
98
+ });
99
  }
100
+ }
101
+
102
+ function getCcHashResult(response, reqCall)
103
+ {
104
+ $nncc_j('#cc_loading').hide();
105
+ if(response.hash_result == 'success') {
106
+ if (reqCall == 'hash_call') {
107
+ $nncc_j('#novalnet_cc_hash').val(response.pan_hash);
108
+ $nncc_j('#novalnet_cc_hash').attr('disabled',false);
109
+ $nncc_j('#novalnet_cc_unique_id').val(response.unique_id);
110
+ $nncc_j('#novalnet_cc_unique_id').attr('disabled',false);
111
+ } else if (reqCall == 'refill_call') {
112
+ var resParams = response.hash_string+"&";
113
+ var params = resParams.split("=");
114
+ var arrayResult={};
115
+ $nncc_j.each( params, function( i, keyVal ) {
116
+ var rkey = rval = "";
117
+ if (i >0 ) {
118
+ rkey = params[i -1].substring(params[i -1].lastIndexOf("&") + 1, params[i -1].length);
119
+ rval = keyVal.substring(0, keyVal.lastIndexOf("&") + 0);
120
+ arrayResult[rkey] = rval;
121
+ }
122
+ });
123
+ $nncc_j('#novalnetCc_cc_owner').val(removeUnwantedSpecialCharsForCc($nncc_j.trim(decodeURIComponent(escape(arrayResult.cc_holder)))));
124
+ $nncc_j('#novalnetCc_cc_number').val(arrayResult.cc_no);
125
+ $nncc_j('#novalnetCc_expiration').val(arrayResult.cc_exp_month);
126
+ $nncc_j('#novalnetCc_expiration_yr').val(arrayResult.cc_exp_year);
127
+ $nncc_j('#novalnetCc_cc_type').val(arrayResult.cc_type);
128
+ $nncc_j('#novalnet_cc_hash').val(response.pan_hash);
129
+ }
130
+ } else {
131
+ alert(response.hash_result);
132
+ return false;
133
  }
134
+ }
135
+
136
+ function removeUnwantedSpecialCharsForCc(value)
137
+ {
138
+ if (value != 'undefined' || value != '') {
139
+ value.replace(/^\s+|\s+$/g, '');
140
+ return value.replace(/[\/\\|\]\[|#@,+()`'$~%.":;*?<>!^{}=_-]/g,'');
141
  }
142
  }
143
 
144
+ function getNumbersOnly(value)
145
+ {
146
+ return value.replace(/[^0-9]/g, '');
147
+ }
148
 
149
+ function ccRefillCall()
150
+ {
151
+ var ccPanhash = '';
152
+ var ccPanhash = $nncc_j('#novalnet_cc_pan_hash').val();
153
+ if(ccPanhash == '' || ccPanhash == undefined) {return false;}
154
 
155
+ var merchantVendor = $nncc_j('#original_vendor_id').val();
156
+ var merchantAuthcode = $nncc_j('#original_vendor_authcode').val();
157
+ var ccUniqueid = $nncc_j('#novalnet_cc_unique_id').val();
158
+ if (merchantVendor == undefined || merchantVendor == '' || merchantAuthcode == undefined || merchantAuthcode == ''
159
+ || ccUniqueid == undefined || ccUniqueid == '') {
160
+ return false;
161
+ }
162
 
163
+ $nncc_j('#cc_loading').show();
164
+ var ccPayportParams = "pan_hash="+ccPanhash+"&unique_id="+ccUniqueid+"&vendor_authcode="+merchantAuthcode+"&vendor_id="+merchantVendor;
165
+ ccCrossDomainAjax(ccPayportParams, 'refill_call');
166
+ }
167
 
168
+ function getCcHttpProtocol()
169
+ {
170
+ var url = location.href;
171
+ var urlArr = url.split('://');
172
+ var urlPrefix = ((urlArr[0] != '' && urlArr[0] == 'https') ? 'https' : 'http');
173
+ return urlPrefix + "://payport.novalnet.de/payport_cc_pci";
174
+ }
175
+
176
+ function isNumberKey(evt, allowspace)
177
+ {
178
+ var charCode = (evt.which) ? evt.which : evt.keyCode;
179
+
180
+ if (String.fromCharCode(evt.which) == '.' || String.fromCharCode(evt.which) == "'" || String.fromCharCode(evt.which) == '#') return false;
181
 
182
+ if ((charCode == 32 && allowspace == true) || (charCode == 35 || charCode == 36 || charCode == 37 || charCode == 39 || charCode == 46) && evt.shiftKey == false) {
183
+ return true;
184
+ } else if (evt.ctrlKey == true && charCode == 114) {
185
+ return true;
186
+ } else if (charCode > 31 && (charCode < 48 || charCode > 57)) {
187
+ return false;
188
  } else {
189
+ return true;
 
 
 
190
  }
191
 
192
+ return true;
193
+ }
194
+
195
+ function generateUniqueId()
196
+ {
197
+ var length = 30; //Maximum Hash Limit
198
+ var str = "";
199
+ for (var i = 0; i < length; ++i) {
200
+ str += String.fromCharCode(Math.floor(Math.random() * (90 - 65 + 1)) + 65); //Uppercase Char
201
+ if (Math.floor(Math.random() * (122 * Math.random())) > 5) {
202
+ str += String.fromCharCode(Math.floor(Math.random() * (97 - 122 + 1)) + 122); //Lowercase Char
203
+ }
204
+ if (Math.floor(Math.random() * (122 * Math.random())) > 30) {
205
+ str += Math.floor(Math.random() * (97 - 122 + 1)) + 122; //Random number from 97 to 122
206
+ }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
207
  }
208
+ fromLimit = Math.floor(Math.random() * (5 - 30 + 1)) + 20; //Random split from limit
209
+ return str.substring(fromLimit, fromLimit + length);
210
  }
211
+
212
+ ccRefillCall();
213
+ $nncc_j(document).ready(function() {
214
+ Ajax.Responders.register({ onComplete: function() {
215
+ if (Ajax.activeRequestCount == 0 && $nncc_j('input[name="payment[method]"]:checked').val() == 'novalnetCc'
216
+ && $nncc_j('#novalnetCc_cc_cid').val() == '') {
217
+ ccRefillCall();
218
+ }
219
+ }
220
+ });
221
+ });
js/novalnet/novalnetsepa.js CHANGED
@@ -11,103 +11,403 @@
11
  * obtain it through the world-wide-web, please send an email
12
  * to license@magentocommerce.com so we can send you a copy immediately.
13
  *
14
- * Part of the Paymentmodul of Novalnet AG
15
  * https://www.novalnet.de
16
- * If you have found this script usefull a small
17
  * recommendation as well as a comment on merchant form
18
  * would be greatly appreciated.
19
  *
20
  * @category js
21
  * @package Novalnet_Payment
22
- * @copyright Novalnet AG
23
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
24
  */
 
25
 
26
- function novalnet_sepa_iframe(iframe)
27
- {
28
- document.getElementById('nnsepa_loading').style.display = 'none';
29
- var frameObj = (iframe.contentWindow || iframe.contentDocument);
30
- if (frameObj.document)
31
- frameObj = frameObj.document;
32
-
33
- var account_holder = frameObj.getElementById("novalnet_sepa_owner");
34
-
35
- var account_no = frameObj.getElementById("novalnet_sepa_accountno");
36
- var bank_code = frameObj.getElementById("novalnet_sepa_bankcode");
37
- var sepa_iban = frameObj.getElementById("novalnet_sepa_iban");
38
- var sepa_swiftbic = frameObj.getElementById("novalnet_sepa_swiftbic");
39
- var nnsepa_unique_id = frameObj.getElementById("nnsepa_unique_id");
40
- var nnsepa_hash = frameObj.getElementById("nnsepa_hash");
41
- var sepa_country = frameObj.getElementById("novalnet_sepa_country");
42
- var iban_confirmed = frameObj.getElementById("novalnet_sepa_swiftbic_confirm");
43
- var nnsepa_iban_confirmed = frameObj.getElementById("nnsepa_iban_confirmed")
44
-
45
- account_holder.onkeyup = function()
46
- {
47
- document.getElementById('novalnet_sepa_owner').value = account_holder.value;
48
- document.getElementById('novalnet_sepa_owner').disabled = false;
49
  }
50
 
51
- account_no.onkeyup = function()
52
- {
53
- set_sepa_panhash_uniquid(nnsepa_unique_id, nnsepa_hash, account_holder, nnsepa_iban_confirmed, account_no, bank_code, sepa_iban, sepa_swiftbic, sepa_country);
 
 
 
 
 
 
54
  }
55
 
56
- bank_code.onkeyup = function()
57
- {
58
- set_sepa_panhash_uniquid(nnsepa_unique_id, nnsepa_hash, account_holder, nnsepa_iban_confirmed, account_no, bank_code, sepa_iban, sepa_swiftbic, sepa_country);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
59
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
60
 
61
- iban_confirmed.onclick = function()
62
- {
63
- setInterval(function(){set_sepa_panhash_uniquid(nnsepa_unique_id, nnsepa_hash, account_holder, nnsepa_iban_confirmed, account_no, bank_code, sepa_iban, sepa_swiftbic, sepa_country);},1000);
64
  }
65
  }
66
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
67
 
68
- function set_sepa_panhash_uniquid(uniquid, panhash, account_holder, nnsepa_iban_confirmed, account_no, bank_code, sepa_iban, sepa_swiftbic, sepa_country)
 
 
 
 
69
  {
 
70
 
71
- document.getElementById('novalnet_sepa_pan_hash').value = panhash.value;
72
- document.getElementById('novalnet_sepa_pan_hash').disabled = false;
 
73
 
74
- document.getElementById('novalnet_sepa_unique_id').value = uniquid.value;
75
- document.getElementById('novalnet_sepa_unique_id').disabled = false;
 
 
76
 
77
- document.getElementById('novalnet_sepa_owner').value = account_holder.value;
78
- document.getElementById('novalnet_sepa_owner').disabled = false;
 
79
 
80
- document.getElementById('novalnet_sepa_iban_confirmed').value = nnsepa_iban_confirmed.value;
81
- document.getElementById('novalnet_sepa_iban_confirmed').disabled = false;
 
 
82
 
83
- var sepa_owner = 0;
84
- var sepa_accountno = 0;
85
- var sepa_bankcode = 0;
86
- var nn_sepa_iban = 0;
87
- var nn_sepa_swiftbic = 0;
88
- var sepa_hash = 0;
89
- var nn_sepa_country = 0;
90
 
91
- if (account_holder.value != '')
92
- sepa_owner = 1;
93
- if (account_no.value != '')
94
- sepa_accountno = 1;
95
- if (bank_code.value != '')
96
- sepa_bankcode = 1;
97
- if (sepa_iban.value != '')
98
- nn_sepa_iban = 1;
99
- if (sepa_swiftbic.value != '')
100
- nn_sepa_swiftbic = 1;
101
- if (panhash.value != '')
102
- sepa_hash = 1;
103
- if (sepa_country.value != '') {
104
- var element_country = sepa_country;
105
- nn_sepa_country = 1 + '-' + element_country.options[element_country.selectedIndex].value;
 
 
 
 
 
 
 
 
 
 
 
 
106
  }
 
107
 
108
- var novalnet_sepa_field_validator = sepa_owner + ',' + sepa_accountno + ',' + sepa_bankcode + ',' + nn_sepa_iban + ',' + nn_sepa_swiftbic + ',' + sepa_hash + ',' + nn_sepa_country;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
109
 
110
- document.getElementById('novalnet_sepa_field_validator').value = novalnet_sepa_field_validator;
111
- document.getElementById('novalnet_sepa_field_validator').disabled = false;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
112
 
 
113
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
11
  * obtain it through the world-wide-web, please send an email
12
  * to license@magentocommerce.com so we can send you a copy immediately.
13
  *
14
+ * Part of the payment module of Novalnet AG
15
  * https://www.novalnet.de
16
+ * If you have found this script useful a small
17
  * recommendation as well as a comment on merchant form
18
  * would be greatly appreciated.
19
  *
20
  * @category js
21
  * @package Novalnet_Payment
22
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
23
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
24
  */
25
+ var $nnsepa_j = jQuery.noConflict();
26
 
27
+ function sepaIbanBicCall(value)
28
+ {
29
+ if (!$nnsepa_j('#novalnetSepa_mandate_confirm').is(':checked')) {
30
+ unsetHashRelatedElements();
31
+ return false;
32
+ } else {
33
+ $nnsepa_j('#novalnetSepa_mandate_confirm').attr('disabled', true);
34
+ $nnsepa_j('#novalnetSepa_iban').remove();
35
+ $nnsepa_j('#novalnetSepa_bic').remove();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
36
  }
37
 
38
+ var merchantVendor = $nnsepa_j('#process_vendor_id').val();
39
+ var merchantAuthcode = $nnsepa_j('#auth_code').val();
40
+
41
+ if (merchantVendor == undefined || merchantVendor == '' || merchantAuthcode == undefined
42
+ || merchantAuthcode == '') {
43
+ alert($nnsepa_j('#nn_sepa_merchant_validate_error_message').val());
44
+ $nnsepa_j('#novalnetSepa_mandate_confirm').removeAttr('checked');
45
+ $nnsepa_j('#novalnetSepa_mandate_confirm').attr('disabled', false);
46
+ return false;
47
  }
48
 
49
+ var sepaBankCountry = $nnsepa_j('#novalnetSepa_bank_country').val();
50
+ var sepaAccountNumber = $nnsepa_j.trim($nnsepa_j('#novalnetSepa_account_number').val());
51
+ var sepaBankCode = $nnsepa_j.trim($nnsepa_j('#novalnetSepa_bank_code').val());
52
+
53
+ if ((/[\/\\|\]\[|#,+()@&$~%.`'":;*?<>!^{}=_-]/g).test(sepaAccountNumber)
54
+ || (/[\/\\|\]\[|#,+()@&$~%.`'":;*?<>!^{}=_-]/g).test(sepaBankCode)) {
55
+ alert($nnsepa_j('#nn_sepa_validate_error_message').val());
56
+ $nnsepa_j('#novalnetSepa_mandate_confirm').removeAttr("checked");
57
+ $nnsepa_j('#novalnetSepa_mandate_confirm').attr('disabled', false);
58
+ return false;
59
+ } else if ((sepaBankCountry == 'DE' && sepaBankCode == '' && isNaN(sepaAccountNumber))
60
+ || (isNaN(sepaAccountNumber) && isNaN(sepaBankCode))) {
61
+ generateSepaHash();
62
+ } else if (!isNaN(sepaAccountNumber) && !isNaN(sepaBankCode) && sepaBankCode != 0
63
+ && sepaAccountNumber != 0) {
64
+ generateSepaIbanBic();
65
+ } else if (sepaAccountNumber == '' || sepaBankCode == '') {
66
+ alert($nnsepa_j('#nn_sepa_validate_error_message').val());
67
+ $nnsepa_j('#novalnetSepa_mandate_confirm').removeAttr("checked");
68
+ $nnsepa_j('#novalnetSepa_mandate_confirm').attr('disabled', false);
69
+ return false;
70
  }
71
+ }
72
+
73
+ function getSepaFormValues()
74
+ {
75
+ var merchantVendor = $nnsepa_j('#process_vendor_id').val();
76
+ var merchantAuthcode = $nnsepa_j('#auth_code').val();
77
+ var sepaAccountHolder = removeUnwantedSpecialChars($nnsepa_j.trim($nnsepa_j('#novalnetSepa_account_holder').val()));
78
+ var sepaBankCountry = $nnsepa_j('#novalnetSepa_bank_country').val();
79
+ var sepaAccountNumber = removeUnwantedSpecialChars($nnsepa_j.trim($nnsepa_j('#novalnetSepa_account_number').val()));
80
+ var sepaUniqueId = generateUniqueId();
81
+ var requestParams = {'sepaAccountHolder':sepaAccountHolder, 'sepaBankCountry':sepaBankCountry,
82
+ 'sepaAccountNumber':sepaAccountNumber, 'sepaUniqueId':sepaUniqueId,
83
+ 'merchantVendor':merchantVendor, 'merchantAuthcode':merchantAuthcode};
84
+ return requestParams;
85
+ }
86
+
87
+ function generateSepaHash()
88
+ {
89
+ var params = getSepaFormValues();
90
+ var isNotEmpty = true;
91
+ $nnsepa_j.each(params, function( value ) {
92
+ if (params[value] == undefined || params[value] == '') {
93
+ alert($nnsepa_j('#nn_sepa_validate_error_message').val());
94
+ $nnsepa_j('#novalnetSepa_mandate_confirm').removeAttr("checked");
95
+ $nnsepa_j('#novalnetSepa_mandate_confirm').attr('disabled', false);
96
+ isNotEmpty = false;
97
+ return isNotEmpty;
98
+ }
99
+ });
100
+
101
+ if (isNotEmpty) {
102
+ var sepaBankCode = removeUnwantedSpecialChars($nnsepa_j.trim($nnsepa_j('#novalnetSepa_bank_code').val()));
103
+
104
+ if((params['sepaBankCountry'] != 'DE' && (sepaBankCode == '' || sepaBankCode == undefined))
105
+ || (params['sepaBankCountry'] == 'DE' && (sepaBankCode == '' || sepaBankCode == undefined)
106
+ && !isNaN(params['sepaAccountNumber']))) {
107
+ alert($nnsepa_j('#nn_sepa_validate_error_message').val());
108
+ unsetHashRelatedElements();
109
+ return false;
110
+ }
111
+
112
+ if(params['sepaBankCountry'] == 'DE' && (sepaBankCode == '' || sepaBankCode == undefined)
113
+ && isNaN(params['sepaAccountNumber'])) {
114
+ sepaBankCode = '123456';
115
+ }
116
+
117
+ var sepaIban = $nnsepa_j('#sepaiban').val();
118
+ var sepaBic = $nnsepa_j('#sepabic').val();
119
+
120
+ if (sepaIban != '' && sepaBic != '') {
121
+ var accountNumber = params['sepaAccountNumber'];
122
+ var bankCode = sepaBankCode;
123
+ } else {
124
+ sepaIban = params['sepaAccountNumber'];
125
+ sepaBic = sepaBankCode;
126
+ accountNumber = bankCode = '';
127
+ }
128
+
129
+ $nnsepa_j('#sepa_loading').show();
130
+
131
+ var sepaPayportParams = {"account_holder" : params['sepaAccountHolder'], "bank_account" : accountNumber, "bank_code" : bankCode, "vendor_id" : params['merchantVendor'], "vendor_authcode" : params['merchantAuthcode'], "bank_country" : params['sepaBankCountry'], "unique_id" : params['sepaUniqueId'], "sepa_data_approved" : 1,"mandate_data_req" : 1, "iban" : sepaIban, "bic" : sepaBic};
132
+
133
+ sepaPayportParams = $nnsepa_j.param(sepaPayportParams);
134
 
135
+ sepaCrossDomainAjax(sepaPayportParams, 'hash_call');
 
 
136
  }
137
  }
138
 
139
+ function generateSepaIbanBic()
140
+ {
141
+ var params = getSepaFormValues();
142
+ var isNotEmpty = true;
143
+ $nnsepa_j.each(params, function( value ) {
144
+ if (params[value] == undefined || params[value] == '') {
145
+ alert($nnsepa_j('#nn_sepa_validate_error_message').val());
146
+ $nnsepa_j('#novalnetSepa_mandate_confirm').removeAttr("checked");
147
+ $nnsepa_j('#novalnetSepa_mandate_confirm').attr('disabled', false);
148
+ isNotEmpty = false;
149
+ return isNotEmpty;
150
+ }
151
+ });
152
+
153
+ if (isNotEmpty) {
154
+ var sepaBankCode = removeUnwantedSpecialChars($nnsepa_j.trim($nnsepa_j('#novalnetSepa_bank_code').val()));
155
+ $nnsepa_j('#sepa_loading').show();
156
+ var sepaPayportParams = {"account_holder" : params['sepaAccountHolder'], "bank_account" : params['sepaAccountNumber'],"bank_code" : sepaBankCode, "vendor_id" : params['merchantVendor'], "vendor_authcode" : params['merchantAuthcode'], "bank_country" : params['sepaBankCountry'], "get_iban_bic" : 1, "unique_id" : params['sepaUniqueId']};
157
+
158
+ sepaPayportParams = $nnsepa_j.param(sepaPayportParams);
159
 
160
+ sepaCrossDomainAjax(sepaPayportParams, 'iban_call');
161
+ }
162
+ }
163
+
164
+ function sepaRefillcall()
165
  {
166
+ var sepaPanHash = $nnsepa_j('#result_sepa_hash').val();
167
 
168
+ if (sepaPanHash == '' || sepaPanHash == undefined) {
169
+ return false;
170
+ }
171
 
172
+ $nnsepa_j('#novalnetSepa_account_holder').val('');
173
+ $nnsepa_j('#novalnetSepa_bank_country').val('');
174
+ $nnsepa_j('#novalnetSepa_account_number').val('');
175
+ $nnsepa_j('#novalnetSepa_bank_code').val('');
176
 
177
+ var merchantVendor = $nnsepa_j('#process_vendor_id').val();
178
+ var merchantAuthcode = $nnsepa_j('#auth_code').val();
179
+ var sepaUniqueId = generateUniqueId();
180
 
181
+ if (merchantVendor == undefined || merchantVendor == '' || merchantAuthcode == undefined || merchantAuthcode == ''
182
+ || sepaUniqueId == undefined || sepaUniqueId == '') {
183
+ return false;
184
+ }
185
 
186
+ $nnsepa_j('#sepa_loading').show();
187
+ var sepaPayportParams = "vendor_id="+merchantVendor+"&vendor_authcode="+merchantAuthcode+"&unique_id="+sepaUniqueId+"&sepa_data_approved=1&mandate_data_req=1&sepa_hash="+sepaPanHash;
188
+ sepaCrossDomainAjax(sepaPayportParams, 'refill_call');
189
+ }
 
 
 
190
 
191
+ function sepaCrossDomainAjax(reqData, reqCall)
192
+ {
193
+ // IE8 & 9 only Cross domain JSON GET request
194
+ if ('XDomainRequest' in window && window.XDomainRequest !== '') {
195
+ var xdr = new XDomainRequest(); // Use Microsoft XDR
196
+ var payportUrl = getSepaHttpProtocol();
197
+ xdr.open('POST', payportUrl);
198
+ xdr.onload = function() {
199
+ getSepaHashResult($nnsepa_j.parseJSON(this.responseText), reqCall);
200
+ };
201
+
202
+ xdr.onerror = function() {
203
+ result = false;
204
+ };
205
+
206
+ xdr.send(reqData);
207
+ } else {
208
+ var payportUrl = getSepaHttpProtocol();
209
+ $nncc_j.ajax({
210
+ type: 'POST',
211
+ url: payportUrl,
212
+ data: reqData,
213
+ dataType: 'json',
214
+ success: function(data) {
215
+ getSepaHashResult(data, reqCall);
216
+ }
217
+ });
218
  }
219
+ }
220
 
221
+ function getSepaHashResult(response, reqCall)
222
+ {
223
+ $nnsepa_j('#sepa_loading').hide();
224
+ if (response.hash_result == 'success') {
225
+ if (reqCall == 'iban_call') {
226
+ $nnsepa_j('#sepaiban').val(response.IBAN);
227
+ $nnsepa_j('#sepabic').val(response.BIC);
228
+ if(response.IBAN != '' && response.BIC != '') {
229
+ $nnsepa_j('<span id="novalnetSepa_iban"></span>').insertAfter($nnsepa_j("#novalnetSepa_account_number"));
230
+ $nnsepa_j('#novalnetSepa_iban').html('<b>IBAN:</b> '+response.IBAN);
231
+ $nnsepa_j('#nn_sepa_overlay_iban_tr').show(60);
232
+ $nnsepa_j('<span id="novalnetSepa_bic"></span>').insertAfter($nnsepa_j("#novalnetSepa_bank_code"));
233
+ $nnsepa_j('#novalnetSepa_bic').html('<b>BIC:</b> '+response.BIC);
234
+ $nnsepa_j('#nn_sepa_overlay_bic_tr').show(60);
235
+ generateSepaHash();
236
+ return true;
237
+ } else {
238
+ alert($nnsepa_j('#nn_sepa_validate_error_message').val());
239
+ $nnsepa_j('#sepa_mandate_overlay_block_first').css("display", "none");
240
+ $nnsepa_j('#novalnetSepa_mandate_confirm').removeAttr("checked");
241
+ $nnsepa_j('#novalnetSepa_mandate_confirm').attr('disabled', false);
242
+ $nnsepa_j('#nnsepa_iban_confirmed').val(0);
243
+ $nnsepa_j('#nn_sepa_overlay_iban_tr').hide(60);
244
+ $nnsepa_j('#nn_sepa_overlay_bic_tr').hide(60);
245
+ closeMandateOverlay(0);
246
+ return false;
247
+ }
248
+ } else if (reqCall == 'hash_call') {
249
+ var sepaUniqueId = generateUniqueId();
250
+ $nnsepa_j('#result_sepa_hash').val(response.sepa_hash);
251
+ $nnsepa_j('#result_sepa_hash').attr('disabled',false);
252
+ $nnsepa_j('#result_mandate_ref').val(response.mandate_ref);
253
+ $nnsepa_j('#result_mandate_ref').attr('disabled',false);
254
+ $nnsepa_j('#result_mandate_date').val(response.mandate_date);
255
+ $nnsepa_j('#result_mandate_date').attr('disabled',false);
256
+ $nnsepa_j('#result_mandate_unique').val(sepaUniqueId);
257
+ $nnsepa_j('#result_mandate_unique').attr('disabled',false);
258
+ $nnsepa_j('#nnsepa_iban_confirmed').val(1);
259
+ $nnsepa_j('#nnsepa_iban_confirmed').attr('disabled',false);
260
+ showMandateOverlay();
261
+ } else if (reqCall == 'refill_call') {
262
+ var resParams = response.hash_string+"&";
263
+ var params = resParams.split("=");
264
+ var arrayResult={};
265
+ $nnsepa_j.each( params, function( i, keyVal ) {
266
+ var rkey = rval = "";
267
+ if (i >0 ) {
268
+ rkey = params[i -1].substring(params[i -1].lastIndexOf("&") + 1, params[i -1].length);
269
+ rval = keyVal.substring(0, keyVal.lastIndexOf("&") + 0);
270
+ arrayResult[rkey] = rval;
271
+ }
272
+ });
273
+ $nnsepa_j('#novalnetSepa_account_holder').val(removeUnwantedSpecialChars($nnsepa_j.trim(decodeURIComponent(arrayResult.account_holder))));
274
+ $nnsepa_j('#novalnetSepa_bank_country').val(arrayResult.bank_country);
275
+ $nnsepa_j('#novalnetSepa_account_number').val(removeUnwantedSpecialChars(arrayResult.iban));
276
+ if (arrayResult.bic != '123456') { $nnsepa_j('#novalnetSepa_bank_code').val(removeUnwantedSpecialChars(arrayResult.bic)); }
277
+ } else {
278
+ alert(response.hash_result);
279
+ }
280
+ }
281
+ }
282
 
283
+ function unsetHashRelatedElements()
284
+ {
285
+ $nnsepa_j('#sepaiban').val('');
286
+ $nnsepa_j('#sepabic').val('');
287
+ $nnsepa_j('#result_mandate_unique').val('');
288
+ $nnsepa_j('#result_sepa_hash').val('');
289
+ $nnsepa_j('#result_mandate_date').val('');
290
+ $nnsepa_j('#result_mandate_ref').val('');
291
+ $nnsepa_j('#novalnetSepa_iban').remove();
292
+ $nnsepa_j('#novalnetSepa_bic').remove();
293
+ $nnsepa_j('#nnsepa_iban_confirmed').val(0);
294
+ $nnsepa_j('#novalnetSepa_mandate_confirm').removeAttr("checked");
295
+ }
296
+
297
+ function showMandateOverlay()
298
+ {
299
+ $nnsepa_j('.bgCover').css({
300
+ display: 'block',
301
+ width: $nnsepa_j(document).width(),
302
+ height: $nnsepa_j(document).height()
303
+ });
304
+ $nnsepa_j('.bgCover').css({opacity: 0}).animate({opacity: 0.5, backgroundColor: '#878787'});
305
+ $nnsepa_j('#sepa_overlay_iban_span').html(removeUnwantedSpecialChars($nnsepa_j('#sepaiban').val()));
306
+ $nnsepa_j('#sepa_overlay_bic_span').html(removeUnwantedSpecialChars($nnsepa_j('#sepabic').val()));
307
+ if ($nnsepa_j('#sepaiban').val() != '' && $nnsepa_j('#sepabic').val() != '') {
308
+ $nnsepa_j('#label_iban').css('display', 'table-row');
309
+ $nnsepa_j('#label_bic').css('display', 'table-row');
310
+ }
311
+
312
+ if (isNaN($nnsepa_j('#novalnetSepa_account_number').val()) && $nnsepa_j('#novalnetSepa_bank_code').val() == '') {
313
+ $nnsepa_j('#sepa_overlay_iban_span').html(removeUnwantedSpecialChars($nnsepa_j('#novalnetSepa_account_number').val()));
314
+ $nnsepa_j('#nn_sepa_overlay_bic_tr').hide(60);
315
+ } else if (isNaN($nnsepa_j('#novalnetSepa_account_number').val()) && isNaN($nnsepa_j('#novalnetSepa_bank_code').val())) {
316
+ $nnsepa_j('#sepa_overlay_iban_span').html(removeUnwantedSpecialChars($nnsepa_j('#novalnetSepa_account_number').val()));
317
+ $nnsepa_j('#sepa_overlay_bic_span').html(removeUnwantedSpecialChars($nnsepa_j('#novalnetSepa_bank_code').val()));
318
+ }
319
+
320
+ $nnsepa_j('#sepa_overlay_payee_span').html('Novalnet AG');
321
+ $nnsepa_j('#sepa_overlay_creditoridentificationnumber_span').html('DE53ZZZ00000004253');
322
+ $nnsepa_j('#sepa_overlay_enduserfullname_span').html(removeUnwantedSpecialChars($nnsepa_j('#novalnetSepa_account_holder').val()));
323
+ $nnsepa_j('#sepa_overlay_enduserfullname_span1').html(removeUnwantedSpecialChars($nnsepa_j('#novalnetSepa_account_holder').val()));
324
+ $nnsepa_j('#sepa_overlay_endusercountry_span').html($nnsepa_j('#novalnetSepa_bank_country').val());
325
+ $nnsepa_j('#sepa_overlay_mandatedate_span').html(normalizeDate($nnsepa_j('#result_mandate_date').val()));
326
+ $nnsepa_j('#sepa_overlay_mandatereference_span').html($nnsepa_j('#result_mandate_ref').val());
327
+ $nnsepa_j('#sepa_mandate_overlay_block_first').css({display: 'none', position: 'fixed'});
328
+ $nnsepa_j('#sepa_mandate_overlay_block').css({display: 'block', position: 'fixed'});
329
+
330
+ if ($nnsepa_j(window).width() < 650) {
331
+ $nnsepa_j('#sepa_mandate_overlay_block').css({left: ($nnsepa_j(window).width() / 2), top: ($nnsepa_j(window).height() / 2), width: 0, height: 0}).animate({left: (($nnsepa_j(window).width() - ($nnsepa_j(window).width() - 10)) / 2), top: 5, width: ($nnsepa_j(window).width() - 10), height: ($nnsepa_j(window).height() - 10)});
332
+ $nnsepa_j('#overlay_window_block_body').css({'height': ($nnsepa_j(window).height() - 95)});
333
+ } else {
334
+ $nnsepa_j('#sepa_mandate_overlay_block').css({left: (($nnsepa_j(window).height() - (490 / 2))), top: (($nnsepa_j(window).height() - 490) / 2), width: (600), height: (490)});
335
+ $nnsepa_j('#overlay_window_block_body').css({'height': (400)});
336
+ }
337
 
338
+ return true;
339
  }
340
+
341
+ function normalizeDate(input)
342
+ {
343
+ var parts = input.split('-');
344
+ return(parts[2] + '.' + parts[1] + '.' + parts[0]);
345
+ }
346
+
347
+ function closeMandateOverlay(mandate)
348
+ {
349
+ $nnsepa_j('#sepa_mandate_overlay_block').hide(60);
350
+ $nnsepa_j('.bgCover').css({display: 'none'});
351
+ return true;
352
+ }
353
+
354
+ function mandateConfirmButtonSubmit()
355
+ {
356
+ $nnsepa_j('#novalnetSepa_mandate_confirm').attr('disabled', false);
357
+ $nnsepa_j('#nnsepa_iban_confirmed').val(1);
358
+ closeMandateOverlay(0);
359
+ }
360
+
361
+ function mandateCancelButtonSubmit()
362
+ {
363
+ $nnsepa_j('#nnsepa_iban_confirmed').val(0);
364
+ $nnsepa_j('#novalnetSepa_mandate_confirm').removeAttr("checked");
365
+ $nnsepa_j('#novalnetSepa_mandate_confirm').attr('disabled', false);
366
+ closeMandateOverlay(0);
367
+ $nnsepa_j('#novalnetSepa_iban').remove();
368
+ $nnsepa_j('#novalnetSepa_bic').remove();
369
+ }
370
+
371
+ function removeUnwantedSpecialChars(value)
372
+ {
373
+ if (value != 'undefined' || value != '') {
374
+ value.replace(/^\s+|\s+$/g, '');
375
+ return value.replace(/[\/\\|\]\[|#@,+()`'$~%.":;*?<>!^{}=_-]/g,'');
376
+ }
377
+ }
378
+
379
+ function generateUniqueId()
380
+ {
381
+ var length = 30; //Maximum Hash Limit
382
+ var str = "";
383
+ for (var i = 0; i < length; ++i) {
384
+ str += String.fromCharCode(Math.floor(Math.random() * (90 - 65 + 1)) + 65); //Uppercase Char
385
+ if (Math.floor(Math.random() * (122 * Math.random())) > 5) {
386
+ str += String.fromCharCode(Math.floor(Math.random() * (97 - 122 + 1)) + 122); //Lowercase Char
387
+ }
388
+ if (Math.floor(Math.random() * (122 * Math.random())) > 30) {
389
+ str += Math.floor(Math.random() * (97 - 122 + 1)) + 122; //Random number from 97 to 122
390
+ }
391
+ }
392
+ fromLimit = Math.floor(Math.random() * (5 - 30 + 1)) + 20; //Random split from limit
393
+ return str.substring(fromLimit, fromLimit + length);
394
+ }
395
+
396
+ function getSepaHttpProtocol()
397
+ {
398
+ var url = location.href;
399
+ var urlArr = url.split('://');
400
+ var urlPrefix = ((urlArr[0] != '' && urlArr[0] == 'https') ? 'https' : 'http');
401
+ return urlPrefix + "://payport.novalnet.de/sepa_iban";
402
+ }
403
+
404
+ sepaRefillcall();
405
+ $nnsepa_j(document).ready(function() {
406
+ Ajax.Responders.register({ onComplete: function() {
407
+ if (Ajax.activeRequestCount == 0 && $nnsepa_j('input[name="payment[method]"]:checked').val() == 'novalnetSepa'
408
+ && $nnsepa_j('#nnsepa_iban_confirmed').val() == 0) {
409
+ sepaRefillcall();
410
+ }
411
+ }
412
+ });
413
+ });
novalnet_css_link.php 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 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
- if (!defined('NOVALNET_CC_CUSTOM_CSS')) {
27
- define('NOVALNET_CC_CUSTOM_CSS', 'input~~~#novalnetCc_expiration_yr~~~#novalnetCc_expiration_yr.error');
28
- }
29
- if (!defined('NOVALNET_CC_CUSTOM_CSS_STYLE')) {
30
- define('NOVALNET_CC_CUSTOM_CSS_STYLE', 'background: none repeat scroll 0 0 #FFFFFF;
31
- border-color: #AAAAAA #C8C8C8 #C8C8C8 #AAAAAA;border-style: solid;border-width: 1px;font: 12px;width:224px;~~~width:75px;~~~color:#2f2f2f;font-weight:lighter;');
32
- }
33
-
34
- if (!defined('NOVALNET_SEPA_CUSTOM_CSS')) {
35
- define('NOVALNET_SEPA_CUSTOM_CSS', 'input~~~select');
36
- }
37
- if (!defined('NOVALNET_SEPA_CUSTOM_CSS_STYLE')) {
38
- define('NOVALNET_SEPA_CUSTOM_CSS_STYLE', 'background: none repeat scroll 0 0 #FFFFFF;
39
- border-color: #AAAAAA #C8C8C8 #C8C8C8 #AAAAAA;border-style: solid;border-width: 1px;font: 12px;width:224px;~~~background: none repeat scroll 0 0 #FFFFFF;border-color: #AAAAAA #C8C8C8 #C8C8C8 #AAAAAA;border-style: solid;border-width: 1px;font: 12px;width:224px;');
40
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
package.xml CHANGED
@@ -1,20 +1,19 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Novalnet</name>
4
- <version>5.0.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Novalnet AG ist ein deutsches EPayment - Unternehmen, bietet alle relevanten Zahlungsarten weltweit. / Novalnet is a German based payment service provider, which offers all the available payments and solutions worldwide.</summary>
10
  <description>The NOVALNET AG is an essential component of e-Payment platform that facilitates your company to process all type of payments. As one of the leading company in Online-Payment the NOVALNET AG provides its customers an individual, technically qualified secured Payment system and also the best possible support throughout. NOVALNET AG is not only an e-Payment provider but also we offer our Merchants an optimal strategic solution for easy payment processing which is pocket-friendly for our customer.</description>
11
- <notes>- 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.&#xD;
12
- - Code Optimization has been done.&#xD;
13
- - Checked the compatibility for version 1.9.1.0.</notes>
14
  <authors><author><name>Gabriel Dixon</name><user>Novalnet</user><email>gd@novalnet.de</email></author></authors>
15
- <date>2014-12-20</date>
16
- <time>05:39:15</time>
17
- <contents><target name="magecommunity"><dir name="Novalnet"><dir><dir name="Payment"><dir name="Block"><dir name="Adminhtml"><dir name="Configuration"><dir name="Wizard"><dir name="Config"><file name="Form.php" hash="4f5ef6b08ed2075f642a809aed0bb27a"/></dir><dir name="Page"><file name="Edit.php" hash="39661d8c80b07de51c75599beb6cd63d"/><file name="View.php" hash="226fd9b31f80e520864286278733b326"/></dir></dir></dir><file name="Information.php" hash="257518ae8617c49de2956c739d0e72bd"/><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="08f5cfa468ad18ab875c2b1b0c6c18d0"/><dir name="Invoice"><file name="View.php" hash="bc6cf9621d9200a8da3067effea90360"/></dir><dir name="View"><dir name="Tab"><file name="TransactionOverview.php" hash="6ce34974bed99630000a2ca826881b6e"/><file name="TransactionStatus.php" hash="e4400002f1fb12624d35a237317c99ae"/></dir></dir><file name="View.php" hash="ef5a271c79c8f02525c67ca726c903cb"/></dir><file name="Order.php" hash="0e55d20d59ae35e96a2ed1938ce56cbb"/><file name="Sales.php" hash="32bb3ec4988e7e81f7046d846ecd2186"/></dir><dir name="Transaction"><file name="Grid.php" hash="69c336cc7bec4eb8eb54fcd22fc7f7f6"/><dir name="View"><file name="Form.php" hash="72f75a52f711f713174e23dde81a4a3c"/></dir><file name="View.php" hash="7d5cd6e754eda8f1f67c660a95f9616b"/></dir><file name="Transaction.php" hash="48a13eeb413ca9b8afdb5fcd250b42e8"/><dir name="Transactionoverview"><file name="Grid.php" hash="cc79cacd281dbf1c2ff6601da496c109"/><dir name="View"><file name="Form.php" hash="7f4782ebd34949f071769c65a1849695"/></dir><file name="View.php" hash="56226800617b1cfd467f2ad2ec2d1464"/></dir><file name="Transactionoverview.php" hash="0082e6ace4424115b8be53562109c75c"/><dir name="Widget"><dir name="Grid"><file name="Container.php" hash="701008d8b03cceda1a09fba157c6890f"/></dir><dir name="View"><file name="Container.php" hash="0222d55f675f6ec72c7c1e0bdb0f0645"/></dir></dir><file name="Widget.php" hash="bba416aa5a5028ee448893ad2b7d40c9"/></dir><dir name="Payment"><dir name="Method"><dir name="Form"><file name="Cc.php" hash="0f2363f8f19c0a40f40b5f6e569f67d5"/><file name="Ideal.php" hash="10b020db8bc486c6c05b4dbe3ccc28ca"/><file name="Invoice.php" hash="6195b4fd46f4e1419b6cb9cdd37e0fa4"/><file name="Paypal.php" hash="b6b5bb35034cc92d28190758006b5050"/><file name="Phonepayment.php" hash="cc8e4fd948fd3f5031c3c264c0475d7d"/><file name="Prepayment.php" hash="a2706d2b91ca10b2550fa239185ade23"/><file name="Sepa.php" hash="0581077026b28697df0709d54fe9ce16"/><file name="Sofortueberweisung.php" hash="74d3917a37aaf1fc2e10a078ccb18aef"/></dir><dir name="Info"><file name="Cc.php" hash="d54c4a302c4e33de2feb52b26f007780"/><file name="Ideal.php" hash="88d679d82ad289672c9f344906c8b7ed"/><file name="Invoice.php" hash="b3ea27d5f12f090e79bfa2afad99e6ea"/><file name="Paypal.php" hash="2a5ecb4dc578d1eddebb59d8cb3ce669"/><file name="Phonepayment.php" hash="a07a6a47e6e40e736a809ad58b8e1380"/><file name="Prepayment.php" hash="0762d466b5512784fb0f0c8d2dedf7b1"/><file name="Sepa.php" hash="c3e9ace522ec706ec20f544f7c19c853"/><file name="Sofortueberweisung.php" hash="d7b06c8fdd026b1f831109772e49808b"/></dir><file name="NovalnetRedirect.php" hash="11b71196e14eb3576e31de3ffe642d2e"/></dir></dir></dir><dir name="Helper"><file name="AssignData.php" hash="6e48fd539d9d7014062f15f44a3774f1"/><file name="Data.php" hash="ff9ab45499a2896a498f3dcfb688ee64"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Create.php" hash="1755ec231e00248aa7d50f5bb1c034a7"/></dir></dir></dir><file name="Callback.php" hash="0ec7544da0e62307fa0008e751903737"/><file name="Callbackscript.php" hash="e322bba009190f2828df201b5980a091"/><file name="Config.php" hash="5517747de6b2ca3c61b811b6fb0d310e"/><dir name="Novalnet"><dir name="Source"><file name="Callbacktypes.php" hash="f8d67a4c8d84c3c7a60fdc5a5694169a"/></dir></dir><file name="Observer.php" hash="7fcfac41cbb5fe4c14953154de224072"/><dir name="Payment"><dir name="Method"><file name="Abstract.php" hash="9a513100f3c2ec7d838e25a64c53dfde"/><file name="NovalnetCc.php" hash="f6170f9715799a106da6747da1bb68da"/><file name="NovalnetIdeal.php" hash="d53f88930cd172217b2c978471a68a63"/><file name="NovalnetInvoice.php" hash="06e5ac8c10a9379c198d13d968285cf1"/><file name="NovalnetPaypal.php" hash="41513efd2676bec9190567df4bbe8a4b"/><file name="NovalnetPhonepayment.php" hash="37fd83292ba6060dabacd5a754ba57e4"/><file name="NovalnetPrepayment.php" hash="d682332ebda4ca8cc377fa3ec2532165"/><file name="NovalnetSepa.php" hash="03861a8662da7d5be1c33d93c59f6a49"/><file name="NovalnetSofortueberweisung.php" hash="d1843d421a22326400087978a5a696bc"/></dir></dir><dir name="Resource"><dir name="Callback"><file name="Collection.php" hash="5b886fcb931969bf4d6a5e09e7657140"/></dir><file name="Callback.php" hash="dcd1e1b4cf2fdc010a1087e16b95c2fc"/><dir name="Transactionoverview"><file name="Collection.php" hash="c342b71446c92c7c0facbb79aa8572c5"/></dir><file name="Transactionoverview.php" hash="9887f2a356abcc7f7708335135215a73"/><dir name="Transactionstatus"><file name="Collection.php" hash="eeb0cd37f84a2b89d7165dbee6d3576e"/></dir><file name="Transactionstatus.php" hash="4e2e602f2849414b598aff5cdb98e062"/></dir><dir name="System"><dir name="Config"><file name="Activemethods.php" hash="8da5e005c6545bcdb49468afb5b131e5"/></dir></dir><file name="Transactionoverview.php" hash="a60d62e40b1eaf97400be54b9a703923"/><file name="Transactionstatus.php" hash="38af6fc202534285c9e48592ce402021"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Configuration"><dir name="Wizard"><file name="PageController.php" hash="d633b54c9588c799b3af82cdd37b5c64"/></dir></dir><file name="InformationController.php" hash="8b2ac069dcfe03824bfeb4cbe6b1a2bd"/><file name="NovalnetCcController.php" hash="a92cb5e55fe4a476a2d585438728af63"/><file name="NovalnetSepaController.php" hash="3cd60b4b3df046a197c65a5b22bfba36"/><dir name="Sales"><file name="OrderController.php" hash="261e4c8dcbda16cd9c1dd6ca3291cd21"/></dir><file name="TransactionController.php" hash="92594b4bec466d578a568d94a4fb876b"/><file name="TransactionoverviewController.php" hash="ac9b9e4b8e0f02462c0894d48bf65133"/></dir><file name="GatewayController.php" hash="edfc29a89e610b9bc0605ac82b7bb6c0"/><file name="NovalnetCcController.php" hash="babb2ed25a1bac27fe9e97f95df73541"/><file name="NovalnetSepaController.php" hash="173ea1c3d2137fcf8b8ffb95324da63c"/></dir><dir name="etc"><file name="adminhtml.xml" hash="6d200a71fb14bbdcad271d00a35b3d67"/><file name="config.xml" hash="049f7811892ca20885d04971665317c5"/><file name="system.xml" hash="b2e7df6b5b30e0abcf637463cf161945"/></dir><dir name="sql"><dir name="novalnet_setup"><file name="mysql4-install-5.0.3.php" hash="36f5e221bea3e90b155717dc3825cc55"/><file name="mysql4-upgrade-1.4.0-5.0.0.php" hash="b818e713dd5c9904eae14d25d07aa6c4"/><file name="mysql4-upgrade-5.0.0-5.0.1.php" hash="77ab66e84389d46ea770141b730f3ed4"/><file name="mysql4-upgrade-5.0.1-5.0.2.php" hash="485b7b2c6d93d064c3ae137a8b784c26"/><file name="mysql4-upgrade-5.0.2-5.0.3.php" hash="f644864e31deadc053d16c7d9dc0468c"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="novalnet.xml" hash="ef58c5b2392d30c9d88058b04ddf7748"/></dir><dir name="template"><dir name="novalnet"><dir><dir name="payment"><dir name="method"><dir name="form"><file name="Cc.phtml" hash="6a93cfca77a525ba372099ae48673259"/><file name="Ccform.phtml" hash="da47194fddbadbe1b6e95b49c15b78df"/><file name="Ideal.phtml" hash="f56a1a6d3da636e3d730bdf8e4d151e4"/><file name="Invoice.phtml" hash="f8c24344d72d525095cbd01eab25c869"/><file name="Paypal.phtml" hash="0fc72f4a2e5ec1d525b9fc599e866729"/><file name="Phonepayment.phtml" hash="120b8edd70736b6f710257cbf36bcead"/><file name="Prepayment.phtml" hash="facbc4718e6ea9d2e819c7d20f5aa9ff"/><file name="Sepa.phtml" hash="95f7ba1fdaa12a3360d74758cba2ba56"/><file name="Sepaform.phtml" hash="456fc41b024c9c2b8863bc921b2f991a"/><file name="Sofortueberweisung.phtml" hash="df75b7a30c4bc0a304b4e3e8f26da77f"/><file name="blank.phtml" hash="7032809fa5e26991a9d237d10da9bafc"/></dir><dir name="info"><file name="Cc.phtml" hash="1a735ec85e33af9cd6aedcb14f4594ec"/><file name="Ideal.phtml" hash="7e09322a1deca208095a3547b089f8b7"/><file name="Invoice.phtml" hash="8e86b38df416c321afe3d1939d353630"/><file name="Paypal.phtml" hash="577f54c9093f223ff972f20c6ab9e815"/><file name="Phonepayment.phtml" hash="9d2db9cba7f7e10201be956b8dffa3d9"/><file name="Prepayment.phtml" hash="6853ae71acae4081443c9d9dfffa725b"/><file name="Sepa.phtml" hash="d3a92ae36f6c2073bdac3185b27a3297"/><file name="Sofortueberweisung.phtml" hash="577f54c9093f223ff972f20c6ab9e815"/></dir><dir name="pdf"><file name="Cc.phtml" hash="118c0f0aadf31e19af703500e37c2e9a"/><file name="Ideal.phtml" hash="1ccc77c4412ab7f6f09a49fe4ff64f86"/><file name="Invoice.phtml" hash="45519181cfc46a52164eea02c7471e72"/><file name="Paypal.phtml" hash="85ac63596921b6e7399c2afd043de09e"/><file name="Phonepayment.phtml" hash="1ccc77c4412ab7f6f09a49fe4ff64f86"/><file name="Prepayment.phtml" hash="6b365551040022926f1aedec04a45b2d"/><file name="Sepa.phtml" hash="1f748b8cca6f92d970a40e777976792f"/><file name="Sofortueberweisung.phtml" hash="1ccc77c4412ab7f6f09a49fe4ff64f86"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="default"><dir name="default"><dir name="layout"><file name="novalnet.xml" hash="ef58c5b2392d30c9d88058b04ddf7748"/></dir><dir name="template"><dir name="novalnet"><dir><dir name="payment"><dir name="method"><dir name="form"><file name="Cc.phtml" hash="6a93cfca77a525ba372099ae48673259"/><file name="Ccform.phtml" hash="da47194fddbadbe1b6e95b49c15b78df"/><file name="Ideal.phtml" hash="f56a1a6d3da636e3d730bdf8e4d151e4"/><file name="Invoice.phtml" hash="f8c24344d72d525095cbd01eab25c869"/><file name="Paypal.phtml" hash="0fc72f4a2e5ec1d525b9fc599e866729"/><file name="Phonepayment.phtml" hash="120b8edd70736b6f710257cbf36bcead"/><file name="Prepayment.phtml" hash="facbc4718e6ea9d2e819c7d20f5aa9ff"/><file name="Sepa.phtml" hash="95f7ba1fdaa12a3360d74758cba2ba56"/><file name="Sepaform.phtml" hash="456fc41b024c9c2b8863bc921b2f991a"/><file name="Sofortueberweisung.phtml" hash="df75b7a30c4bc0a304b4e3e8f26da77f"/><file name="blank.phtml" hash="7032809fa5e26991a9d237d10da9bafc"/></dir><dir name="info"><file name="Cc.phtml" hash="1a735ec85e33af9cd6aedcb14f4594ec"/><file name="Ideal.phtml" hash="7e09322a1deca208095a3547b089f8b7"/><file name="Invoice.phtml" hash="8e86b38df416c321afe3d1939d353630"/><file name="Paypal.phtml" hash="577f54c9093f223ff972f20c6ab9e815"/><file name="Phonepayment.phtml" hash="9d2db9cba7f7e10201be956b8dffa3d9"/><file name="Prepayment.phtml" hash="6853ae71acae4081443c9d9dfffa725b"/><file name="Sepa.phtml" hash="d3a92ae36f6c2073bdac3185b27a3297"/><file name="Sofortueberweisung.phtml" hash="577f54c9093f223ff972f20c6ab9e815"/></dir><dir name="pdf"><file name="Cc.phtml" hash="118c0f0aadf31e19af703500e37c2e9a"/><file name="Ideal.phtml" hash="1ccc77c4412ab7f6f09a49fe4ff64f86"/><file name="Invoice.phtml" hash="45519181cfc46a52164eea02c7471e72"/><file name="Paypal.phtml" hash="85ac63596921b6e7399c2afd043de09e"/><file name="Phonepayment.phtml" hash="1ccc77c4412ab7f6f09a49fe4ff64f86"/><file name="Prepayment.phtml" hash="6b365551040022926f1aedec04a45b2d"/><file name="Sepa.phtml" hash="1f748b8cca6f92d970a40e777976792f"/><file name="Sofortueberweisung.phtml" hash="1ccc77c4412ab7f6f09a49fe4ff64f86"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="rwd"><dir name="default"><dir name="layout"><file name="novalnet.xml" hash="ef58c5b2392d30c9d88058b04ddf7748"/></dir><dir name="template"><dir name="novalnet"><dir><dir name="payment"><dir name="method"><dir name="form"><file name="Cc.phtml" hash="de0f1ed8f03a3b136563a6e4767896af"/><file name="Ccform.phtml" hash="da47194fddbadbe1b6e95b49c15b78df"/><file name="Ideal.phtml" hash="f56a1a6d3da636e3d730bdf8e4d151e4"/><file name="Invoice.phtml" hash="cb3a30420490dad11009c2668f4336fb"/><file name="Paypal.phtml" hash="0fc72f4a2e5ec1d525b9fc599e866729"/><file name="Phonepayment.phtml" hash="120b8edd70736b6f710257cbf36bcead"/><file name="Prepayment.phtml" hash="facbc4718e6ea9d2e819c7d20f5aa9ff"/><file name="Sepa.phtml" hash="6bfa45d946b229b490996a0682de2274"/><file name="Sepaform.phtml" hash="456fc41b024c9c2b8863bc921b2f991a"/><file name="Sofortueberweisung.phtml" hash="df75b7a30c4bc0a304b4e3e8f26da77f"/><file name="blank.phtml" hash="7032809fa5e26991a9d237d10da9bafc"/></dir><dir name="info"><file name="Cc.phtml" hash="1a735ec85e33af9cd6aedcb14f4594ec"/><file name="Ideal.phtml" hash="7e09322a1deca208095a3547b089f8b7"/><file name="Invoice.phtml" hash="8e86b38df416c321afe3d1939d353630"/><file name="Paypal.phtml" hash="577f54c9093f223ff972f20c6ab9e815"/><file name="Phonepayment.phtml" hash="9d2db9cba7f7e10201be956b8dffa3d9"/><file name="Prepayment.phtml" hash="6853ae71acae4081443c9d9dfffa725b"/><file name="Sepa.phtml" hash="d3a92ae36f6c2073bdac3185b27a3297"/><file name="Sofortueberweisung.phtml" hash="577f54c9093f223ff972f20c6ab9e815"/></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="novalnet"><file name="configuration.xml" hash="3983c76b9a43bcacddaee738b2726ac4"/></dir></dir><dir name="template"><dir name="novalnet"><dir><dir name="information"><file name="iframe.phtml" hash="e6daaa6fa00de4f160e22018eb68621c"/></dir><dir name="payment"><dir name="configuration"><file name="container.phtml" hash="9dbd663ddbe1a07833279ee1087f0f46"/><file name="formcontainer.phtml" hash="2cec21120c24e5fe27fd0a66e22d64ec"/><file name="store_switcher.phtml" hash="fc0e8b2cceb115ff600d76b0ebc0fbae"/></dir><dir name="method"><dir name="form"><file name="Cc.phtml" hash="308f4fc2a5b355ea706a9158a9bba530"/><file name="Ccform.phtml" hash="da47194fddbadbe1b6e95b49c15b78df"/><file name="Ideal.phtml" hash="01db5b0515da5ed886ea51f1d755ee44"/><file name="Invoice.phtml" hash="1ca08219768e3572e1c1b9acb81530d8"/><file name="Paypal.phtml" hash="d15d81e003981333d63533c716ec36a8"/><file name="Phonepayment.phtml" hash="9368f5b8d4daea41cc99cdfcfc8757dc"/><file name="Prepayment.phtml" hash="f05079525becea06d6f7e3d94c6ee04e"/><file name="Sepa.phtml" hash="1d6637c1bf12318afd5d185ccb6e8c3d"/><file name="Sepaform.phtml" hash="456fc41b024c9c2b8863bc921b2f991a"/><file name="Sofortueberweisung.phtml" hash="4160500b658a29f512efc19fc797bb8b"/><file name="blank.phtml" hash="7032809fa5e26991a9d237d10da9bafc"/></dir><dir name="info"><file name="Cc.phtml" hash="1a735ec85e33af9cd6aedcb14f4594ec"/><file name="Ideal.phtml" hash="5920e15cce021da516946d2c5b01e19d"/><file name="Invoice.phtml" hash="8e86b38df416c321afe3d1939d353630"/><file name="Paypal.phtml" hash="5920e15cce021da516946d2c5b01e19d"/><file name="Phonepayment.phtml" hash="906a5860fa52c9679dc43eab538f4dc9"/><file name="Prepayment.phtml" hash="6853ae71acae4081443c9d9dfffa725b"/><file name="Sepa.phtml" hash="d3a92ae36f6c2073bdac3185b27a3297"/><file name="Sofortueberweisung.phtml" hash="5920e15cce021da516946d2c5b01e19d"/></dir><dir name="pdf"><file name="Cc.phtml" hash="118c0f0aadf31e19af703500e37c2e9a"/><file name="Ideal.phtml" hash="1ccc77c4412ab7f6f09a49fe4ff64f86"/><file name="Invoice.phtml" hash="45519181cfc46a52164eea02c7471e72"/><file name="Paypal.phtml" hash="85ac63596921b6e7399c2afd043de09e"/><file name="Phonepayment.phtml" hash="1ccc77c4412ab7f6f09a49fe4ff64f86"/><file name="Prepayment.phtml" hash="6b365551040022926f1aedec04a45b2d"/><file name="Sepa.phtml" hash="1f748b8cca6f92d970a40e777976792f"/><file name="Sofortueberweisung.phtml" hash="1ccc77c4412ab7f6f09a49fe4ff64f86"/></dir></dir></dir><dir name="sales"><dir name="order"><file name="transactionoverview.phtml" hash="a0542be006ad1ff79dd115736a0f5892"/></dir></dir><dir name="transaction"><dir name="overview"><dir name="view"><file name="form.phtml" hash="89796cb589d8942ad8ef2f86b7049b46"/></dir></dir><dir name="view"><file name="form.phtml" hash="68207f5c34f4caa61df72978caf03d6a"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Novalnet_Payment.xml" hash="10435c3d2753cd57328c1dd7ba7e8f8f"/></dir></target><target name="magelocale"><dir name="de_DE"><dir name="template"><dir name="email"><dir name="novalnet"><file name="novalnet_callback_email.html" hash="150f01235ae4bcb2bfbf88b070410b9a"/></dir></dir></dir><file name="Novalnet_Payment.csv" hash="1e0a46755189a6035ed5e090294e3efc"/></dir><dir name="en_US"><dir name="template"><dir name="email"><dir name="novalnet"><file name="novalnet_callback_email.html" hash="150f01235ae4bcb2bfbf88b070410b9a"/></dir></dir></dir><file name="Novalnet_Payment.csv" hash="791118688fd2998404265bc68bef0a44"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="novalnet"><file name="creditcard_amex.png" hash="3ea459a9b8aa5ba98599a05465e4cc50"/><file name="creditcard_small.png" hash="09b3c4ac86dd090e59fd1ce35edd8d43"/><file name="ideal_payment_small.png" hash="b20b36547d3c0fb402044c3410826c83"/><file name="kauf-auf-rechnung.png" hash="5d52bfae815158e591221a0b5572cac2"/><file name="novalnet-loading-icon.gif" hash="971e6ee26dcfd335e9a4a65e58431888"/><file name="novaltel_reciever.png" hash="a3f1dad8f4f968facf759c2ba2774d82"/><file name="paypal-small.png" hash="11005b696d1191be9d761ce1438b4c20"/><file name="sepa_logo.png" hash="c974ef65f4402d529fd2ef0cb1ca51a1"/><file name="sofort_Logo.png" hash="9cdaf6feb2699335e2752309ed18ce39"/><file name="vorauskasse.png" hash="ab31709394ee48060572f1ab4001ca30"/></dir></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="novalnet"><file name="novalnetcc.js" hash="05955de536a0131378c90ffa5e8c2ac6"/><file name="novalnetsepa.js" hash="57ac331d46443bf20086e44ce7bb75c4"/></dir></dir><dir name="."><file name="callback_novalnet2magento.php" hash="35ed760cb584b9fa53dec0605a90178d"/><file name="novalnet_css_link.php" hash="14cc60d4148b3d92b0b77a4d569d2b49"/></dir></target></contents>
18
  <compatible/>
19
  <dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
20
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Novalnet</name>
4
+ <version>5.0.4</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Novalnet AG ist ein deutsches EPayment - Unternehmen, bietet alle relevanten Zahlungsarten weltweit. / Novalnet is a German based payment service provider, which offers all the available payments and solutions worldwide.</summary>
10
  <description>The NOVALNET AG is an essential component of e-Payment platform that facilitates your company to process all type of payments. As one of the leading company in Online-Payment the NOVALNET AG provides its customers an individual, technically qualified secured Payment system and also the best possible support throughout. NOVALNET AG is not only an e-Payment provider but also we offer our Merchants an optimal strategic solution for easy payment processing which is pocket-friendly for our customer.</description>
11
+ <notes>- Code Optimization has been done.&#xD;
12
+ - Compatibility has been checked for Magento latest version 1.9.1.0.</notes>
 
13
  <authors><author><name>Gabriel Dixon</name><user>Novalnet</user><email>gd@novalnet.de</email></author></authors>
14
+ <date>2015-03-20</date>
15
+ <time>07:44:03</time>
16
+ <contents><target name="magecommunity"><dir name="Novalnet"><dir><dir name="Payment"><dir name="Block"><dir name="Adminhtml"><dir name="Configuration"><dir name="Wizard"><dir name="Config"><file name="Form.php" hash="d50320e71f5306d355cd77236b293461"/></dir><dir name="Page"><file name="Edit.php" hash="b678b20f08b7d7fa67b34643bd30f524"/><file name="View.php" hash="eee45c13510ef507c0d5047d996b7a06"/></dir></dir></dir><file name="Information.php" hash="671d22c22f6fb52c4848c56875734ad1"/><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="334185d413357c913bdd82de30fc1263"/><dir name="Invoice"><file name="View.php" hash="979096906e3a6cdea734de0ffc64a503"/></dir><dir name="View"><dir name="Tab"><file name="TransactionOverview.php" hash="8576d6c3d21d349dce201709398c1ba3"/><file name="TransactionStatus.php" hash="3f66b781906f6fd1e2fe21923e5f8113"/></dir></dir><file name="View.php" hash="543c3cabd449a4583107bad2915e517a"/></dir><file name="Order.php" hash="a50807ab4354f98ca4f7119ce6818019"/><file name="Sales.php" hash="955045ba24383e85fdd2e4dd7a8fa437"/></dir><dir name="Transaction"><file name="Grid.php" hash="789590b5650b56a88202263a0a622ad6"/><dir name="View"><file name="Form.php" hash="1960a7abc65e82c6893cb59cbd8fff13"/></dir><file name="View.php" hash="ed6be2758585f95dcde510c91d3ade16"/></dir><file name="Transaction.php" hash="9d67e39e951ef6e31da72bfd4d648249"/><dir name="Transactionoverview"><file name="Grid.php" hash="b25bb4bebd75ddce213b7e7650393950"/><dir name="View"><file name="Form.php" hash="3414da367d9f47ecc670233ddead8a56"/></dir><file name="View.php" hash="732eefafa1d4da904e0aa9d2d916ec81"/></dir><file name="Transactionoverview.php" hash="40526ce2c4af87feed44d464cd7e6ac9"/><dir name="Widget"><dir name="Grid"><file name="Container.php" hash="88fbf0828a467052e78e2a1190a94a69"/></dir><dir name="View"><file name="Container.php" hash="d402dcb6071d8c24d892294a09cfbec6"/></dir></dir><file name="Widget.php" hash="b7e56081324f74131c31a05af8a47c55"/></dir><dir name="Payment"><dir name="Method"><dir name="Form"><file name="Cc.php" hash="a0c8a17abc42466c5c868fde77518d89"/><file name="Ideal.php" hash="b89683cef4763de8993167673daa72c0"/><file name="Invoice.php" hash="b606ead6794a7fd99ace43d08945af92"/><file name="Paypal.php" hash="9171484b1818250ba7d0672b4783ca50"/><file name="Prepayment.php" hash="9927882e6c74665df4c2459467c38af7"/><file name="Sepa.php" hash="7cdc2dfeea7e5616a1457fe3e7b3c8d3"/><file name="Sofortueberweisung.php" hash="857813455baecaba2fbc84aa8d8d7be2"/></dir><dir name="Info"><file name="Cc.php" hash="a3634a25d40fa0d5ca625336e137fb53"/><file name="Ideal.php" hash="bd58561ec878ad12033962936798be3e"/><file name="Invoice.php" hash="6d00fcbc62f149c672e7534ec3ef0ce2"/><file name="Paypal.php" hash="33e2d4054ea779569bf045f80c591de5"/><file name="Prepayment.php" hash="199e172a42f608beae2c7a4e0561616c"/><file name="Sepa.php" hash="c482a3d0b92967bf6bc5cc0dc67a14c4"/><file name="Sofortueberweisung.php" hash="9d3f9b5776fbdd71baeb16284592de7e"/></dir><file name="NovalnetRedirect.php" hash="9f747e0e05608f1cc99a82af0b3ad9d9"/></dir></dir></dir><dir name="Helper"><file name="AssignData.php" hash="06fb97324eab8dff595c5ca4e697f550"/><file name="Data.php" hash="be8195d7a7f915cf0a23c18811058c57"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Create.php" hash="e5af3bf47bac3c66d0c1528c4f733498"/></dir></dir></dir><file name="Affiliate.php" hash="5c1ee5d8c9496a69e324c9a8216bed5f"/><file name="Affiliateuser.php" hash="0372dbed2d1029a680959773b2709bfb"/><file name="Callback.php" hash="4f6d7db7a52271ed961c5b2620b85750"/><file name="Callbackscript.php" hash="84c9957d29518b80a3bbceebe8f723b3"/><file name="Config.php" hash="d676075147e251c9aa81f5d1fff75298"/><dir name="Novalnet"><dir name="Source"><file name="Callbacktypes.php" hash="4ee3dcbc1dd9c76b80d64953dfeab078"/><file name="Cctypes.php" hash="d2d65dbb78aad536fcdde8a8fe351837"/></dir></dir><file name="Observer.php" hash="cb941bf29f56502a06d4c39dc5367503"/><dir name="Payment"><dir name="Method"><file name="Abstract.php" hash="ac8ff87089a636af62ea7805e4cf5d62"/><file name="NovalnetCc.php" hash="5c1fd05fbb52917eca879a296515476c"/><file name="NovalnetIdeal.php" hash="2345bf2e50492ec00dda2a7b9474ece0"/><file name="NovalnetInvoice.php" hash="392433d248bedeb1977ae5afb5426932"/><file name="NovalnetPaypal.php" hash="8e074a164b4b3822be3d37a20fa0d8a1"/><file name="NovalnetPrepayment.php" hash="8c4726067f83f3a70e5cec9c3704cc9b"/><file name="NovalnetSepa.php" hash="66bdac285cfcc3f68415d970eb1d5174"/><file name="NovalnetSofortueberweisung.php" hash="dcb5c82a9d641ad3dd17042578d48697"/></dir></dir><dir name="Resource"><dir name="Affiliate"><file name="Collection.php" hash="f2811c65cc8caa7052a7e7d189f343f0"/></dir><file name="Affiliate.php" hash="31773c69ce3aad976ed31b261f327414"/><dir name="Affiliateuser"><file name="Collection.php" hash="2fbe2f731b543693f5fa8c6c5c3886ce"/></dir><file name="Affiliateuser.php" hash="2be6fba1c221443fbb4fa6113cd43d4f"/><dir name="Callback"><file name="Collection.php" hash="896decdeb376a3bc58e3113ae3dfde7f"/></dir><file name="Callback.php" hash="13868a1174ddeb3e17fc11dc3e53a3ba"/><dir name="Transactionoverview"><file name="Collection.php" hash="d83f91c48e1f9f82172afbb04cdd5673"/></dir><file name="Transactionoverview.php" hash="9f90aa3fb75d5493b9c48cec97e56ea3"/><dir name="Transactionstatus"><file name="Collection.php" hash="cecc5d1eb5738262cd3a7d9a6fa87bd0"/></dir><file name="Transactionstatus.php" hash="ef36036141a12965f909bc504bed37a1"/></dir><dir name="System"><dir name="Config"><file name="Activemethods.php" hash="f6c983a4a6cfcc847eca669c9e4f03f0"/></dir></dir><file name="Transactionoverview.php" hash="e71003d50d7b311a0c4e911b2746edc6"/><file name="Transactionstatus.php" hash="7eeedec07a6367cba8b98b3500606a72"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Configuration"><dir name="Wizard"><file name="PageController.php" hash="5b9919b035e11c9ae7c2df7b80d01cb6"/></dir></dir><file name="InformationController.php" hash="e38ffd1998e75b96ce00e56572abfbea"/><dir name="Sales"><file name="OrderController.php" hash="8db4fe93816852c01b6baca2a24ebd89"/></dir><file name="TransactionController.php" hash="1d116f3c28f9e74284b95308409994ba"/><file name="TransactionoverviewController.php" hash="f6eeeaa2d2905c09319030687f9e0ed7"/></dir><file name="GatewayController.php" hash="fe5ac5262f27937e51ee4ce6d3265d5c"/></dir><dir name="etc"><file name="adminhtml.xml" hash="3d38327cf8d4d77e8b04ca18c49c7753"/><file name="config.xml" hash="85145f923e33fdeb4d16b2d05fc40407"/><file name="system.xml" hash="7dd6517745bfc97767cd84c7ccdf80e4"/></dir><dir name="sql"><dir name="novalnet_setup"><file name="mysql4-install-5.0.4.php" hash="ec4160f77a1691baef47f595ac241af1"/><file name="mysql4-upgrade-1.4.0-5.0.0.php" hash="3e4466647dcf27c78d7c9f2644d7e918"/><file name="mysql4-upgrade-5.0.0-5.0.1.php" hash="e0b879b8d75d2464de7dad66fcd750fd"/><file name="mysql4-upgrade-5.0.1-5.0.2.php" hash="283805a35843fda64814a3b96ea41a4c"/><file name="mysql4-upgrade-5.0.2-5.0.3.php" hash="946953f6fc66a2cf8831f903b696b9ba"/><file name="mysql4-upgrade-5.0.3-5.0.4.php" hash="196252233858f6df78e19209c911ce3c"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="novalnet"><file name="configuration.xml" hash="2108a9112558dda8dd673d30e044590a"/></dir></dir><dir name="template"><dir name="novalnet"><dir><dir name="information"><file name="iframe.phtml" hash="8e8b1b9df1810d1e1f210d865cacab37"/></dir><dir name="payment"><dir name="configuration"><file name="container.phtml" hash="addae913c81c97b466d22609899c7781"/><file name="formcontainer.phtml" hash="c20c7c3c8825d1c0ac343b45fecb8102"/><file name="store_switcher.phtml" hash="53604516a94474d34db5f5f6839f5953"/></dir><dir name="method"><dir name="form"><file name="Cc.phtml" hash="ee7ca1f2ed73cac8e0fa2ee72763812d"/><file name="Invoice.phtml" hash="2a96978e251b9412f115208ddc5e985f"/><file name="Prepayment.phtml" hash="c52a27ca95a9024119575918f86a818f"/><file name="Sepa.phtml" hash="77fa01a5658dbdf730a151b3485d78eb"/></dir><dir name="info"><file name="Cc.phtml" hash="90a91f5f63a135e07e22a329422873d6"/><file name="Ideal.phtml" hash="d5b6c2a006b8db6b7643b327daaf0f2f"/><file name="Invoice.phtml" hash="99afc5d115a70ac653105231bf89160c"/><file name="Paypal.phtml" hash="2e67adef9b038bc1dcf110294a87e306"/><file name="Prepayment.phtml" hash="c63c792330a60a97b9876c97301273f3"/><file name="Sepa.phtml" hash="b86021bfdb04be6b8e0fd3f76ad7fa68"/><file name="Sofortueberweisung.phtml" hash="2e67adef9b038bc1dcf110294a87e306"/></dir><dir name="pdf"><file name="Cc.phtml" hash="f80ef61758f381aa074e291d7854e043"/><file name="Ideal.phtml" hash="8472e45284389d40676c6adbb24fd6ef"/><file name="Invoice.phtml" hash="089ad64b4a07c73ddddeddaa20a75e5b"/><file name="Paypal.phtml" hash="304c35067d7ab40f03690c757187cb24"/><file name="Prepayment.phtml" hash="32e250a2038fda31ede70b669c289ba8"/><file name="Sepa.phtml" hash="4ae2bcdf5ad8631f50f2f72f5af472fd"/><file name="Sofortueberweisung.phtml" hash="8472e45284389d40676c6adbb24fd6ef"/></dir></dir></dir><dir name="sales"><dir name="order"><file name="transactionoverview.phtml" hash="9d59ffe611a07f34408ec3ef70bd1e2c"/></dir></dir><dir name="transaction"><dir name="overview"><dir name="view"><file name="form.phtml" hash="95b94c17efc06789156265754732373c"/></dir></dir><dir name="view"><file name="form.phtml" hash="945bd1e061eed6fcd99a5b97b9498179"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="novalnet.xml" hash="ef58c5b2392d30c9d88058b04ddf7748"/></dir><dir name="template"><dir name="novalnet"><dir><dir name="payment"><dir name="method"><dir name="form"><file name="Cc.phtml" hash="13c0b7abb0de0b0b14a3ff1a28b8f8ba"/><file name="Ideal.phtml" hash="6c058a466e0eb2edaaa0ab67f88ab983"/><file name="Invoice.phtml" hash="9451199ba5f82f33a40a52c01c1b4bba"/><file name="Paypal.phtml" hash="9df822a7874c10ec49ad71013d089340"/><file name="Prepayment.phtml" hash="78fd9f3c4dfa6cdcff688e4360d0e1ec"/><file name="Sepa.phtml" hash="e805df035efd48533d0a93a8026d86e6"/><file name="Sofortueberweisung.phtml" hash="26ee6d98ab8d26647c72bacc56cd28aa"/></dir><dir name="info"><file name="Cc.phtml" hash="b23cf7d210269bde01e06720b5d09f2b"/><file name="Ideal.phtml" hash="d5b6c2a006b8db6b7643b327daaf0f2f"/><file name="Invoice.phtml" hash="99afc5d115a70ac653105231bf89160c"/><file name="Paypal.phtml" hash="2e67adef9b038bc1dcf110294a87e306"/><file name="Prepayment.phtml" hash="c63c792330a60a97b9876c97301273f3"/><file name="Sepa.phtml" hash="b86021bfdb04be6b8e0fd3f76ad7fa68"/><file name="Sofortueberweisung.phtml" hash="2e67adef9b038bc1dcf110294a87e306"/></dir><dir name="pdf"><file name="Cc.phtml" hash="f80ef61758f381aa074e291d7854e043"/><file name="Ideal.phtml" hash="8472e45284389d40676c6adbb24fd6ef"/><file name="Invoice.phtml" hash="089ad64b4a07c73ddddeddaa20a75e5b"/><file name="Paypal.phtml" hash="304c35067d7ab40f03690c757187cb24"/><file name="Prepayment.phtml" hash="32e250a2038fda31ede70b669c289ba8"/><file name="Sepa.phtml" hash="4ae2bcdf5ad8631f50f2f72f5af472fd"/><file name="Sofortueberweisung.phtml" hash="8472e45284389d40676c6adbb24fd6ef"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="default"><dir name="default"><dir name="layout"><file name="novalnet.xml" hash="ef58c5b2392d30c9d88058b04ddf7748"/></dir><dir name="template"><dir name="novalnet"><dir><dir name="payment"><dir name="method"><dir name="form"><file name="Cc.phtml" hash="13c0b7abb0de0b0b14a3ff1a28b8f8ba"/><file name="Ideal.phtml" hash="6c058a466e0eb2edaaa0ab67f88ab983"/><file name="Invoice.phtml" hash="9451199ba5f82f33a40a52c01c1b4bba"/><file name="Paypal.phtml" hash="9df822a7874c10ec49ad71013d089340"/><file name="Prepayment.phtml" hash="78fd9f3c4dfa6cdcff688e4360d0e1ec"/><file name="Sepa.phtml" hash="e805df035efd48533d0a93a8026d86e6"/><file name="Sofortueberweisung.phtml" hash="26ee6d98ab8d26647c72bacc56cd28aa"/></dir><dir name="info"><file name="Cc.phtml" hash="b23cf7d210269bde01e06720b5d09f2b"/><file name="Ideal.phtml" hash="d5b6c2a006b8db6b7643b327daaf0f2f"/><file name="Invoice.phtml" hash="99afc5d115a70ac653105231bf89160c"/><file name="Paypal.phtml" hash="2e67adef9b038bc1dcf110294a87e306"/><file name="Prepayment.phtml" hash="c63c792330a60a97b9876c97301273f3"/><file name="Sepa.phtml" hash="b86021bfdb04be6b8e0fd3f76ad7fa68"/><file name="Sofortueberweisung.phtml" hash="2e67adef9b038bc1dcf110294a87e306"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="rwd"><dir name="default"><dir name="layout"><file name="novalnet.xml" hash="ef58c5b2392d30c9d88058b04ddf7748"/></dir><dir name="template"><dir name="novalnet"><dir><dir name="payment"><dir name="method"><dir name="form"><file name="Cc.phtml" hash="0960ac59faedf277bc12ad649141c01a"/><file name="Ideal.phtml" hash="6c058a466e0eb2edaaa0ab67f88ab983"/><file name="Invoice.phtml" hash="6e8fd7b931f56c6e23eaf99144fbb7d9"/><file name="Paypal.phtml" hash="9df822a7874c10ec49ad71013d089340"/><file name="Prepayment.phtml" hash="78fd9f3c4dfa6cdcff688e4360d0e1ec"/><file name="Sepa.phtml" hash="f2e197771de38a5bd31f6c916b3a17c9"/><file name="Sofortueberweisung.phtml" hash="26ee6d98ab8d26647c72bacc56cd28aa"/></dir><dir name="info"><file name="Cc.phtml" hash="b23cf7d210269bde01e06720b5d09f2b"/><file name="Ideal.phtml" hash="adff79c748d685a831b162a00f9adeb0"/><file name="Invoice.phtml" hash="99afc5d115a70ac653105231bf89160c"/><file name="Paypal.phtml" hash="83c5971f12da37d895c3c9b18dcda517"/><file name="Prepayment.phtml" hash="c63c792330a60a97b9876c97301273f3"/><file name="Sepa.phtml" hash="b86021bfdb04be6b8e0fd3f76ad7fa68"/><file name="Sofortueberweisung.phtml" hash="83c5971f12da37d895c3c9b18dcda517"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Novalnet_Payment.xml" hash="f414215bf71aedb521875120f9458ce5"/></dir></target><target name="magelocale"><dir name="de_DE"><dir name="template"><dir name="email"><dir name="novalnet"><file name="novalnet_callback_email.html" hash="150f01235ae4bcb2bfbf88b070410b9a"/></dir></dir></dir><file name="Novalnet_Payment.csv" hash="32bc29c30b75de82789616379d678475"/></dir><dir name="en_US"><dir name="template"><dir name="email"><dir name="novalnet"><file name="novalnet_callback_email.html" hash="150f01235ae4bcb2bfbf88b070410b9a"/></dir></dir></dir><file name="Novalnet_Payment.csv" hash="6e48edf47a17247422d3ae3a09e121e3"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="novalnet"><file name="AE_Logo.png" hash="0484f8a649d021af349bb768d98808c3"/><file name="MC_Logo.png" hash="345bf3c37b8742aea161539edd312d4b"/><file name="VI_Logo.png" hash="d1dd9a2b12a070c7aeaef44ec5a7647b"/><file name="creditcard_cvc.jpg" hash="718a57088dff41d318825fb23dc218d2"/><file name="cvc_hint.png" hash="6d8a91ad99d14c1b29a0bad068ef9e24"/><file name="ideal_payment_small.png" hash="b20b36547d3c0fb402044c3410826c83"/><file name="kauf-auf-rechnung.png" hash="5d52bfae815158e591221a0b5572cac2"/><file name="logo.png" hash="ebc76fa4208e642873f67d91fbfe2722"/><file name="novalnet-loading-icon.gif" hash="a930c6d9a8470b5e31449a5683deb419"/><file name="paypal-small.png" hash="11005b696d1191be9d761ce1438b4c20"/><file name="sepa_logo.png" hash="c974ef65f4402d529fd2ef0cb1ca51a1"/><file name="sofort_Logo.png" hash="9cdaf6feb2699335e2752309ed18ce39"/><file name="vorauskasse.png" hash="ab31709394ee48060572f1ab4001ca30"/></dir></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="novalnet"><file name="jquery-1.10.2.min.js" hash="ce805da206227418232aa9b1901b3480"/><file name="novalnetcc.js" hash="d165fedb2ee4f60decc55b5de7ad3db4"/><file name="novalnetsepa.js" hash="9516d9b39dcc62e135b5b7c2eb8bf3a8"/></dir></dir><dir name="."><file name="callback_novalnet2magento.php" hash="b075b07c2a85cd81288a6c2b5d6b9092"/></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>
skin/frontend/base/default/images/novalnet/AE_Logo.png ADDED
Binary file
skin/frontend/base/default/images/novalnet/MC_Logo.png ADDED
Binary file
skin/frontend/base/default/images/novalnet/VI_Logo.png ADDED
Binary file
skin/frontend/base/default/images/novalnet/creditcard_amex.png DELETED
Binary file
skin/frontend/base/default/images/novalnet/creditcard_cvc.jpg ADDED
Binary file
skin/frontend/base/default/images/novalnet/creditcard_small.png DELETED
Binary file
skin/frontend/base/default/images/novalnet/cvc_hint.png ADDED
Binary file
skin/frontend/base/default/images/novalnet/logo.png ADDED
Binary file
skin/frontend/base/default/images/novalnet/novalnet-loading-icon.gif CHANGED
Binary file
skin/frontend/base/default/images/novalnet/novaltel_reciever.png DELETED
Binary file