Mage_Payone - Version 3.7.5

Version Notes

Mage_Payone-3.7.5

Download this release

Release Info

Developer PAYONE
Extension Mage_Payone
Version 3.7.5
Comparing to
See all releases


Code changes from version 3.7.0 to 3.7.5

Files changed (46) hide show
  1. app/code/community/Payone/Core/Block/Payment/Method/Form/Payolution.php +157 -95
  2. app/code/community/Payone/Core/Block/Payment/Method/Info/Payolution.php +6 -3
  3. app/code/community/Payone/Core/Block/Payment/Method/Info/PayolutionDebit.php +34 -0
  4. app/code/community/Payone/Core/Block/Payment/Method/Info/PayolutionInstallment.php +34 -0
  5. app/code/community/Payone/Core/Block/Payment/Method/Info/PayolutionInvoicing.php +34 -0
  6. app/code/community/Payone/Core/Model/Config/General/CcHostedTranslations.php +13 -2
  7. app/code/community/Payone/Core/Model/Config/General/StatusMapping.php +65 -14
  8. app/code/community/Payone/Core/Model/Config/Payment/Method/Interface.php +11 -0
  9. app/code/community/Payone/Core/Model/Domain/Protocol/Api.php +2 -2
  10. app/code/community/Payone/Core/Model/Handler/Payment/Abstract.php +11 -3
  11. app/code/community/Payone/Core/Model/Mapper/ApiRequest/Payment/Authorize/Abstract.php +42 -21
  12. app/code/community/Payone/Core/Model/Mapper/ApiRequest/Payment/Capture.php +13 -2
  13. app/code/community/Payone/Core/Model/Mapper/ApiRequest/Payment/Debit.php +7 -4
  14. app/code/community/Payone/Core/Model/Mapper/ApiRequest/Payment/Genericpayment.php +1 -1
  15. app/code/community/Payone/Core/Model/Observer/Checkout/Onepage/{DebitPayment.php → MultiplePaymentCheck.php} +11 -6
  16. app/code/community/Payone/Core/Model/Observer/TransactionStatus/InvoiceCreate.php +6 -2
  17. app/code/community/Payone/Core/Model/Payment/Method/{Payolution.php → PayolutionDebit.php} +32 -11
  18. app/code/community/Payone/Core/Model/Payment/Method/PayolutionInstallment.php +63 -0
  19. app/code/community/Payone/Core/Model/Payment/Method/PayolutionInvoicing.php +63 -0
  20. app/code/community/Payone/Core/Model/Payment/Method/Ratepay.php +19 -0
  21. app/code/community/Payone/Core/Model/System/Config/PaymentMethodCode.php +11 -5
  22. app/code/community/Payone/Core/Model/System/Config/PaymentMethodType.php +7 -2
  23. app/code/community/Payone/Core/controllers/Checkout/OnepageController.php +1 -1
  24. app/code/community/Payone/Core/controllers/TransactionStatusController.php +1 -1
  25. app/code/community/Payone/Core/etc/config.xml +58 -9
  26. app/code/community/Payone/Core/etc/system.xml +81 -16
  27. app/code/community/Payone/Core/sql/payone_core_setup/mysql4-upgrade-3.7.1-3.7.2.php +94 -0
  28. app/code/community/Payone/Core/sql/payone_core_setup/upgrade-3.7.1-3.7.2.sql +15 -0
  29. app/code/community/Payone/Core/sql/payone_core_setup/upgrade-3.7.3-3.7.4.sql +6 -0
  30. app/design/adminhtml/default/default/template/payone/core/payment/method/form/payolution.phtml +5 -21
  31. app/design/adminhtml/default/default/template/payone/core/payment/method/info/payolution.phtml +1 -1
  32. app/design/adminhtml/default/default/template/payone/core/system/config/tooltip/payment/online_bank_transfer.phtml +1 -1
  33. app/design/frontend/base/default/layout/payone/core.xml +2 -2
  34. app/design/frontend/base/default/template/payone/core/checkout/onepage/init.phtml +2 -2
  35. app/design/frontend/base/default/template/payone/core/payment/method/form/payolution.phtml +46 -49
  36. app/design/frontend/base/default/template/payone/core/payment/method/info/payolution.phtml +1 -1
  37. app/locale/de_DE/Payone_Core.csv +11 -2
  38. app/locale/en_US/Payone_Core.csv +1 -1
  39. lib/Payone/Api/Request/Parameter/Authorization/PaymentMethod/Wallet.php +20 -0
  40. lib/Payone/Enum/ClearingType.php +6 -4
  41. lib/Payone/SessionStatus/Validator/Ip.php +3 -14
  42. lib/Payone/Settings/Data/ConfigFile/PaymentMethod/PayolutionDebit.php +42 -0
  43. lib/Payone/Settings/Data/ConfigFile/PaymentMethod/PayolutionInstallment.php +43 -0
  44. lib/Payone/Settings/Data/ConfigFile/PaymentMethod/{Payolution.php → PayolutionInvoicing.php} +7 -3
  45. lib/Payone/TransactionStatus/Validator/Ip.php +3 -15
  46. package.xml +1 -39
app/code/community/Payone/Core/Block/Payment/Method/Form/Payolution.php CHANGED
@@ -1,4 +1,5 @@
1
<?php
2
/**
3
*
4
* NOTICE OF LICENSE
@@ -15,68 +16,107 @@
15
* @category Payone
16
* @package Payone_Core_Block
17
* @subpackage Payment
18
- * @copyright Copyright (c) 2015 <kontakt@fatchip.de> - www.fatchip.com
19
- * @author Robert M�ller <robert.mueller@fatchip.de>
20
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
- * @link http://www.fatchip.com
22
*/
23
24
class Payone_Core_Block_Payment_Method_Form_Payolution extends Payone_Core_Block_Payment_Method_Form_Abstract
25
{
26
-
27
protected $_sAcceptanceBaseUrl = 'https://payment.payolution.com/payolution-payment/infoport/dataprivacydeclaration?mId=';
28
29
protected $hasTypes = true;
30
-
31
- protected $_sFallback = "<header>
32
- <strong>Zus�tzliche Hinweise f�r die Datenschutzerkl�rung f�r Kauf auf Rechnung, Ratenzahlung und Zahlung mittels SEPA-Basis-Lastschrift von **company** (im Folgenden: �wir�)</strong></br>
33
- <span><i>(Stand: 17.03.2016)</i></span>
34
- </header>
35
- <ol>
36
- <li><p>Bei Kauf auf Rechnung oder Ratenzahlung oder SEPA-Basis-Lastschrift wird von Ihnen w�hrend des Bestellprozesses eine datenschutzrechtliche Einwilligung eingeholt. Folgend finden Sie eine Wiederholung dieser Bestimmungen, die lediglich informativen Charakter haben.</p></li>
37
- <li><p>Bei Auswahl von Kauf auf Rechnung oder Ratenzahlung oder Bezahlung mittels SEPA-Basis-Lastschrift werden f�r die Abwicklung dieser Zahlarten personenbezogene Daten (Vorname, Nachname, Adresse, Email, Telefonnummer, Geburtsdatum, IP-Adresse, Geschlecht) gemeinsam mit f�r die Transaktionsabwicklung erforderlichen Daten (Artikel, Rechnungsbetrag, Zinsen, Raten, F�lligkeiten, Gesamtbetrag, Rechnungsnummer, Steuern, W�hrung, Bestelldatum und Bestellzeitpunkt) an payolution �bermittelt werden. payolution hat ein berechtigtes Interesse an den Daten und ben�tigt bzw. verwendet diese um Risiko�berpr�fungen durchzuf�hren.</p></li>
38
- <li>
39
- <p>Zur �berpr�fung der Identit�t bzw. Bonit�t des Kunden werden Abfragen und Ausk�nfte bei �ffentlich zug�nglichen Datenbanken sowie Kreditauskunfteien durchgef�hrt. Bei nachstehenden Anbietern k�nnen Ausk�nfte und gegebenenfalls Bonit�tsinformationen auf Basis mathematisch-statistischer Verfahren eingeholt werden:</p>
40
- <ul>
41
- <li>CRIF GmbH, Diefenbachgasse 35, A-1150 Wien</li>
42
- <li>CRIF AG, Hagenholzstrasse 81, CH-8050 Z�rich</li>
43
- <li>Deltavista GmbH, Dessauerstra�e 9, D-80992 M�nchen</li>
44
- <li>SCHUFA Holding AG, Kormoranweg 5, D-65201 Wiesbaden</li>
45
- <li>KSV1870 Information GmbH, Wagenseilgasse 7, A-1120 Wien</li>
46
- <li>B�rgel Wirtschaftsinformationen GmbH & Co. KG, Gasstra�e 18, D-22761 Hamburg</li>
47
- <li>Creditreform Boniversum GmbH, Hellersbergstr. 11, D-41460 Neuss</li>
48
- <li>infoscore Consumer Data GmbH, Rheinstra�e 99, D-76532 Baden-Baden</li>
49
- <li>ProfileAddress Direktmarketing GmbH, Altmannsdorfer Strasse 311, A-1230 Wien</li>
50
- <li>Deutsche Post Direkt GmbH, Junkersring 57, D-53844 Troisdorf</li>
51
- <li>payolution GmbH, Am Euro Platz 2, A-1120 Wien</li>
52
- </ul>
53
- <p>payolution wird Ihre Angaben zur Bankverbindung (insbesondere Bankleitzahl und Kontonummer) zum Zwecke der Kontonummernpr�fung an die SCHUFA Holding AG �bermitteln. Die SCHUFA pr�ft anhand dieser Daten zun�chst, ob die von Ihnen gemachten Angaben zur Bankverbindung plausibel sind. Die SCHUFA �berpr�ft, ob die zur Pr�fung verwendeten Daten ggf. in Ihrem Datenbestand gespeichert sind und �bermittelt sodann das Ergebnis der �berpr�fung an payolution zur�ck. Ein weiterer Datenaustausch wie die Bekanntgabe von Bonit�tsinformationen oder eine �bermittlung abweichender Bankverbindungsdaten sowie Speicherung Ihrer Daten im SCHUFA-Datenbestand finden im Rahmen der Kontonummernpr�fung nicht statt. Es wird aus Nachweisgr�nden allein die Tatsache der �berpr�fung der Bankverbindungsdaten bei der SCHUFA gespeichert.</p>
54
- <p>payolution ist berechtigt, auch Daten zu etwaigem nicht-vertragsgem��en Verhalten (z.B. unbestrittene offene Forderungen) zu speichern, zu verarbeiten, zu nutzen und an oben genannte Auskunfteien zu �bermitteln.</p>
55
- </li>
56
- <li><p>Wir sind bereits nach den Bestimmungen des B�rgerlichen Gesetzbuches �ber Finanzierungshilfen zwischen Unternehmern und Verbrauchern, zu einer Pr�fung Ihrer Kreditw�rdigkeit gesetzlich verpflichtet.</p></li>
57
- <li><p>Im Fall eines Kaufs auf Rechnung oder Ratenkauf oder einer Bezahlung mittels SEPA-Basis-Lastschrift werden der payolution GmbH Daten �ber die Aufnahme (zu Ihrer Person, Kaufpreis, Laufzeit des Teilzahlungsgesch�fts, Ratenbeginn) und vereinbarungsgem��e Abwicklung (z.B. vorzeitige R�ckzahlung, Laufzeitverl�ngerung, erfolgte R�ckzahlungen) dieses Teilzahlungsgesch�fts �bermittelt. Nach Abtretung der Kaufpreisforderung wird die forderungs�bernehmende Bank die genannten Daten�bermittlungen vornehmen. Wir bzw. die Bank, der die Kaufpreisforderung abgetreten wird, werden payolution GmbH auch Daten aufgrund nichtvertragsgem��er Abwicklung (z.B. K�ndigung des Teilzahlungsgesch�fts, Zwangsvollstreckungs-ma�nahmen) melden. Diese Meldungen d�rfen nach den datenschutzrechtlichen Bestimmungen nur erfolgen, soweit dies zur Wahrung berechtigter Interessen von Vertragspartnern der payolution GmbH oder der Allgemeinheit erforderlich ist und dadurch Ihre schutzw�rdigen Belange nicht beeintr�chtigt werden. payolution GmbH speichert die Daten, um ihren Vertragspartnern, die gewerbsm��ig Teilzahlungs- und sonstige Kreditgesch�fte an Verbraucher geben, Informationen zur Beurteilung der Kreditw�rdigkeit von Kunden geben zu k�nnen. An Unternehmen, die gewerbsm��ig Forderungen einziehen und payolution GmbH vertraglich angeschlossen sind, k�nnen zum Zwecke der Schuldnerermittlung Adressdaten �bermittelt werden. payolution GmbH stellt die Daten ihren Vertragspartnern nur zur Verf�gung, wenn diese ein berechtigtes Interesse an der Daten�bermittlung glaubhaft darlegen. payolution GmbH �bermittelt nur objektive Daten ohne Angabe der Bank; subjektive Werturteile sowie pers�nliche Einkommens- und Verm�gensverh�ltnisse sind in Ausk�nften der payolution GmbH nicht enthalten.</p></li>
58
- <li><p>Die im Bestellprozess durch Einwilligung erfolgte Zustimmung zur Datenweitergabe kann jederzeit, auch ohne Angabe von Gr�nden, uns gegen�ber widerrufen k�nnen. Die oben genannten gesetzlichen Verpflichtungen zur �berpr�fung Ihrer Kreditw�rdigkeit bleiben von einem allf�lligen Widerruf jedoch unber�hrt. Sie sind verpflichtet ausschlie�lich wahrheitsgetreue Angaben gegen�ber uns zu machen.</p></li>
59
- <li><p>Sollten Sie Auskunft �ber die Erhebung, Nutzung, Verarbeitung oder �bermittlung von Sie betreffenden personenbezogenen Daten erhalten wollen oder Ausk�nfte, Berichtigungen, Sperrungen oder L�schung dieser Daten w�nschen, k�nnen Sie sich an den Sachbearbeiter f�r Datenschutz bei payolution wenden:</p></li>
60
- </ol>
61
-
62
- <footer>Sachbearbeiter f�r Datenschutz<br />
63
- datenschutz@payolution.com<br />
64
- payolution GmbH<br />
65
- Am Euro Platz 2<br />
66
- 1120 Wien<br />
67
- DVR: 4008655
68
- </footer>";
69
-
70
protected $_aBackendBlacklist = array(
71
Payone_Api_Enum_PayolutionType::PYS
72
);
73
-
74
- protected function _construct()
75
{
76
parent::_construct();
77
$this->setTemplate('payone/core/payment/method/form/payolution.phtml');
78
}
79
80
public function getPayolutionType()
81
{
82
if($this->_sType === null) {
@@ -86,26 +126,24 @@ class Payone_Core_Block_Payment_Method_Form_Payolution extends Payone_Core_Block
86
87
return $this->_sType;
88
}
89
-
90
- public function getPayolutionTypes()
91
- {
92
- return $this->getMethod()->getConfig()->getTypes();
93
- }
94
-
95
public function getPayolutionTypesBackend()
96
{
97
$aTypes = $this->getPayolutionTypes();
98
-
99
$aTypesReturn = array();
100
foreach ($aTypes as $sType) {
101
- if(array_search($sType, $this->_aBackendBlacklist) === false) {
102
$aTypesReturn[] = $sType;
103
}
104
}
105
106
return $aTypesReturn;
107
}
108
-
109
/**
110
* @return bool
111
*/
@@ -134,29 +172,38 @@ class Payone_Core_Block_Payment_Method_Form_Payolution extends Payone_Core_Block
134
135
return false;
136
}
137
-
138
- public function isB2BMode()
139
{
140
- if((bool)$this->getMethod()->getConfig()->getB2bMode() === true) {
141
$sCompany = $this->getQuote()->getBillingAddress()->getCompany();
142
- if($sCompany) {
143
return true;
144
}
145
}
146
147
return false;
148
}
149
-
150
- public function showBirthdayFields()
151
{
152
- if($this->isB2BMode() === false) {
153
return true;
154
}
155
156
return false;
157
}
158
-
159
- public function showDebitFields()
160
{
161
if ($this->getPayolutionType() == Payone_Api_Enum_PayolutionType::PYD) {
162
return true;
@@ -164,63 +211,78 @@ class Payone_Core_Block_Payment_Method_Form_Payolution extends Payone_Core_Block
164
165
return false;
166
}
167
-
168
- protected function _getFallbackText($sCompany)
169
- {
170
- $sFallback = str_replace('**company**', $sCompany, $this->_sFallback);
171
- return $sFallback;
172
- }
173
-
174
- protected function _isUtf8EncodingNeeded($sString)
175
- {
176
- if (preg_match('!!u', $sString)) {
177
- // this is utf-8
178
- return false;
179
- } else {
180
- // definitely not utf-8
181
- return true;
182
- }
183
- }
184
-
185
public function getPayolutionAcceptanceText()
186
{
187
$sCompany = $this->getMethod()->getConfig()->getCompanyName();
188
- $sUrl = $this->_sAcceptanceBaseUrl.base64_encode($sCompany);
189
$sContent = file_get_contents($sUrl);
190
$sPage = false;
191
- if(!empty($sContent) && stripos($sContent, 'payolution') !== false && stripos($sContent, '<header>') !== false) {
192
//Parse content from HTML-body-tag from the given page
193
$sRegex = "#<\s*?body\b[^>]*>(.*?)</body\b[^>]*>#s";
194
preg_match($sRegex, $sContent, $aMatches);
195
- if(is_array($aMatches) && count($aMatches) > 1) {
196
$sPage = $aMatches[1];
197
//remove everything bevore the <header> tag ( a window.close link which wouldn't work in the given context )
198
$sPage = substr($sPage, stripos($sPage, '<header>'));
199
}
200
}
201
202
- if(!$sPage) {
203
$sPage = $this->_getFallbackText($sCompany);
204
}
205
206
- if($this->_isUtf8EncodingNeeded($sPage)) {
207
$sPage = utf8_encode($sPage);
208
}
209
210
return $sPage;
211
}
212
-
213
/**
214
- * @return array
215
*/
216
- protected function getSystemConfigMethodTypes()
217
{
218
- return $this->getFactory()->getModelSystemConfigPayolutionType()->toSelectArray();
219
}
220
-
221
public function getHandleInstallmentUrl()
222
{
223
- return $this->getUrl('payone_core/checkout_onepage/handlePayolutionInstallment');
224
}
225
-
226
- }
1
<?php
2
+
3
/**
4
*
5
* NOTICE OF LICENSE
16
* @category Payone
17
* @package Payone_Core_Block
18
* @subpackage Payment
19
+ * @copyright Copyright (c) 2015 <kontakt@fatchip.de> - www.fatchip.com, Copyright (c) 2017 <support@e3n.de> - www.e3n.de
20
+ * @author Robert Müller <robert.mueller@fatchip.de>, Tim Rein <tim.rein@e3n.de>
21
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
22
+ * @link http://www.fatchip.com, http://www.e3n.de
23
*/
24
25
+ /**
26
+ * Class Payone_Core_Block_Payment_Method_Form_Payolution
27
+ */
28
class Payone_Core_Block_Payment_Method_Form_Payolution extends Payone_Core_Block_Payment_Method_Form_Abstract
29
{
30
+ /**
31
+ * @var string
32
+ */
33
protected $_sAcceptanceBaseUrl = 'https://payment.payolution.com/payolution-payment/infoport/dataprivacydeclaration?mId=';
34
35
+ /**
36
+ * @var bool
37
+ */
38
protected $hasTypes = true;
39
+
40
+ /**
41
+ * @var string
42
+ */
43
+ protected $_sFallback = "
44
+ <header>
45
+ <strong>Zusätzliche Hinweise für die Datenschutzerklärung für Kauf auf Rechnung, Ratenzahlung und Zahlung mittels SEPA-Basis-Lastschrift von **company** (im Folgenden: \"wir\")</strong></br>
46
+ <span><i>(Stand: 17.03.2016)</i></span>
47
+ </header>
48
+ <ol>
49
+ <li><p>Bei Kauf auf Rechnung oder Ratenzahlung oder SEPA-Basis-Lastschrift wird von Ihnen während des Bestellprozesses eine datenschutzrechtliche Einwilligung eingeholt. Folgend finden Sie eine Wiederholung dieser Bestimmungen, die lediglich informativen Charakter haben.</p></li>
50
+ <li><p>Bei Auswahl von Kauf auf Rechnung oder Ratenzahlung oder Bezahlung mittels SEPA-Basis-Lastschrift werden für die Abwicklung dieser Zahlarten personenbezogene Daten (Vorname, Nachname, Adresse, Email, Telefonnummer, Geburtsdatum, IP-Adresse, Geschlecht) gemeinsam mit für die Transaktionsabwicklung erforderlichen Daten (Artikel, Rechnungsbetrag, Zinsen, Raten, Fälligkeiten, Gesamtbetrag, Rechnungsnummer, Steuern, Währung, Bestelldatum und Bestellzeitpunkt) an payolution übermittelt werden. payolution hat ein berechtigtes Interesse an den Daten und benötigt bzw. verwendet diese um Risikoüberprüfungen durchzuführen.</p></li>
51
+ <li>
52
+ <p>Zur Überprüfung der Identität bzw. Bonität des Kunden werden Abfragen und Auskünfte bei öffentlich zugänglichen Datenbanken sowie Kreditauskunfteien durchgeführt. Bei nachstehenden Anbietern können Auskünfte und gegebenenfalls Bonitätsinformationen auf Basis mathematisch-statistischer Verfahren eingeholt werden:</p>
53
+ <ul>
54
+ <li>CRIF GmbH, Diefenbachgasse 35, A-1150 Wien</li>
55
+ <li>CRIF AG, Hagenholzstrasse 81, CH-8050 Zürich</li>
56
+ <li>Deltavista GmbH, Dessauerstraße 9, D-80992 München</li>
57
+ <li>SCHUFA Holding AG, Kormoranweg 5, D-65201 Wiesbaden</li>
58
+ <li>KSV1870 Information GmbH, Wagenseilgasse 7, A-1120 Wien</li>
59
+ <li>Bürgel Wirtschaftsinformationen GmbH & Co. KG, Gasstraße 18, D-22761 Hamburg</li>
60
+ <li>Creditreform Boniversum GmbH, Hellersbergstr. 11, D-41460 Neuss</li>
61
+ <li>infoscore Consumer Data GmbH, Rheinstraße 99, D-76532 Baden-Baden</li>
62
+ <li>ProfileAddress Direktmarketing GmbH, Altmannsdorfer Strasse 311, A-1230 Wien</li>
63
+ <li>Deutsche Post Direkt GmbH, Junkersring 57, D-53844 Troisdorf</li>
64
+ <li>payolution GmbH, Am Euro Platz 2, A-1120 Wien</li>
65
+ </ul>
66
+ <p>payolution wird Ihre Angaben zur Bankverbindung (insbesondere Bankleitzahl und Kontonummer) zum Zwecke der Kontonummernprüfung an die SCHUFA Holding AG übermitteln. Die SCHUFA prüft anhand dieser Daten zunächst, ob die von Ihnen gemachten Angaben zur Bankverbindung plausibel sind. Die SCHUFA überprüft, ob die zur Prüfung verwendeten Daten ggf. in Ihrem Datenbestand gespeichert sind und übermittelt sodann das Ergebnis der Überprüfung an payolution zurück. Ein weiterer Datenaustausch wie die Bekanntgabe von Bonitätsinformationen oder eine Übermittlung abweichender Bankverbindungsdaten sowie Speicherung Ihrer Daten im SCHUFA-Datenbestand finden im Rahmen der Kontonummernprüfung nicht statt. Es wird aus Nachweisgründen allein die Tatsache der Überprüfung der Bankverbindungsdaten bei der SCHUFA gespeichert.</p>
67
+ <p>payolution ist berechtigt, auch Daten zu etwaigem nicht-vertragsgemäßen Verhalten (z.B. unbestrittene offene Forderungen) zu speichern, zu verarbeiten, zu nutzen und an oben genannte Auskunfteien zu übermitteln.</p>
68
+ </li>
69
+ <li><p>Wir sind bereits nach den Bestimmungen des Bürgerlichen Gesetzbuches über Finanzierungshilfen zwischen Unternehmern und Verbrauchern, zu einer Prüfung Ihrer Kreditwürdigkeit gesetzlich verpflichtet.</p></li>
70
+ <li><p>Im Fall eines Kaufs auf Rechnung oder Ratenkauf oder einer Bezahlung mittels SEPA-Basis-Lastschrift werden der payolution GmbH Daten über die Aufnahme (zu Ihrer Person, Kaufpreis, Laufzeit des Teilzahlungsgeschäfts, Ratenbeginn) und vereinbarungsgemäße Abwicklung (z.B. vorzeitige Rückzahlung, Laufzeitverlängerung, erfolgte Rückzahlungen) dieses Teilzahlungsgeschäfts übermittelt. Nach Abtretung der Kaufpreisforderung wird die forderungsübernehmende Bank die genannten Datenübermittlungen vornehmen. Wir bzw. die Bank, der die Kaufpreisforderung abgetreten wird, werden payolution GmbH auch Daten aufgrund nichtvertragsgemäßer Abwicklung (z.B. Kündigung des Teilzahlungsgeschäfts, Zwangsvollstreckungs-maßnahmen) melden. Diese Meldungen dürfen nach den datenschutzrechtlichen Bestimmungen nur erfolgen, soweit dies zur Wahrung berechtigter Interessen von Vertragspartnern der payolution GmbH oder der Allgemeinheit erforderlich ist und dadurch Ihre schutzwürdigen Belange nicht beeinträchtigt werden. payolution GmbH speichert die Daten, um ihren Vertragspartnern, die gewerbsmäßig Teilzahlungs- und sonstige Kreditgeschäfte an Verbraucher geben, Informationen zur Beurteilung der Kreditwürdigkeit von Kunden geben zu können. An Unternehmen, die gewerbsmäßig Forderungen einziehen und payolution GmbH vertraglich angeschlossen sind, können zum Zwecke der Schuldnerermittlung Adressdaten übermittelt werden. payolution GmbH stellt die Daten ihren Vertragspartnern nur zur Verfügung, wenn diese ein berechtigtes Interesse an der Datenübermittlung glaubhaft darlegen. payolution GmbH übermittelt nur objektive Daten ohne Angabe der Bank; subjektive Werturteile sowie persönliche Einkommens- und Vermögensverhältnisse sind in Auskünften der payolution GmbH nicht enthalten.</p></li>
71
+ <li><p>Die im Bestellprozess durch Einwilligung erfolgte Zustimmung zur Datenweitergabe kann jederzeit, auch ohne Angabe von Gründen, uns gegenüber widerrufen können. Die oben genannten gesetzlichen Verpflichtungen zur Überprüfung Ihrer Kreditwürdigkeit bleiben von einem allfälligen Widerruf jedoch unberührt. Sie sind verpflichtet ausschließlich wahrheitsgetreue Angaben gegenüber uns zu machen.</p></li>
72
+ <li><p>Sollten Sie Auskunft über die Erhebung, Nutzung, Verarbeitung oder Übermittlung von Sie betreffenden personenbezogenen Daten erhalten wollen oder Auskünfte, Berichtigungen, Sperrungen oder Löschung dieser Daten wünschen, können Sie sich an den Sachbearbeiter für Datenschutz bei payolution wenden:</p></li>
73
+ </ol>
74
+
75
+ <footer>Sachbearbeiter für Datenschutz<br />
76
+ datenschutz@payolution.com<br />
77
+ payolution GmbH<br />
78
+ Am Euro Platz 2<br />
79
+ 1120 Wien<br />
80
+ DVR: 4008655
81
+ </footer>
82
+ ";
83
+
84
+ /**
85
+ * @var array
86
+ */
87
protected $_aBackendBlacklist = array(
88
Payone_Api_Enum_PayolutionType::PYS
89
);
90
+
91
+ protected function _construct()
92
{
93
parent::_construct();
94
$this->setTemplate('payone/core/payment/method/form/payolution.phtml');
95
}
96
97
+ /**
98
+ * @return array
99
+ */
100
+ public function payolutionTypeMapping()
101
+ {
102
+ return $payolutionPayment = array(
103
+ Payone_Core_Model_System_Config_PaymentMethodCode::PAYOLUTIONINVOICING => Payone_Api_Enum_PayolutionType::PYV,
104
+ Payone_Core_Model_System_Config_PaymentMethodCode::PAYOLUTIONINSTALLMENT => Payone_Api_Enum_PayolutionType::PYS,
105
+ Payone_Core_Model_System_Config_PaymentMethodCode::PAYOLUTIONDEBIT => Payone_Api_Enum_PayolutionType::PYD,
106
+ );
107
+ }
108
+
109
+ /**
110
+ * @return mixed
111
+ */
112
+ public function getPayolutionTypes()
113
+ {
114
+ return $this->getMethod()->getConfig()->getTypes();
115
+ }
116
+
117
+ /**
118
+ * @return mixed
119
+ */
120
public function getPayolutionType()
121
{
122
if($this->_sType === null) {
126
127
return $this->_sType;
128
}
129
+
130
+ /**
131
+ * @return array
132
+ */
133
public function getPayolutionTypesBackend()
134
{
135
$aTypes = $this->getPayolutionTypes();
136
+
137
$aTypesReturn = array();
138
foreach ($aTypes as $sType) {
139
+ if (array_search($sType, $this->_aBackendBlacklist) === false) {
140
$aTypesReturn[] = $sType;
141
}
142
}
143
144
return $aTypesReturn;
145
}
146
+
147
/**
148
* @return bool
149
*/
172
173
return false;
174
}
175
+
176
+ /**
177
+ * @return bool
178
+ */
179
+ public function isB2BMode()
180
{
181
+ if ((bool)$this->getMethod()->getConfig()->getB2bMode() === true) {
182
$sCompany = $this->getQuote()->getBillingAddress()->getCompany();
183
+ if ($sCompany) {
184
return true;
185
}
186
}
187
188
return false;
189
}
190
+
191
+ /**
192
+ * @return bool
193
+ */
194
+ public function showBirthdayFields()
195
{
196
+ if ($this->isB2BMode() === false) {
197
return true;
198
}
199
200
return false;
201
}
202
+
203
+ /**
204
+ * @return bool
205
+ */
206
+ public function showDebitFields()
207
{
208
if ($this->getPayolutionType() == Payone_Api_Enum_PayolutionType::PYD) {
209
return true;
211
212
return false;
213
}
214
+
215
+ /**
216
+ * @return bool|mixed|string
217
+ */
218
public function getPayolutionAcceptanceText()
219
{
220
$sCompany = $this->getMethod()->getConfig()->getCompanyName();
221
+ $sUrl = $this->_sAcceptanceBaseUrl . base64_encode($sCompany);
222
$sContent = file_get_contents($sUrl);
223
$sPage = false;
224
+ if (!empty($sContent) && stripos($sContent, 'payolution') !== false && stripos($sContent, '<header>') !== false) {
225
//Parse content from HTML-body-tag from the given page
226
$sRegex = "#<\s*?body\b[^>]*>(.*?)</body\b[^>]*>#s";
227
preg_match($sRegex, $sContent, $aMatches);
228
+ if (is_array($aMatches) && count($aMatches) > 1) {
229
$sPage = $aMatches[1];
230
//remove everything bevore the <header> tag ( a window.close link which wouldn't work in the given context )
231
$sPage = substr($sPage, stripos($sPage, '<header>'));
232
}
233
}
234
235
+ if (!$sPage) {
236
$sPage = $this->_getFallbackText($sCompany);
237
}
238
239
+ if ($this->_isUtf8EncodingNeeded($sPage)) {
240
$sPage = utf8_encode($sPage);
241
}
242
243
return $sPage;
244
}
245
+
246
/**
247
+ * @param $sCompany
248
+ * @return mixed
249
*/
250
+ protected function _getFallbackText($sCompany)
251
{
252
+ $sFallback = str_replace('**company**', $sCompany, $this->_sFallback);
253
+ return $sFallback;
254
}
255
+
256
+ /**
257
+ * @param $sString
258
+ * @return bool
259
+ */
260
+ protected function _isUtf8EncodingNeeded($sString)
261
+ {
262
+ if (preg_match('!!u', $sString)) {
263
+ // this is utf-8
264
+ return false;
265
+ } else {
266
+ // definitely not utf-8
267
+ return true;
268
+ }
269
+ }
270
+
271
+ /**
272
+ * @return string
273
+ */
274
public function getHandleInstallmentUrl()
275
{
276
+ // are we in a secure environment?
277
+ $isSecure = Mage::app()->getStore()->isCurrentlySecure();
278
+ return $this->getUrl('payone_core/checkout_onepage/handlePayolutionInstallment', array('_secure' => $isSecure));
279
}
280
+
281
+ /**
282
+ * @return array
283
+ */
284
+ protected function getSystemConfigMethodTypes()
285
+ {
286
+ return $this->getFactory()->getModelSystemConfigPayolutionType()->toSelectArray();
287
+ }
288
+ }
app/code/community/Payone/Core/Block/Payment/Method/Info/Payolution.php CHANGED
@@ -15,12 +15,15 @@
15
* @category Payone
16
* @package Payone_Core_Block
17
* @subpackage Payment
18
- * @copyright Copyright (c) 2015 <kontakt@fatchip.de> - www.fatchip.com
19
- * @author Robert M�ller <robert.mueller@fatchip.de>
20
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
- * @link http://www.fatchip.com
22
*/
23
24
class Payone_Core_Block_Payment_Method_Info_Payolution extends Payone_Core_Block_Payment_Method_Info_Abstract
25
{
26
15
* @category Payone
16
* @package Payone_Core_Block
17
* @subpackage Payment
18
+ * @copyright Copyright (c) 2015 <kontakt@fatchip.de> - www.fatchip.com, Copyright (c) 2017 <support@e3n.de> - www.e3n.de
19
+ * @author Robert M�ller <robert.mueller@fatchip.de>, Tim Rein <tim.rein@e3n.de>
20
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
+ * @link http://www.fatchip.com, http://www.e3n.de
22
*/
23
24
+ /**
25
+ * Class Payone_Core_Block_Payment_Method_Info_Payolution
26
+ */
27
class Payone_Core_Block_Payment_Method_Info_Payolution extends Payone_Core_Block_Payment_Method_Info_Abstract
28
{
29
app/code/community/Payone/Core/Block/Payment/Method/Info/PayolutionDebit.php ADDED
@@ -0,0 +1,34 @@
1
+ <?php
2
+ /**
3
+ *
4
+ * NOTICE OF LICENSE
5
+ *
6
+ * This source file is subject to the GNU General Public License (GPL 3)
7
+ * that is bundled with this package in the file LICENSE.txt
8
+ *
9
+ * DISCLAIMER
10
+ *
11
+ * Do not edit or add to this file if you wish to upgrade Payone_Core to newer
12
+ * versions in the future. If you wish to customize Payone_Core for your
13
+ * needs please refer to http://www.payone.de for more information.
14
+ *
15
+ * @category Payone
16
+ * @package Payone_Core_Block
17
+ * @subpackage Payment
18
+ * @copyright Copyright (c) 2015 <kontakt@fatchip.de> - www.fatchip.com, Copyright (c) 2017 <support@e3n.de> - www.e3n.de
19
+ * @author Robert M�ller <robert.mueller@fatchip.de>, Tim Rein <tim.rein@e3n.de>
20
+ * @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
+ * @link http://www.fatchip.com, http://www.e3n.de
22
+ */
23
+
24
+ /**
25
+ * Class Payone_Core_Block_Payment_Method_Info_PayolutionDebit
26
+ */
27
+ class Payone_Core_Block_Payment_Method_Info_PayolutionDebit extends Payone_Core_Block_Payment_Method_Info_Payolution
28
+ {
29
+
30
+ protected function _construct()
31
+ {
32
+ $this->setTemplate('payone/core/payment/method/info/payolutiondebit.phtml');
33
+ }
34
+ }
app/code/community/Payone/Core/Block/Payment/Method/Info/PayolutionInstallment.php ADDED
@@ -0,0 +1,34 @@
1
+ <?php
2
+ /**
3
+ *
4
+ * NOTICE OF LICENSE
5
+ *
6
+ * This source file is subject to the GNU General Public License (GPL 3)
7
+ * that is bundled with this package in the file LICENSE.txt
8
+ *
9
+ * DISCLAIMER
10
+ *
11
+ * Do not edit or add to this file if you wish to upgrade Payone_Core to newer
12
+ * versions in the future. If you wish to customize Payone_Core for your
13
+ * needs please refer to http://www.payone.de for more information.
14
+ *
15
+ * @category Payone
16
+ * @package Payone_Core_Block
17
+ * @subpackage Payment
18
+ * @copyright Copyright (c) 2017 <support@e3n.de> - www.e3n.de
19
+ * @author Tim Rein <tim.rein@e3n.de>
20
+ * @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
+ * @link http://www.e3n.de
22
+ */
23
+
24
+ /**
25
+ * Class Payone_Core_Block_Payment_Method_Info_PayolutionDebit
26
+ */
27
+ class Payone_Core_Block_Payment_Method_Info_PayolutionInstallment extends Payone_Core_Block_Payment_Method_Info_Payolution
28
+ {
29
+
30
+ protected function _construct()
31
+ {
32
+ $this->setTemplate('payone/core/payment/method/info/payolutioninstallment.phtml');
33
+ }
34
+ }
app/code/community/Payone/Core/Block/Payment/Method/Info/PayolutionInvoicing.php ADDED
@@ -0,0 +1,34 @@
1
+ <?php
2
+ /**
3
+ *
4
+ * NOTICE OF LICENSE
5
+ *
6
+ * This source file is subject to the GNU General Public License (GPL 3)
7
+ * that is bundled with this package in the file LICENSE.txt
8
+ *
9
+ * DISCLAIMER
10
+ *
11
+ * Do not edit or add to this file if you wish to upgrade Payone_Core to newer
12
+ * versions in the future. If you wish to customize Payone_Core for your
13
+ * needs please refer to http://www.payone.de for more information.
14
+ *
15
+ * @category Payone
16
+ * @package Payone_Core_Block
17
+ * @subpackage Payment
18
+ * @copyright Copyright (c) 2015 <kontakt@fatchip.de> - www.fatchip.com, Copyright (c) 2017 <support@e3n.de> - www.e3n.de
19
+ * @author Robert M�ller <robert.mueller@fatchip.de>, Tim Rein <tim.rein@e3n.de>
20
+ * @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
+ * @link http://www.fatchip.com, http://www.e3n.de
22
+ */
23
+
24
+ /**
25
+ * Class Payone_Core_Block_Payment_Method_Info_PayolutionInvoicing
26
+ */
27
+ class Payone_Core_Block_Payment_Method_Info_PayolutionInvoicing extends Payone_Core_Block_Payment_Method_Info_Payolution
28
+ {
29
+
30
+ protected function _construct()
31
+ {
32
+ $this->setTemplate('payone/core/payment/method/info/payolutioninvoicing.phtml');
33
+ }
34
+ }
app/code/community/Payone/Core/Model/Config/General/CcHostedTranslations.php CHANGED
@@ -16,7 +16,7 @@
16
* @package Payone_Core_Model
17
* @subpackage Config
18
* @copyright Copyright (c) 2016 <kontakt@fatchip.de> - www.fatchip.com
19
- * @author Robert M�ller <robert.mueller@fatchip.de>
20
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
* @link http://www.fatchip.com
22
*/
@@ -27,9 +27,20 @@ class Payone_Core_Model_Config_General_CcHostedTranslations extends Payone_Core_
27
protected $cc_translation_months = '';
28
protected $cc_translation_errors = '';
29
protected $cc_translation_placeholders = '';
30
-
31
protected function _formatTranslationArray($aTranslations, $sType = '')
32
{
33
$aReturn = array();
34
foreach ($aTranslations as $aTranslation) {
35
$sLanguage = array_shift($aTranslation['translation_language']);
16
* @package Payone_Core_Model
17
* @subpackage Config
18
* @copyright Copyright (c) 2016 <kontakt@fatchip.de> - www.fatchip.com
19
+ * @author Robert Müller <robert.mueller@fatchip.de>
20
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
* @link http://www.fatchip.com
22
*/
27
protected $cc_translation_months = '';
28
protected $cc_translation_errors = '';
29
protected $cc_translation_placeholders = '';
30
+
31
+ /**
32
+ * @param array $aTranslations
33
+ * @param string $sType
34
+ * @return array|string
35
+ */
36
protected function _formatTranslationArray($aTranslations, $sType = '')
37
{
38
+ // if no translations are present, unserialize('') will be called and thus $aTranslations will be false...
39
+ if ($aTranslations === false) {
40
+ // ...however, the default value is an empty array
41
+ $aTranslations = array();
42
+ }
43
+
44
$aReturn = array();
45
foreach ($aTranslations as $aTranslation) {
46
$sLanguage = array_shift($aTranslation['translation_language']);
app/code/community/Payone/Core/Model/Config/General/StatusMapping.php CHANGED
@@ -68,10 +68,27 @@ class Payone_Core_Model_Config_General_StatusMapping extends Payone_Core_Model_C
68
* @var null
69
*/
70
protected $wallet = null;
71
-
72
protected $ratepay = null;
73
- protected $payolution = null;
74
75
public function init(array $data)
76
{
77
foreach ($data as $key => $value) {
@@ -283,15 +300,6 @@ class Payone_Core_Model_Config_General_StatusMapping extends Payone_Core_Model_C
283
$this->ratepay = $ratepay;
284
}
285
286
- public function setPayolution($payolution)
287
- {
288
- if (is_string($payolution)) {
289
- $payolution = $this->initValue($payolution);
290
- }
291
-
292
- $this->payolution = $payolution;
293
- }
294
-
295
/**
296
* @return null
297
*/
@@ -304,10 +312,53 @@ class Payone_Core_Model_Config_General_StatusMapping extends Payone_Core_Model_C
304
{
305
return $this->ratepay;
306
}
307
-
308
- public function getPayolution()
309
{
310
- return $this->payolution;
311
}
312
313
/**
68
* @var null
69
*/
70
protected $wallet = null;
71
+ /**
72
+ * @var null
73
+ */
74
protected $ratepay = null;
75
76
+ /**
77
+ * @var null
78
+ */
79
+ protected $payolution_invoicing = null;
80
+ /**
81
+ * @var null
82
+ */
83
+ protected $payolution_installment = null;
84
+ /**
85
+ * @var null
86
+ */
87
+ protected $payolution_debit = null;
88
+
89
+ /**
90
+ * @param array $data
91
+ */
92
public function init(array $data)
93
{
94
foreach ($data as $key => $value) {
300
$this->ratepay = $ratepay;
301
}
302
303
/**
304
* @return null
305
*/
312
{
313
return $this->ratepay;
314
}
315
+
316
+ /**
317
+ * @return null
318
+ */
319
+ public function getPayolutionInvoicing()
320
+ {
321
+ return $this->payolution_invoicing;
322
+ }
323
+
324
+ /**
325
+ * @return null
326
+ */
327
+ public function getPayolutionInstallment()
328
+ {
329
+ return $this->payolution_installment;
330
+ }
331
+
332
+ /**
333
+ * @return null
334
+ */
335
+ public function getPayolutionDebit()
336
+ {
337
+ return $this->payolution_debit;
338
+ }
339
+
340
+ /**
341
+ * @param $payolutionInvoicing
342
+ */
343
+ public function setPayolutionInvoicing($payolutionInvoicing)
344
+ {
345
+ $this->payolution_invoicing = $payolutionInvoicing;
346
+ }
347
+
348
+ /**
349
+ * @param $payolutionInstallment
350
+ */
351
+ public function setPayolutionInstallment($payolutionInstallment)
352
+ {
353
+ $this->payolution_installment = $payolutionInstallment;
354
+ }
355
+
356
+ /**
357
+ * @param $payolutionDebit
358
+ */
359
+ public function setPayolutionDebit($payolutionDebit)
360
{
361
+ $this->payolution_debit = $payolutionDebit;
362
}
363
364
/**
app/code/community/Payone/Core/Model/Config/Payment/Method/Interface.php CHANGED
@@ -538,5 +538,16 @@ interface Payone_Core_Model_Config_Payment_Method_Interface
538
* @return bool
539
*/
540
public function getSepaRequestBic();
541
542
}
538
* @return bool
539
*/
540
public function getSepaRequestBic();
541
+
542
+ /**
543
+ * @param bool $currency_convert
544
+ */
545
+ public function setCurrencyConvert($currency_convert);
546
+
547
+
548
+ /**
549
+ * @return bool
550
+ */
551
+ public function getCurrencyConvert();
552
553
}
app/code/community/Payone/Core/Model/Domain/Protocol/Api.php CHANGED
@@ -123,7 +123,7 @@ class Payone_Core_Model_Domain_Protocol_Api extends Mage_Core_Model_Abstract
123
124
$preparedData = array();
125
foreach ($data as $key => $value) {
126
- $valuearr = explode('=', $value);
127
if (isset($valuearr[1]) && $valuearr[1] !=='') {
128
$preparedData[$valuearr[0]] = $valuearr[1];
129
}
@@ -131,4 +131,4 @@ class Payone_Core_Model_Domain_Protocol_Api extends Mage_Core_Model_Abstract
131
132
return $preparedData;
133
}
134
- }
123
124
$preparedData = array();
125
foreach ($data as $key => $value) {
126
+ $valuearr = explode('=', $value, 2);
127
if (isset($valuearr[1]) && $valuearr[1] !=='') {
128
$preparedData[$valuearr[0]] = $valuearr[1];
129
}
131
132
return $preparedData;
133
}
134
+ }
app/code/community/Payone/Core/Model/Handler/Payment/Abstract.php CHANGED
@@ -26,9 +26,10 @@
26
* @category Payone
27
* @package Payone_Core_Model
28
* @subpackage Handler
29
- * @copyright Copyright (c) 2012 <info@noovias.com> - www.noovias.com
30
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
31
- * @link http://www.noovias.com
32
*/
33
abstract class Payone_Core_Model_Handler_Payment_Abstract
34
extends Payone_Core_Model_Handler_Abstract
@@ -191,8 +192,15 @@ abstract class Payone_Core_Model_Handler_Payment_Abstract
191
$order->setData('payone_payment_method_type', $this->getPayment()->getData('payone_onlinebanktransfer_type'));
192
} elseif ($this->getPaymentMethod() instanceof Payone_Core_Model_Payment_Method_SafeInvoice) {
193
$order->setData('payone_payment_method_type', $this->getPayment()->getData('payone_safe_invoice_type'));
194
- } elseif ($this->getPaymentMethod() instanceof Payone_Core_Model_Payment_Method_Payolution) {
195
$order->setData('payone_payment_method_type', $this->getPayment()->getData('payone_payolution_type'));
196
}
197
198
$oQuote = Mage::getSingleton('checkout/session')->getQuote();
26
* @category Payone
27
* @package Payone_Core_Model
28
* @subpackage Handler
29
+ * @copyright Copyright (c) 2012 <info@noovias.com> - www.noovias.com, Copyright (c) 2017 <support@e3n.de> - www.e3n.de
30
+ * @author Tim Rein <tim.rein@e3n.de>
31
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
32
+ * @link http://www.noovias.com, http://www.e3n.de
33
*/
34
abstract class Payone_Core_Model_Handler_Payment_Abstract
35
extends Payone_Core_Model_Handler_Abstract
192
$order->setData('payone_payment_method_type', $this->getPayment()->getData('payone_onlinebanktransfer_type'));
193
} elseif ($this->getPaymentMethod() instanceof Payone_Core_Model_Payment_Method_SafeInvoice) {
194
$order->setData('payone_payment_method_type', $this->getPayment()->getData('payone_safe_invoice_type'));
195
+ } elseif ($this->getPaymentMethod() instanceof Payone_Core_Model_Payment_Method_PayolutionInvoicing ||
196
+ $this->getPaymentMethod() instanceof Payone_Core_Model_Payment_Method_PayolutionDebit ||
197
+ $this->getPaymentMethod() instanceof Payone_Core_Model_Payment_Method_PayolutionInstallment)
198
+ {
199
$order->setData('payone_payment_method_type', $this->getPayment()->getData('payone_payolution_type'));
200
+ } elseif ($this->getPaymentMethod() instanceof Payone_Core_Model_Payment_Method_Wallet) {
201
+ $order->setData('payone_payment_method_type', $this->getPayment()->getData('payone_wallet_type'));
202
+ } elseif ($this->getPaymentMethod() instanceof Payone_Core_Model_Payment_Method_Ratepay) {
203
+ $order->setData('payone_payment_method_type', $this->getPayment()->getData('payone_ratepay_type'));
204
}
205
206
$oQuote = Mage::getSingleton('checkout/session')->getQuote();
app/code/community/Payone/Core/Model/Mapper/ApiRequest/Payment/Authorize/Abstract.php CHANGED
@@ -15,10 +15,10 @@
15
* @category Payone
16
* @package Payone_Core_Model
17
* @subpackage Mapper
18
- * @copyright Copyright (c) 2012 <info@noovias.com> - www.noovias.com
19
- * @author Matthias Walter <info@noovias.com>
20
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
- * @link http://www.noovias.com
22
*/
23
24
/**
@@ -141,11 +141,19 @@ abstract class Payone_Core_Model_Mapper_ApiRequest_Payment_Authorize_Abstract
141
$requestType = Payone_Api_Enum_RequestType::PREAUTHORIZATION;
142
}
143
144
- // Always use PREAUTHORIZATION for Payolution
145
- if ($paymentMethod instanceof Payone_Core_Model_Payment_Method_Payolution) {
146
$requestType = Payone_Api_Enum_RequestType::PREAUTHORIZATION;
147
}
148
149
$request->setRequest($requestType);
150
$request->setAid($this->configPayment->getAid());
151
$request->setClearingtype($this->mapClearingType($paymentMethod));
@@ -460,8 +468,7 @@ abstract class Payone_Core_Model_Mapper_ApiRequest_Payment_Authorize_Abstract
460
if ($paymentMethod instanceof Payone_Core_Model_Payment_Method_CashOnDelivery) {
461
$payment = new Payone_Api_Request_Parameter_Authorization_PaymentMethod_CashOnDelivery();
462
$payment->setShippingprovider(Payone_Api_Enum_Shippingprovider::DHL);
463
- }
464
- elseif ($paymentMethod instanceof Payone_Core_Model_Payment_Method_Creditcard) {
465
$payment = new Payone_Api_Request_Parameter_Authorization_PaymentMethod_CreditCard();
466
467
// check if it is an adminorder and set ecommercemode to moto
@@ -471,8 +478,7 @@ abstract class Payone_Core_Model_Mapper_ApiRequest_Payment_Authorize_Abstract
471
472
$payment->setPseudocardpan($info->getPayonePseudocardpan());
473
$isRedirect = true;
474
- }
475
- elseif ($paymentMethod instanceof Payone_Core_Model_Payment_Method_OnlineBankTransfer) {
476
$country = $this->getOrder()->getBillingAddress()->getCountry();
477
$payoneOnlinebanktransferType = $info->getPayoneOnlinebanktransferType();
478
$iban = $info->getPayoneSepaIban();
@@ -506,8 +512,7 @@ abstract class Payone_Core_Model_Mapper_ApiRequest_Payment_Authorize_Abstract
506
}
507
508
$isRedirect = true;
509
- }
510
- elseif ($paymentMethod instanceof Payone_Core_Model_Payment_Method_SafeInvoice) {
511
$payment = new Payone_Api_Request_Parameter_Authorization_PaymentMethod_Financing();
512
$payment->setFinancingtype($info->getPayoneSafeInvoiceType());
513
@@ -515,13 +520,21 @@ abstract class Payone_Core_Model_Mapper_ApiRequest_Payment_Authorize_Abstract
515
// BillSAFE is a redirect payment method, Klarna not
516
$isRedirect = true;
517
}
518
- }
519
- elseif ($paymentMethod instanceof Payone_Core_Model_Payment_Method_Wallet) {
520
$payment = new Payone_Api_Request_Parameter_Authorization_PaymentMethod_Wallet();
521
$payment->setWallettype($this->_getWalletType());
522
$isRedirect = true;
523
- }
524
- elseif ($paymentMethod instanceof Payone_Core_Model_Payment_Method_DebitPayment) {
525
$payment = new Payone_Api_Request_Parameter_Authorization_PaymentMethod_DebitPayment();
526
$payment->setBankcountry($info->getPayoneBankCountry());
527
$iban = $info->getPayoneSepaIban();
@@ -607,10 +620,14 @@ abstract class Payone_Core_Model_Mapper_ApiRequest_Payment_Authorize_Abstract
607
}
608
609
$payment->setTelephonenumber($telephone);
610
- } elseif($paymentMethod instanceof Payone_Core_Model_Payment_Method_Payolution) {
611
$payment = new Payone_Api_Request_Parameter_Authorization_PaymentMethod_Payolution();
612
$payment->setApiVersion();
613
$payment->setFinancingtype($info->getPayonePayolutionType());
614
$payment->setWorkorderid($info->getPayoneWorkorderid());
615
$payment->setIban(strtoupper($info->getPayonePayolutionIban()));
616
$payment->setBic(strtoupper($info->getPayonePayolutionBic()));
@@ -741,8 +758,14 @@ abstract class Payone_Core_Model_Mapper_ApiRequest_Payment_Authorize_Abstract
741
elseif ($paymentMethod instanceof Payone_Core_Model_Payment_Method_Ratepay) {
742
$clearingType = Payone_Enum_ClearingType::RATEPAY;
743
}
744
- elseif ($paymentMethod instanceof Payone_Core_Model_Payment_Method_Payolution) {
745
- $clearingType = Payone_Enum_ClearingType::PAYOLUTION;
746
}
747
748
return $clearingType;
@@ -763,12 +786,10 @@ abstract class Payone_Core_Model_Mapper_ApiRequest_Payment_Authorize_Abstract
763
764
/**
765
* Returns the narrative text and substitutes the placeholder if neccessary
766
- * @param $type
767
* @return string
768
*/
769
- protected function getNarrativeText($type)
770
{
771
- ///@todo Paydirekt testen - NUR increment id erlaubt???
772
$narrativeText = $this->configPayment->getNarrativeText();
773
774
$substitutionArray = array(
15
* @category Payone
16
* @package Payone_Core_Model
17
* @subpackage Mapper
18
+ * @copyright Copyright (c) 2012 <info@noovias.com> - www.noovias.com, Copyright (c) 2017 <support@e3n.de> - www.e3n.de
19
+ * @author Matthias Walter <info@noovias.com>, Tim Rein <tim.rein@e3n.de>
20
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
+ * @link http://www.noovias.com, http://www.e3n.de
22
*/
23
24
/**
141
$requestType = Payone_Api_Enum_RequestType::PREAUTHORIZATION;
142
}
143
144
+ // Always use PREAUTHORIZATION for Payolution Debit and Invoicing
145
+ if ($paymentMethod instanceof Payone_Core_Model_Payment_Method_PayolutionDebit ||
146
+ $paymentMethod instanceof Payone_Core_Model_Payment_Method_PayolutionInvoicing)
147
+ {
148
$requestType = Payone_Api_Enum_RequestType::PREAUTHORIZATION;
149
}
150
151
+ // Always use AUTHORIZATION for Payolution Installment
152
+ if ($paymentMethod instanceof Payone_Core_Model_Payment_Method_PayolutionInstallment)
153
+ {
154
+ $requestType = Payone_Api_Enum_RequestType::AUTHORIZATION;
155
+ }
156
+
157
$request->setRequest($requestType);
158
$request->setAid($this->configPayment->getAid());
159
$request->setClearingtype($this->mapClearingType($paymentMethod));
468
if ($paymentMethod instanceof Payone_Core_Model_Payment_Method_CashOnDelivery) {
469
$payment = new Payone_Api_Request_Parameter_Authorization_PaymentMethod_CashOnDelivery();
470
$payment->setShippingprovider(Payone_Api_Enum_Shippingprovider::DHL);
471
+ } elseif ($paymentMethod instanceof Payone_Core_Model_Payment_Method_Creditcard) {
472
$payment = new Payone_Api_Request_Parameter_Authorization_PaymentMethod_CreditCard();
473
474
// check if it is an adminorder and set ecommercemode to moto
478
479
$payment->setPseudocardpan($info->getPayonePseudocardpan());
480
$isRedirect = true;
481
+ } elseif ($paymentMethod instanceof Payone_Core_Model_Payment_Method_OnlineBankTransfer) {
482
$country = $this->getOrder()->getBillingAddress()->getCountry();
483
$payoneOnlinebanktransferType = $info->getPayoneOnlinebanktransferType();
484
$iban = $info->getPayoneSepaIban();
512
}
513
514
$isRedirect = true;
515
+ } elseif ($paymentMethod instanceof Payone_Core_Model_Payment_Method_SafeInvoice) {
516
$payment = new Payone_Api_Request_Parameter_Authorization_PaymentMethod_Financing();
517
$payment->setFinancingtype($info->getPayoneSafeInvoiceType());
518
520
// BillSAFE is a redirect payment method, Klarna not
521
$isRedirect = true;
522
}
523
+ } elseif ($paymentMethod instanceof Payone_Core_Model_Payment_Method_Wallet) {
524
$payment = new Payone_Api_Request_Parameter_Authorization_PaymentMethod_Wallet();
525
$payment->setWallettype($this->_getWalletType());
526
$isRedirect = true;
527
+
528
+ if ($this->_getWalletType() == 'PDT' && $this->getOrder()->getIsVirtual()) {// is Paydirekt and virtual/download?
529
+ $payData = new Payone_Api_Request_Parameter_Paydata_Paydata();
530
+ $payData->addItem(
531
+ new Payone_Api_Request_Parameter_Paydata_DataItem(
532
+ array('key' => 'shopping_cart_type', 'data' => 'DIGITAL')
533
+ )
534
+ );
535
+ $payment->setPaydata($payData);
536
+ }
537
+ } elseif ($paymentMethod instanceof Payone_Core_Model_Payment_Method_DebitPayment) {
538
$payment = new Payone_Api_Request_Parameter_Authorization_PaymentMethod_DebitPayment();
539
$payment->setBankcountry($info->getPayoneBankCountry());
540
$iban = $info->getPayoneSepaIban();
620
}
621
622
$payment->setTelephonenumber($telephone);
623
+ } elseif($paymentMethod instanceof Payone_Core_Model_Payment_Method_PayolutionDebit ||
624
+ $paymentMethod instanceof Payone_Core_Model_Payment_Method_PayolutionInvoicing ||
625
+ $paymentMethod instanceof Payone_Core_Model_Payment_Method_PayolutionInstallment)
626
+ {
627
$payment = new Payone_Api_Request_Parameter_Authorization_PaymentMethod_Payolution();
628
$payment->setApiVersion();
629
$payment->setFinancingtype($info->getPayonePayolutionType());
630
+
631
$payment->setWorkorderid($info->getPayoneWorkorderid());
632
$payment->setIban(strtoupper($info->getPayonePayolutionIban()));
633
$payment->setBic(strtoupper($info->getPayonePayolutionBic()));
758
elseif ($paymentMethod instanceof Payone_Core_Model_Payment_Method_Ratepay) {
759
$clearingType = Payone_Enum_ClearingType::RATEPAY;
760
}
761
+ elseif ($paymentMethod instanceof Payone_Core_Model_Payment_Method_PayolutionInvoicing) {
762
+ $clearingType = Payone_Enum_ClearingType::PAYOLUTIONINVOICING;
763
+ }
764
+ elseif ($paymentMethod instanceof Payone_Core_Model_Payment_Method_PayolutionDebit) {
765
+ $clearingType = Payone_Enum_ClearingType::PAYOLUTIONDEBIT;
766
+ }
767
+ elseif ($paymentMethod instanceof Payone_Core_Model_Payment_Method_PayolutionInstallment) {
768
+ $clearingType = Payone_Enum_ClearingType::PAYOLUTIONINSTALLMENT;
769
}
770
771
return $clearingType;
786
787
/**
788
* Returns the narrative text and substitutes the placeholder if neccessary
789
* @return string
790
*/
791
+ protected function getNarrativeText()
792
{
793
$narrativeText = $this->configPayment->getNarrativeText();
794
795
$substitutionArray = array(
app/code/community/Payone/Core/Model/Mapper/ApiRequest/Payment/Capture.php CHANGED
@@ -64,7 +64,7 @@ class Payone_Core_Model_Mapper_ApiRequest_Payment_Capture
64
$business = $this->mapBusinessParameters();
65
$request->setBusiness($business);
66
67
- /** Set Invoiceing-Parameter only if enabled in Config */
68
if ($this->mustTransmitInvoiceData()) {
69
$invoicing = $this->mapInvoicingParameters();
70
if (!empty($invoicing)) {
@@ -84,7 +84,10 @@ class Payone_Core_Model_Mapper_ApiRequest_Payment_Capture
84
);
85
$request->setPaydata($payData);
86
$request->setApiVersion('3.10');
87
- } elseif($paymentMethod instanceof Payone_Core_Model_Payment_Method_Payolution) {
88
$info = $paymentMethod->getInfoInstance();
89
if($info->getPayoneIsb2b() == '1') {
90
$payData = new Payone_Api_Request_Parameter_Paydata_Paydata();
@@ -108,6 +111,8 @@ class Payone_Core_Model_Mapper_ApiRequest_Payment_Capture
108
*/
109
protected function mapDefaultCaptureParameters(Payone_Api_Request_Capture $request)
110
{
111
$order = $this->getOrder();
112
$invoice = $this->getInvoice();
113
@@ -117,8 +122,14 @@ class Payone_Core_Model_Mapper_ApiRequest_Payment_Capture
117
$request->setTxid($order->getPayment()->getLastTransId());
118
$request->setSequencenumber($transaction->getNextSequenceNumber());
119
$request->setCurrency($order->getOrderCurrencyCode());
120
if(!empty($invoice) && $invoice->hasData()) {
121
$request->setAmount($invoice->getGrandTotal());
122
} else {
123
$request->setAmount($this->getAmount());
124
}
64
$business = $this->mapBusinessParameters();
65
$request->setBusiness($business);
66
67
+ /** Set Invoicing-Parameter only if enabled in Config */
68
if ($this->mustTransmitInvoiceData()) {
69
$invoicing = $this->mapInvoicingParameters();
70
if (!empty($invoicing)) {
84
);
85
$request->setPaydata($payData);
86
$request->setApiVersion('3.10');
87
+ } elseif($paymentMethod instanceof Payone_Core_Model_Payment_Method_PayolutionDebit ||
88
+ $paymentMethod instanceof Payone_Core_Model_Payment_Method_PayolutionInvoicing ||
89
+ $paymentMethod instanceof Payone_Core_Model_Payment_Method_PayolutionInstallment)
90
+ {
91
$info = $paymentMethod->getInfoInstance();
92
if($info->getPayoneIsb2b() == '1') {
93
$payData = new Payone_Api_Request_Parameter_Paydata_Paydata();
111
*/
112
protected function mapDefaultCaptureParameters(Payone_Api_Request_Capture $request)
113
{
114
+ $blCurrencyConvert = (bool)$this->getConfigPayment()->getCurrencyConvert();
115
+
116
$order = $this->getOrder();
117
$invoice = $this->getInvoice();
118
122
$request->setTxid($order->getPayment()->getLastTransId());
123
$request->setSequencenumber($transaction->getNextSequenceNumber());
124
$request->setCurrency($order->getOrderCurrencyCode());
125
+ if($blCurrencyConvert) {
126
+ $request->setCurrency($order->getBaseCurrencyCode());
127
+ }
128
if(!empty($invoice) && $invoice->hasData()) {
129
$request->setAmount($invoice->getGrandTotal());
130
+ if($blCurrencyConvert) {
131
+ $request->setAmount($order->getBaseGrandTotal());
132
+ }
133
} else {
134
$request->setAmount($this->getAmount());
135
}
app/code/community/Payone/Core/Model/Mapper/ApiRequest/Payment/Debit.php CHANGED
@@ -15,10 +15,10 @@
15
* @category Payone
16
* @package Payone_Core_Model
17
* @subpackage Mapper
18
- * @copyright Copyright (c) 2012 <info@noovias.com> - www.noovias.com
19
- * @author Matthias Walter <info@noovias.com>
20
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
- * @link http://www.noovias.com
22
*/
23
24
/**
@@ -79,7 +79,10 @@ class Payone_Core_Model_Mapper_ApiRequest_Payment_Debit
79
);
80
$request->setPaydata($payData);
81
$request->setApiVersion('3.10');
82
- } elseif($paymentMethod instanceof Payone_Core_Model_Payment_Method_Payolution) {
83
$info = $paymentMethod->getInfoInstance();
84
if($info->getPayoneIsb2b() == '1') {
85
$payData = new Payone_Api_Request_Parameter_Paydata_Paydata();
15
* @category Payone
16
* @package Payone_Core_Model
17
* @subpackage Mapper
18
+ * @copyright Copyright (c) 2012 <info@noovias.com> - www.noovias.com, Copyright (c) 2017 <support@e3n.de> - www.e3n.de
19
+ * @author Matthias Walter <info@noovias.com>, Tim Rein <tim.rein@e3n.de>
20
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
+ * @link http://www.noovias.com, http://www.e3n.de
22
*/
23
24
/**
79
);
80
$request->setPaydata($payData);
81
$request->setApiVersion('3.10');
82
+ } elseif($paymentMethod instanceof Payone_Core_Model_Payment_Method_PayolutionDebit ||
83
+ $paymentMethod instanceof Payone_Core_Model_Payment_Method_PayolutionInvoicing ||
84
+ $paymentMethod instanceof Payone_Core_Model_Payment_Method_PayolutionInstallment)
85
+ {
86
$info = $paymentMethod->getInfoInstance();
87
if($info->getPayoneIsb2b() == '1') {
88
$payData = new Payone_Api_Request_Parameter_Paydata_Paydata();
app/code/community/Payone/Core/Model/Mapper/ApiRequest/Payment/Genericpayment.php CHANGED
@@ -296,7 +296,7 @@ class Payone_Core_Model_Mapper_ApiRequest_Payment_Genericpayment
296
$request->setEmail($oQuote->getCustomerEmail());
297
$request->setIp(Mage::helper('core/http')->getRemoteAddr());
298
$request->setLanguage($this->helper()->getDefaultLanguage());
299
-
300
$paydata = new Payone_Api_Request_Parameter_Paydata_Paydata();
301
$paydata->addItem(
302
new Payone_Api_Request_Parameter_Paydata_DataItem(
296
$request->setEmail($oQuote->getCustomerEmail());
297
$request->setIp(Mage::helper('core/http')->getRemoteAddr());
298
$request->setLanguage($this->helper()->getDefaultLanguage());
299
+
300
$paydata = new Payone_Api_Request_Parameter_Paydata_Paydata();
301
$paydata->addItem(
302
new Payone_Api_Request_Parameter_Paydata_DataItem(
app/code/community/Payone/Core/Model/Observer/Checkout/Onepage/{DebitPayment.php → MultiplePaymentCheck.php} RENAMED
@@ -26,11 +26,11 @@
26
* @category Payone
27
* @package Payone_Core_Model
28
* @subpackage Observer
29
- * @copyright Copyright (c) 2012 <info@noovias.com> - www.noovias.com
30
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
31
- * @link http://www.noovias.com
32
*/
33
- class Payone_Core_Model_Observer_Checkout_Onepage_DebitPayment extends Payone_Core_Model_Observer_Abstract
34
{
35
/** @var array */
36
protected $paymentData = array();
@@ -53,7 +53,8 @@ class Payone_Core_Model_Observer_Checkout_Onepage_DebitPayment extends Payone_Co
53
$selectedMethod = $paymentData['method'];
54
55
if ($selectedMethod != Payone_Core_Model_System_Config_PaymentMethodCode::DEBITPAYMENT &&
56
- $selectedMethod != Payone_Core_Model_System_Config_PaymentMethodCode::PAYOLUTION &&
57
$selectedMethod != Payone_Core_Model_System_Config_PaymentMethodCode::CREDITCARD
58
) {
59
return;
@@ -75,9 +76,13 @@ class Payone_Core_Model_Observer_Checkout_Onepage_DebitPayment extends Payone_Co
75
76
if ($selectedMethod == Payone_Core_Model_System_Config_PaymentMethodCode::DEBITPAYMENT) {
77
$controllerAction = $this->_performDebitChecks($controllerAction);
78
- } elseif($selectedMethod == Payone_Core_Model_System_Config_PaymentMethodCode::PAYOLUTION) {
79
$controllerAction = $this->_performPayolutionChecks($controllerAction);
80
- } elseif($selectedMethod == Payone_Core_Model_System_Config_PaymentMethodCode::CREDITCARD) {
81
$controllerAction = $this->_performHostedCreditcardChecks($controllerAction);
82
}
83
26
* @category Payone
27
* @package Payone_Core_Model
28
* @subpackage Observer
29
+ * @copyright Copyright (c) 2012 <info@noovias.com> - www.noovias.com, Copyright (c) 2017 <support@e3n.de> - www.e3n.de
30
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
31
+ * @link http://www.noovias.com, http://www.e3n.de
32
*/
33
+ class Payone_Core_Model_Observer_Checkout_Onepage_MultiplePaymentCheck extends Payone_Core_Model_Observer_Abstract
34
{
35
/** @var array */
36
protected $paymentData = array();
53
$selectedMethod = $paymentData['method'];
54
55
if ($selectedMethod != Payone_Core_Model_System_Config_PaymentMethodCode::DEBITPAYMENT &&
56
+ $selectedMethod != Payone_Core_Model_System_Config_PaymentMethodCode::PAYOLUTIONINVOICING &&
57
+ $selectedMethod != Payone_Core_Model_System_Config_PaymentMethodCode::PAYOLUTIONDEBIT &&
58
$selectedMethod != Payone_Core_Model_System_Config_PaymentMethodCode::CREDITCARD
59
) {
60
return;
76
77
if ($selectedMethod == Payone_Core_Model_System_Config_PaymentMethodCode::DEBITPAYMENT) {
78
$controllerAction = $this->_performDebitChecks($controllerAction);
79
+ } elseif($selectedMethod == Payone_Core_Model_System_Config_PaymentMethodCode::PAYOLUTIONINVOICING ||
80
+ $selectedMethod == Payone_Core_Model_System_Config_PaymentMethodCode::PAYOLUTIONDEBIT ||
81
+ $selectedMethod == Payone_Core_Model_System_Config_PaymentMethodCode::PAYOLUTIONINSTALLMENT)
82
+ {
83
$controllerAction = $this->_performPayolutionChecks($controllerAction);
84
+ }
85
+ elseif($selectedMethod == Payone_Core_Model_System_Config_PaymentMethodCode::CREDITCARD) {
86
$controllerAction = $this->_performHostedCreditcardChecks($controllerAction);
87
}
88
app/code/community/Payone/Core/Model/Observer/TransactionStatus/InvoiceCreate.php CHANGED
@@ -75,7 +75,9 @@ class Payone_Core_Model_Observer_TransactionStatus_InvoiceCreate
75
}
76
77
/**
78
- * @param Varien_Event_Observer $observer
79
*/
80
public function onPaid(Varien_Event_Observer $observer)
81
{
@@ -95,7 +97,9 @@ class Payone_Core_Model_Observer_TransactionStatus_InvoiceCreate
95
}
96
97
if ($invoice) {
98
- $invoice->pay();
99
100
if ($isAdvancePayment) {
101
$this->sendInvoiceEmail($invoice);
75
}
76
77
/**
78
+ * @param Varien_Event_Observer $observer
79
+ * @return void
80
+ * @throws Payone_Core_Exception_InvoiceSave
81
*/
82
public function onPaid(Varien_Event_Observer $observer)
83
{
97
}
98
99
if ($invoice) {
100
+ if ($invoice->getState() != Mage_Sales_Model_Order_Invoice::STATE_PAID) {
101
+ $invoice->pay();
102
+ }
103
104
if ($isAdvancePayment) {
105
$this->sendInvoiceEmail($invoice);
app/code/community/Payone/Core/Model/Payment/Method/{Payolution.php → PayolutionDebit.php} RENAMED
@@ -15,25 +15,46 @@
15
* @category Payone
16
* @package Payone_Core_Model
17
* @subpackage Payment
18
- * @copyright Copyright (c) 2015 <kontakt@fatchip.de> - www.fatchip.com
19
- * @author Robert M�ller <robert.mueller@fatchip.de>
20
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
- * @link http://www.fatchip.com
22
*/
23
24
- class Payone_Core_Model_Payment_Method_Payolution extends Payone_Core_Model_Payment_Method_Abstract
25
{
26
protected $_canUseForMultishipping = true;
27
-
28
- protected $methodType = Payone_Core_Model_System_Config_PaymentMethodType::PAYOLUTION;
29
-
30
- protected $_code = Payone_Core_Model_System_Config_PaymentMethodCode::PAYOLUTION;
31
-
32
protected $_formBlockType = 'payone_core/payment_method_form_payolution';
33
protected $_infoBlockType = 'payone_core/payment_method_info_payolution';
34
-
35
protected $_blIpMandatory = true;
36
-
37
public function getApiResponseErrorMessage($response)
38
{
39
return $this->helper()->__('PAYONE_PAYOLUTION_API_ERRORMESSAGE');
15
* @category Payone
16
* @package Payone_Core_Model
17
* @subpackage Payment
18
+ * @copyright Copyright (c) 2017 <support@e3n.de> - www.e3n.de
19
+ * @author Tim Rein <tim.rein@e3n.de>
20
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
+ * @link http://www.e3n.de
22
*/
23
24
+ /**
25
+ * Class Payone_Core_Model_Payment_Method_PayolutionDebit
26
+ */
27
+ class Payone_Core_Model_Payment_Method_PayolutionDebit extends Payone_Core_Model_Payment_Method_Abstract
28
{
29
+ /**
30
+ * @var bool
31
+ */
32
protected $_canUseForMultishipping = true;
33
+ /**
34
+ * @var string
35
+ */
36
+ protected $methodType = Payone_Core_Model_System_Config_PaymentMethodType::PAYOLUTIONDEBIT;
37
+ /**
38
+ * @var string
39
+ */
40
+ protected $_code = Payone_Core_Model_System_Config_PaymentMethodCode::PAYOLUTIONDEBIT;
41
+ /**
42
+ * @var string
43
+ */
44
protected $_formBlockType = 'payone_core/payment_method_form_payolution';
45
+ /**
46
+ * @var string
47
+ */
48
protected $_infoBlockType = 'payone_core/payment_method_info_payolution';
49
+ /**
50
+ * @var bool
51
+ */
52
protected $_blIpMandatory = true;
53
+
54
+ /**
55
+ * @param $response
56
+ * @return string
57
+ */
58
public function getApiResponseErrorMessage($response)
59
{
60
return $this->helper()->__('PAYONE_PAYOLUTION_API_ERRORMESSAGE');
app/code/community/Payone/Core/Model/Payment/Method/PayolutionInstallment.php ADDED
@@ -0,0 +1,63 @@
1
+ <?php
2
+ /**
3
+ *
4
+ * NOTICE OF LICENSE
5
+ *
6
+ * This source file is subject to the GNU General Public License (GPL 3)
7
+ * that is bundled with this package in the file LICENSE.txt
8
+ *
9
+ * DISCLAIMER
10
+ *
11
+ * Do not edit or add to this file if you wish to upgrade Payone_Core to newer
12
+ * versions in the future. If you wish to customize Payone_Core for your
13
+ * needs please refer to http://www.payone.de for more information.
14
+ *
15
+ * @category Payone
16
+ * @package Payone_Core_Model
17
+ * @subpackage Payment
18
+ * @copyright Copyright (c) 2017 <support@e3n.de> - www.e3n.de
19
+ * @author Tim Rein <tim.rein@e3n.de>
20
+ * @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
+ * @link http://www.e3n.de
22
+ */
23
+
24
+ /**
25
+ * Class Payone_Core_Model_Payment_Method_PayolutionInstallment
26
+ */
27
+ class Payone_Core_Model_Payment_Method_PayolutionInstallment extends Payone_Core_Model_Payment_Method_Abstract
28
+ {
29
+ /**
30
+ * @var bool
31
+ */
32
+ protected $_canUseForMultishipping = true;
33
+ /**
34
+ * @var string
35
+ */
36
+ protected $methodType = Payone_Core_Model_System_Config_PaymentMethodType::PAYOLUTIONINSTALLMENT;
37
+ /**
38
+ * @var string
39
+ */
40
+ protected $_code = Payone_Core_Model_System_Config_PaymentMethodCode::PAYOLUTIONINSTALLMENT;
41
+ /**
42
+ * @var string
43
+ */
44
+ protected $_formBlockType = 'payone_core/payment_method_form_payolution';
45
+ /**
46
+ * @var string
47
+ */
48
+ protected $_infoBlockType = 'payone_core/payment_method_info_payolution';
49
+ /**
50
+ * @var bool
51
+ */
52
+ protected $_blIpMandatory = true;
53
+
54
+ /**
55
+ * @param $response
56
+ * @return string
57
+ */
58
+ public function getApiResponseErrorMessage($response)
59
+ {
60
+ return $this->helper()->__('PAYONE_PAYOLUTION_API_ERRORMESSAGE');
61
+ }
62
+
63
+ }
app/code/community/Payone/Core/Model/Payment/Method/PayolutionInvoicing.php ADDED
@@ -0,0 +1,63 @@
1
+ <?php
2
+ /**
3
+ *
4
+ * NOTICE OF LICENSE
5
+ *
6
+ * This source file is subject to the GNU General Public License (GPL 3)
7
+ * that is bundled with this package in the file LICENSE.txt
8
+ *
9
+ * DISCLAIMER
10
+ *
11
+ * Do not edit or add to this file if you wish to upgrade Payone_Core to newer
12
+ * versions in the future. If you wish to customize Payone_Core for your
13
+ * needs please refer to http://www.payone.de for more information.
14
+ *
15
+ * @category Payone
16
+ * @package Payone_Core_Model
17
+ * @subpackage Payment
18
+ * @copyright Copyright (c) 2017 <support@e3n.de> - www.e3n.de
19
+ * @author Tim Rein <tim.rein@e3n.de>
20
+ * @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
+ * @link http://www.e3n.de
22
+ */
23
+
24
+ /**
25
+ * Class Payone_Core_Model_Payment_Method_PayolutionInvoicing
26
+ */
27
+ class Payone_Core_Model_Payment_Method_PayolutionInvoicing extends Payone_Core_Model_Payment_Method_Abstract
28
+ {
29
+ /**
30
+ * @var bool
31
+ */
32
+ protected $_canUseForMultishipping = true;
33
+ /**
34
+ * @var string
35
+ */
36
+ protected $methodType = Payone_Core_Model_System_Config_PaymentMethodType::PAYOLUTIONINVOICING;
37
+ /**
38
+ * @var string
39
+ */
40
+ protected $_code = Payone_Core_Model_System_Config_PaymentMethodCode::PAYOLUTIONINVOICING;
41
+ /**
42
+ * @var string
43
+ */
44
+ protected $_formBlockType = 'payone_core/payment_method_form_payolution';
45
+ /**
46
+ * @var string
47
+ */
48
+ protected $_infoBlockType = 'payone_core/payment_method_info_payolution';
49
+ /**
50
+ * @var bool
51
+ */
52
+ protected $_blIpMandatory = true;
53
+
54
+ /**
55
+ * @param $response
56
+ * @return string
57
+ */
58
+ public function getApiResponseErrorMessage($response)
59
+ {
60
+ return $this->helper()->__('PAYONE_PAYOLUTION_API_ERRORMESSAGE');
61
+ }
62
+
63
+ }
app/code/community/Payone/Core/Model/Payment/Method/Ratepay.php CHANGED
@@ -222,6 +222,21 @@ class Payone_Core_Model_Payment_Method_Ratepay extends Payone_Core_Model_Payment
222
return $oQuote;
223
}
224
225
public function getMatchingRatePayConfig()
226
{
227
if($this->_aRatePayShopConfig === null) {
@@ -235,11 +250,14 @@ class Payone_Core_Model_Payment_Method_Ratepay extends Payone_Core_Model_Payment
235
$sTable = $oResource->getTableName($this->_sTableName);
236
$blAddressesAreEqual = $this->helper()->addressesAreEqual($oQuote->getBillingAddress(), $oQuote->getShippingAddress());
237
238
$sQuery = " SELECT
239
shop_id
240
FROM
241
{$sTable}
242
WHERE
243
{$oQuote->getGrandTotal()} BETWEEN tx_limit_invoice_min AND tx_limit_invoice_max AND
244
currency = {$oRead->quote($oQuote->getQuoteCurrencyCode())} AND
245
country_code_billing = {$oRead->quote($oQuote->getBillingAddress()->getCountryId())}";
@@ -249,6 +267,7 @@ class Payone_Core_Model_Payment_Method_Ratepay extends Payone_Core_Model_Payment
249
}
250
251
$sQuery .= " LIMIT 1";
252
$sShopId = $oRead->fetchOne($sQuery);
253
if($sShopId) {
254
$this->_aRatePayShopConfig = $this->getRatePayConfigById($sShopId);
222
return $oQuote;
223
}
224
225
+ protected function _getApplicableRatepayShopIds($oQuote)
226
+ {
227
+ $aShopIds = array();
228
+
229
+ $configPayment = $this->getConfigForQuote($oQuote);
230
+ $aRatepayConfig = $configPayment->getRatepayConfig();
231
+ foreach ($aRatepayConfig as $aConfig) {
232
+ if (isset($aConfig['ratepay_shopid'])) {
233
+ $aShopIds[] = $aConfig['ratepay_shopid'];
234
+ }
235
+ }
236
+
237
+ return $aShopIds;
238
+ }
239
+
240
public function getMatchingRatePayConfig()
241
{
242
if($this->_aRatePayShopConfig === null) {
250
$sTable = $oResource->getTableName($this->_sTableName);
251
$blAddressesAreEqual = $this->helper()->addressesAreEqual($oQuote->getBillingAddress(), $oQuote->getShippingAddress());
252
253
+ $aRatepayShopIds = $this->_getApplicableRatepayShopIds($oQuote);
254
+
255
$sQuery = " SELECT
256
shop_id
257
FROM
258
{$sTable}
259
WHERE
260
+ shop_id IN ('".implode("','", $aRatepayShopIds)."') AND
261
{$oQuote->getGrandTotal()} BETWEEN tx_limit_invoice_min AND tx_limit_invoice_max AND
262
currency = {$oRead->quote($oQuote->getQuoteCurrencyCode())} AND
263
country_code_billing = {$oRead->quote($oQuote->getBillingAddress()->getCountryId())}";
267
}
268
269
$sQuery .= " LIMIT 1";
270
+
271
$sShopId = $oRead->fetchOne($sQuery);
272
if($sShopId) {
273
$this->_aRatePayShopConfig = $this->getRatePayConfigById($sShopId);
app/code/community/Payone/Core/Model/System/Config/PaymentMethodCode.php CHANGED
@@ -15,8 +15,8 @@
15
* @category Payone
16
* @package Payone_Core_Model
17
* @subpackage System
18
- * @copyright Copyright (c) 2012 <info@noovias.com> - www.noovias.com
19
- * @author Matthias Walter <info@noovias.com>
20
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
* @link http://www.noovias.com
22
*/
@@ -45,7 +45,10 @@ class Payone_Core_Model_System_Config_PaymentMethodCode extends Payone_Core_Mode
45
const WALLET = 'payone_wallet';
46
const BARZAHLEN = 'payone_barzahlen';
47
const RATEPAY = 'payone_ratepay';
48
- const PAYOLUTION = 'payone_payolution';
49
50
/**
51
* @return array
@@ -64,7 +67,10 @@ class Payone_Core_Model_System_Config_PaymentMethodCode extends Payone_Core_Mode
64
self::WALLET => 'Wallet',
65
self::BARZAHLEN => 'Barzahlen',
66
self::RATEPAY => 'RatePay',
67
- self::PAYOLUTION => 'Payolution',
68
);
69
}
70
- }
15
* @category Payone
16
* @package Payone_Core_Model
17
* @subpackage System
18
+ * @copyright Copyright (c) 2012 <info@noovias.com> - www.noovias.com, Copyright (c) 2017 <support@e3n.de> - www.e3n.de
19
+ * @author Matthias Walter <info@noovias.com>, Tim Rein <tim.rein@e3n.de>
20
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
* @link http://www.noovias.com
22
*/
45
const WALLET = 'payone_wallet';
46
const BARZAHLEN = 'payone_barzahlen';
47
const RATEPAY = 'payone_ratepay';
48
+ #const PAYOLUTION = 'payone_payolution';
49
+ const PAYOLUTIONINVOICING = 'payone_payolution_invoicing';
50
+ const PAYOLUTIONDEBIT = 'payone_payolution_debit';
51
+ const PAYOLUTIONINSTALLMENT = 'payone_payolution_installment';
52
53
/**
54
* @return array
67
self::WALLET => 'Wallet',
68
self::BARZAHLEN => 'Barzahlen',
69
self::RATEPAY => 'RatePay',
70
+ #self::PAYOLUTION => 'Payolution',
71
+ self::PAYOLUTIONINVOICING => 'Payolution Invoicing',
72
+ self::PAYOLUTIONDEBIT => 'Payolution Debit',
73
+ self::PAYOLUTIONINSTALLMENT => 'Payolution Installment'
74
);
75
}
76
+ }
app/code/community/Payone/Core/Model/System/Config/PaymentMethodType.php CHANGED
@@ -43,7 +43,10 @@ class Payone_Core_Model_System_Config_PaymentMethodType extends Payone_Core_Mode
43
const WALLET = 'wallet';
44
const BARZAHLEN = 'barzahlen';
45
const RATEPAY = 'ratepay';
46
- const PAYOLUTION = 'payolution';
47
48
/**
49
* @return array
@@ -62,7 +65,9 @@ class Payone_Core_Model_System_Config_PaymentMethodType extends Payone_Core_Mode
62
self::WALLET => 'Wallet',
63
self::BARZAHLEN => 'Barzahlen',
64
self::RATEPAY => 'RatePay',
65
- self::PAYOLUTION => 'Payolution',
66
);
67
}
68
}
43
const WALLET = 'wallet';
44
const BARZAHLEN = 'barzahlen';
45
const RATEPAY = 'ratepay';
46
+ const PAYOLUTIONINVOICING = 'payolution_invoicing';
47
+ const PAYOLUTIONDEBIT = 'payolution_debit';
48
+ const PAYOLUTIONINSTALLMENT = 'payolution_installment';
49
+
50
51
/**
52
* @return array
65
self::WALLET => 'Wallet',
66
self::BARZAHLEN => 'Barzahlen',
67
self::RATEPAY => 'RatePay',
68
+ self::PAYOLUTIONINVOICING => 'Payolution Invoicing',
69
+ self::PAYOLUTIONDEBIT => 'Payolution Debit',
70
+ self::PAYOLUTIONINSTALLMENT => 'Payolution Installment'
71
);
72
}
73
}
app/code/community/Payone/Core/controllers/Checkout/OnepageController.php CHANGED
@@ -184,7 +184,7 @@ class Payone_Core_Checkout_OnepageController extends Mage_Checkout_OnepageContro
184
$oMapper = $oService->getMapper();
185
$oRequest = $oMapper->addPayolutionPreCheckParameters($this->getOnepage()->getQuote(), $this->getRequest()->getPost());
186
$oResponse = $this->getFactory()->getServiceApiPaymentGenericpayment()->request($oRequest);
187
-
188
if($oResponse instanceof Payone_Api_Response_Genericpayment_Ok) {
189
$checkoutSession = $this->getFactory()->getSingletonCheckoutSession();
190
$checkoutSession->setPayoneWorkorderId($oResponse->getWorkorderId());
184
$oMapper = $oService->getMapper();
185
$oRequest = $oMapper->addPayolutionPreCheckParameters($this->getOnepage()->getQuote(), $this->getRequest()->getPost());
186
$oResponse = $this->getFactory()->getServiceApiPaymentGenericpayment()->request($oRequest);
187
+
188
if($oResponse instanceof Payone_Api_Response_Genericpayment_Ok) {
189
$checkoutSession = $this->getFactory()->getSingletonCheckoutSession();
190
$checkoutSession->setPayoneWorkorderId($oResponse->getWorkorderId());
app/code/community/Payone/Core/controllers/TransactionStatusController.php CHANGED
@@ -77,7 +77,7 @@ class Payone_Core_TransactionStatusController extends Payone_Core_Controller_Abs
77
78
// NEW forwarding handling
79
$this->_forwardStatus($order);
80
-
81
// Send Confirmation Message
82
$this->getResponse()->setBody($response->getStatus());
83
}
77
78
// NEW forwarding handling
79
$this->_forwardStatus($order);
80
+
81
// Send Confirmation Message
82
$this->getResponse()->setBody($response->getStatus());
83
}
app/code/community/Payone/Core/etc/config.xml CHANGED
@@ -24,7 +24,7 @@
24
<config>
25
<modules>
26
<Payone_Core>
27
- <version>3.7.0</version>
28
</Payone_Core>
29
</modules>
30
@@ -231,6 +231,14 @@
231
<!-- Payolution type -->
232
<to_order_payment>*</to_order_payment>
233
</payone_payolution_type>
234
<payone_payolution_iban>
235
<!-- Payolution iban -->
236
<to_order_payment>*</to_order_payment>
@@ -239,6 +247,18 @@
239
<!-- Payolution bic -->
240
<to_order_payment>*</to_order_payment>
241
</payone_payolution_bic>
242
<payone_isb2b>
243
<!-- B2B mode ? -->
244
<to_order_payment>*</to_order_payment>
@@ -255,6 +275,14 @@
255
<!-- Payolution installment duration -->
256
<to_order_payment>*</to_order_payment>
257
</payone_payolution_installment_duration>
258
</sales_convert_quote_payment>
259
<sales_convert_quote_address>
260
<payone_addresscheck_score>
@@ -344,7 +372,7 @@
344
<observers>
345
<payone_core_observer>
346
<type>singleton</type>
347
- <class>payone_core/observer_checkout_onepage_debitPayment</class>
348
<method>performChecks</method>
349
</payone_core_observer>
350
</observers>
@@ -353,7 +381,7 @@
353
<observers>
354
<payone_core_observer>
355
<type>singleton</type>
356
- <class>payone_core/observer_checkout_onepage_debitPayment</class>
357
<method>performChecks</method>
358
</payone_core_observer>
359
</observers>
@@ -577,11 +605,21 @@
577
<model>payone_core/payment_method_ratepay</model>
578
<group>payone</group>
579
</payone_ratepay>
580
- <payone_payolution translate="title" module="payone_core">
581
- <title>PAYONE - Payolution</title>
582
- <model>payone_core/payment_method_payolution</model>
583
<group>payone</group>
584
- </payone_payolution>
585
<payone_cash_on_delivery translate="title" module="payone_core">
586
<title>PAYONE - Cash on Delivery</title>
587
<model>payone_core/payment_method_cashOnDelivery</model>
@@ -662,6 +700,15 @@
662
<template_payolution>
663
<use_global>1</use_global>
664
</template_payolution>
665
</payone_payment>
666
<payone_general>
667
<global>
@@ -685,7 +732,9 @@
685
<wallet>a:1:{s:18:"_1343137411652_652";a:2:{s:8:"txaction";a:1:{i:0;s:9:"appointed";}s:12:"state_status";a:1:{i:0;s:21:"processing|processing";}}}</wallet>
686
<barzahlen>a:1:{s:23:"_payone_status_mapping4";a:2:{s:8:"txaction";a:1:{i:0;s:9:"appointed";}s:12:"state_status";a:1:{i:0;s:21:"processing|processing";}}}</barzahlen>
687
<ratepay>a:1:{s:17:"_1468417699073_73";a:2:{s:8:"txaction";a:1:{i:0;s:9:"appointed";}s:12:"state_status";a:1:{i:0;s:21:"processing|processing";}}}</ratepay>
688
- <payolution>a:1:{s:18:"_1468430772551_551";a:2:{s:8:"txaction";a:1:{i:0;s:9:"appointed";}s:12:"state_status";a:1:{i:0;s:21:"processing|processing";}}}</payolution>
689
<financing>a:1:{s:18:"_1468430123551_512";a:2:{s:8:"txaction";a:1:{i:0;s:9:"appointed";}s:12:"state_status";a:1:{i:0;s:21:"processing|processing";}}}</financing>
690
</status_mapping>
691
</payone_general>
@@ -737,4 +786,4 @@ Detaillierte Informationen zur Arbeitsweise der ABC finde ich unter www.abc.de/f
737
</payone_core_cronjob_transactionstatus_process>
738
</jobs>
739
</crontab>
740
- </config>
24
<config>
25
<modules>
26
<Payone_Core>
27
+ <version>3.7.5</version>
28
</Payone_Core>
29
</modules>
30
231
<!-- Payolution type -->
232
<to_order_payment>*</to_order_payment>
233
</payone_payolution_type>
234
+ <payone_payolution_invoicing>
235
+ <!-- Payolution type -->
236
+ <to_order_payment>*</to_order_payment>
237
+ </payone_payolution_invoicing>
238
+ <payone_payolution_installment>
239
+ <!-- Payolution type -->
240
+ <to_order_payment>*</to_order_payment>
241
+ </payone_payolution_installment>
242
<payone_payolution_iban>
243
<!-- Payolution iban -->
244
<to_order_payment>*</to_order_payment>
247
<!-- Payolution bic -->
248
<to_order_payment>*</to_order_payment>
249
</payone_payolution_bic>
250
+ <payone_payolution_debit>
251
+ <!-- Payolution type -->
252
+ <to_order_payment>*</to_order_payment>
253
+ </payone_payolution_debit>
254
+ <payone_payolution_debit_iban>
255
+ <!-- Payolution iban -->
256
+ <to_order_payment>*</to_order_payment>
257
+ </payone_payolution_debit_iban>
258
+ <payone_payolution_debit_bic>
259
+ <!-- Payolution bic -->
260
+ <to_order_payment>*</to_order_payment>
261
+ </payone_payolution_debit_bic>
262
<payone_isb2b>
263
<!-- B2B mode ? -->
264
<to_order_payment>*</to_order_payment>
275
<!-- Payolution installment duration -->
276
<to_order_payment>*</to_order_payment>
277
</payone_payolution_installment_duration>
278
+ <payone_wallet_type>
279
+ <!-- Wallet Type -->
280
+ <to_order_payment>*</to_order_payment>
281
+ </payone_wallet_type>
282
+ <payone_ratepay_type>
283
+ <!-- Ratepay Type -->
284
+ <to_order_payment>*</to_order_payment>
285
+ </payone_ratepay_type>
286
</sales_convert_quote_payment>
287
<sales_convert_quote_address>
288
<payone_addresscheck_score>
372
<observers>
373
<payone_core_observer>
374
<type>singleton</type>
375
+ <class>payone_core/observer_checkout_onepage_multiplePaymentCheck</class>
376
<method>performChecks</method>
377
</payone_core_observer>
378
</observers>
381
<observers>
382
<payone_core_observer>
383
<type>singleton</type>
384
+ <class>payone_core/observer_checkout_onepage_multiplePaymentCheck</class>
385
<method>performChecks</method>
386
</payone_core_observer>
387
</observers>
605
<model>payone_core/payment_method_ratepay</model>
606
<group>payone</group>
607
</payone_ratepay>
608
+ <payone_payolution_invoicing translate="title" module="payone_core">
609
+ <title>PAYONE - Payolution Invoicing</title>
610
+ <model>payone_core/payment_method_payolutionInvoicing</model>
611
+ <group>payone</group>
612
+ </payone_payolution_invoicing>
613
+ <payone_payolution_debit translate="title" module="payone_core">
614
+ <title>PAYONE - Payolution Debit</title>
615
+ <model>payone_core/payment_method_payolutionDebit</model>
616
<group>payone</group>
617
+ </payone_payolution_debit>
618
+ <payone_payolution_installment translate="title" module="payone_core">
619
+ <title>PAYONE - Payolution Installment</title>
620
+ <model>payone_core/payment_method_payolutionInstallment</model>
621
+ <group>payone</group>
622
+ </payone_payolution_installment>
623
<payone_cash_on_delivery translate="title" module="payone_core">
624
<title>PAYONE - Cash on Delivery</title>
625
<model>payone_core/payment_method_cashOnDelivery</model>
700
<template_payolution>
701
<use_global>1</use_global>
702
</template_payolution>
703
+ <template_payolution_invoicing>
704
+ <use_global>1</use_global>
705
+ </template_payolution_invoicing>
706
+ <template_payolution_debit>
707
+ <use_global>1</use_global>
708
+ </template_payolution_debit>
709
+ <template_payolution_installment>
710
+ <use_global>1</use_global>
711
+ </template_payolution_installment>
712
</payone_payment>
713
<payone_general>
714
<global>
732
<wallet>a:1:{s:18:"_1343137411652_652";a:2:{s:8:"txaction";a:1:{i:0;s:9:"appointed";}s:12:"state_status";a:1:{i:0;s:21:"processing|processing";}}}</wallet>
733
<barzahlen>a:1:{s:23:"_payone_status_mapping4";a:2:{s:8:"txaction";a:1:{i:0;s:9:"appointed";}s:12:"state_status";a:1:{i:0;s:21:"processing|processing";}}}</barzahlen>
734
<ratepay>a:1:{s:17:"_1468417699073_73";a:2:{s:8:"txaction";a:1:{i:0;s:9:"appointed";}s:12:"state_status";a:1:{i:0;s:21:"processing|processing";}}}</ratepay>
735
+ <payolution_debit>a:1:{s:18:"_1486042141_511";a:2:{s:8:"txaction";a:1:{i:0;s:9:"appointed";}s:12:"state_status";a:1:{i:0;s:21:"processing|processing";}}}</payolution_debit>
736
+ <payolution_invoicing>a:1:{s:18:"_1486042141_541";a:2:{s:8:"txaction";a:1:{i:0;s:9:"appointed";}s:12:"state_status";a:1:{i:0;s:21:"processing|processing";}}}</payolution_invoicing>
737
+ <payolution_installment>a:1:{s:18:"_1486042141_591";a:2:{s:8:"txaction";a:1:{i:0;s:9:"appointed";}s:12:"state_status";a:1:{i:0;s:21:"processing|processing";}}}</payolution_installment>
738
<financing>a:1:{s:18:"_1468430123551_512";a:2:{s:8:"txaction";a:1:{i:0;s:9:"appointed";}s:12:"state_status";a:1:{i:0;s:21:"processing|processing";}}}</financing>
739
</status_mapping>
740
</payone_general>
786
</payone_core_cronjob_transactionstatus_process>
787
</jobs>
788
</crontab>
789
+ </config>
app/code/community/Payone/Core/etc/system.xml CHANGED
@@ -328,15 +328,33 @@
328
<show_in_website>1</show_in_website>
329
<show_in_store>1</show_in_store>
330
</barzahlen>
331
- <payolution translate="label">
332
- <label>Payolution</label>
333
<frontend_model>payone_core/adminhtml_system_config_form_field_statusMapping</frontend_model>
334
<backend_model>adminhtml/system_config_backend_serialized_array</backend_model>
335
<sort_order>90</sort_order>
336
<show_in_default>1</show_in_default>
337
<show_in_website>1</show_in_website>
338
<show_in_store>1</show_in_store>
339
- </payolution>
340
<ratepay translate="label">
341
<label>RatePay</label>
342
<frontend_model>payone_core/adminhtml_system_config_form_field_statusMapping</frontend_model>
@@ -856,7 +874,7 @@
856
<show_in_store>1</show_in_store>
857
</customer_form_data_save>
858
<sofortueberweisung_show_iban translate="label">
859
- <label>Sofort-Ueberweisung: Display IBAN/BIC inputs</label>
860
<frontend_type>select</frontend_type>
861
<source_model>adminhtml/system_config_source_yesno</source_model>
862
<sort_order>280</sort_order>
@@ -998,8 +1016,64 @@
998
</show_customermessage>
999
</fields>
1000
</template_ratepay>
1001
- <template_payolution translate="label" module="payone_core">
1002
- <label>Payolution</label>
1003
<frontend_type>text</frontend_type>
1004
<sort_order>9</sort_order>
1005
<show_in_default>1</show_in_default>
@@ -1042,17 +1116,8 @@
1042
<show_in_website>1</show_in_website>
1043
<show_in_store>1</show_in_store>
1044
</b2b_mode>
1045
- <types translate="label,comment">
1046
- <label>Type</label>
1047
- <frontend_type>multiselect</frontend_type>
1048
- <source_model>payone_core/system_config_payolutionType</source_model>
1049
- <sort_order>56</sort_order>
1050
- <show_in_default>1</show_in_default>
1051
- <show_in_website>1</show_in_website>
1052
- <show_in_store>1</show_in_store>
1053
- </types>
1054
</fields>
1055
- </template_payolution>
1056
</groups>
1057
</payone_payment>
1058
328
<show_in_website>1</show_in_website>
329
<show_in_store>1</show_in_store>
330
</barzahlen>
331
+ <payolution_invoicing translate="label">
332
+ <label>Payolution Invoicing</label>
333
<frontend_model>payone_core/adminhtml_system_config_form_field_statusMapping</frontend_model>
334
<backend_model>adminhtml/system_config_backend_serialized_array</backend_model>
335
<sort_order>90</sort_order>
336
<show_in_default>1</show_in_default>
337
<show_in_website>1</show_in_website>
338
<show_in_store>1</show_in_store>
339
+ </payolution_invoicing>
340
+ <payolution_debit translate="label">
341
+ <label>Payolution Debit</label>
342
+ <frontend_model>payone_core/adminhtml_system_config_form_field_statusMapping</frontend_model>
343
+ <backend_model>adminhtml/system_config_backend_serialized_array</backend_model>
344
+ <sort_order>90</sort_order>
345
+ <show_in_default>1</show_in_default>
346
+ <show_in_website>1</show_in_website>
347
+ <show_in_store>1</show_in_store>
348
+ </payolution_debit>
349
+ <payolution_installment translate="label">
350
+ <label>Payolution Installment</label>
351
+ <frontend_model>payone_core/adminhtml_system_config_form_field_statusMapping</frontend_model>
352
+ <backend_model>adminhtml/system_config_backend_serialized_array</backend_model>
353
+ <sort_order>90</sort_order>
354
+ <show_in_default>1</show_in_default>
355
+ <show_in_website>1</show_in_website>
356
+ <show_in_store>1</show_in_store>
357
+ </payolution_installment>
358
<ratepay translate="label">
359
<label>RatePay</label>
360
<frontend_model>payone_core/adminhtml_system_config_form_field_statusMapping</frontend_model>
874
<show_in_store>1</show_in_store>
875
</customer_form_data_save>
876
<sofortueberweisung_show_iban translate="label">
877
+ <label>SOFORT Ueberweisung: Display IBAN/BIC inputs</label>
878
<frontend_type>select</frontend_type>
879
<source_model>adminhtml/system_config_source_yesno</source_model>
880
<sort_order>280</sort_order>
1016
</show_customermessage>
1017
</fields>
1018
</template_ratepay>
1019
+ <template_payolution_invoicing translate="label" module="payone_core">
1020
+ <label>Payolution Invoicing</label>
1021
+ <frontend_type>text</frontend_type>
1022
+ <sort_order>9</sort_order>
1023
+ <show_in_default>1</show_in_default>
1024
+ <show_in_website>1</show_in_website>
1025
+ <show_in_store>1</show_in_store>
1026
+ <fields>
1027
+ <company_name translate="label, comment">
1028
+ <label>Company name</label>
1029
+ <comment>Required</comment>
1030
+ <frontend_type>text</frontend_type>
1031
+ <sort_order>52</sort_order>
1032
+ <show_in_default>1</show_in_default>
1033
+ <show_in_website>1</show_in_website>
1034
+ <show_in_store>1</show_in_store>
1035
+ </company_name>
1036
+ <b2b_mode translate="label">
1037
+ <label>B2B mode</label>
1038
+ <frontend_type>select</frontend_type>
1039
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1040
+ <sort_order>55</sort_order>
1041
+ <show_in_default>1</show_in_default>
1042
+ <show_in_website>1</show_in_website>
1043
+ <show_in_store>1</show_in_store>
1044
+ </b2b_mode>
1045
+ </fields>
1046
+ </template_payolution_invoicing>
1047
+ <template_payolution_debit translate="label" module="payone_core">
1048
+ <label>Payolution Debit</label>
1049
+ <frontend_type>text</frontend_type>
1050
+ <sort_order>9</sort_order>
1051
+ <show_in_default>1</show_in_default>
1052
+ <show_in_website>1</show_in_website>
1053
+ <show_in_store>1</show_in_store>
1054
+ <fields>
1055
+ <company_name translate="label, comment">
1056
+ <label>Company name</label>
1057
+ <comment>Required</comment>
1058
+ <frontend_type>text</frontend_type>
1059
+ <sort_order>52</sort_order>
1060
+ <show_in_default>1</show_in_default>
1061
+ <show_in_website>1</show_in_website>
1062
+ <show_in_store>1</show_in_store>
1063
+ </company_name>
1064
+ <b2b_mode translate="label">
1065
+ <label>B2B mode</label>
1066
+ <frontend_type>select</frontend_type>
1067
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1068
+ <sort_order>55</sort_order>
1069
+ <show_in_default>1</show_in_default>
1070
+ <show_in_website>1</show_in_website>
1071
+ <show_in_store>1</show_in_store>
1072
+ </b2b_mode>
1073
+ </fields>
1074
+ </template_payolution_debit>
1075
+ <template_payolution_installment translate="label" module="payone_core">
1076
+ <label>Payolution Installment</label>
1077
<frontend_type>text</frontend_type>
1078
<sort_order>9</sort_order>
1079
<show_in_default>1</show_in_default>
1116
<show_in_website>1</show_in_website>
1117
<show_in_store>1</show_in_store>
1118
</b2b_mode>
1119
</fields>
1120
+ </template_payolution_installment>
1121
</groups>
1122
</payone_payment>
1123
app/code/community/Payone/Core/sql/payone_core_setup/mysql4-upgrade-3.7.1-3.7.2.php ADDED
@@ -0,0 +1,94 @@
1
+ <?php
2
+ /**
3
+ *
4
+ * NOTICE OF LICENSE
5
+ *
6
+ * This source file is subject to the GNU General Public License (GPL 3)
7
+ * that is bundled with this package in the file LICENSE.txt
8
+ *
9
+ * DISCLAIMER
10
+ *
11
+ * Do not edit or add to this file if you wish to upgrade Payone_Core to newer
12
+ * versions in the future. If you wish to customize Payone_Core for your
13
+ * needs please refer to http://www.payone.de for more information.
14
+ *
15
+ * @category Payone
16
+ * @package Payone_Core_Block
17
+ * @subpackage Payment
18
+ * @copyright Copyright (c) 2016 <kontakt@fatchip.de> - www.fatchip.com
19
+ * @author Robert M�ller <robert.mueller@fatchip.de>
20
+ * @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
+ * @link http://www.fatchip.com
22
+ */
23
+
24
+ /** @var $this Mage_Core_Model_Resource_Setup */
25
+ /** @var $installer Mage_Core_Model_Resource_Setup */
26
+
27
+ $installer = $this;
28
+ $installer->startSetup();
29
+
30
+ $tableOrderPayment = $this->getTable('sales/order_payment');
31
+ $tableQuotePayment = $this->getTable('sales/quote_payment');
32
+
33
+ /** @var $helper Payone_Core_Helper_Data */
34
+ $helper = Mage::helper('payone_core');
35
+ $useSqlInstaller = $helper->mustUseSqlInstaller();
36
+
37
+ if ($useSqlInstaller) {
38
+ $sql = file_get_contents(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'upgrade-3.7.1-3.7.2.sql');
39
+
40
+ $installSqlConfig = array(
41
+ '{{sales_flat_order_payment}}' => $tableOrderPayment,
42
+ '{{sales_flat_quote_payment}}' => $tableQuotePayment,
43
+ );
44
+
45
+ $installSql = str_replace(array_keys($installSqlConfig), array_values($installSqlConfig), $sql);
46
+ $installer->run($installSql);
47
+ } else {
48
+ $connection = $installer->getConnection();
49
+
50
+ /* Changes to sales_flat_order_payment */
51
+
52
+ $connection->addColumn(
53
+ $tableOrderPayment, 'payone_wallet_type',
54
+ array(
55
+ 'TYPE' => Varien_Db_Ddl_Table::TYPE_TEXT,
56
+ 'LENGTH' => 3,
57
+ 'NULLABLE' => false,
58
+ 'COMMENT' => 'Wallet type',
59
+ 'DEFAULT' => '')
60
+ );
61
+ $connection->addColumn(
62
+ $tableOrderPayment, 'payone_ratepay_type',
63
+ array(
64
+ 'TYPE' => Varien_Db_Ddl_Table::TYPE_TEXT,
65
+ 'LENGTH' => 3,
66
+ 'NULLABLE' => false,
67
+ 'COMMENT' => 'Ratepay type',
68
+ 'DEFAULT' => '')
69
+ );
70
+
71
+ /* Changes to sales_flat_quote_payment */
72
+
73
+ $connection->addColumn(
74
+ $tableQuotePayment, 'payone_wallet_type',
75
+ array(
76
+ 'TYPE' => Varien_Db_Ddl_Table::TYPE_TEXT,
77
+ 'LENGTH' => 3,
78
+ 'NULLABLE' => false,
79
+ 'COMMENT' => 'Wallet type',
80
+ 'DEFAULT' => '')
81
+ );
82
+ $connection->addColumn(
83
+ $tableQuotePayment, 'payone_ratepay_type',
84
+ array(
85
+ 'TYPE' => Varien_Db_Ddl_Table::TYPE_TEXT,
86
+ 'LENGTH' => 3,
87
+ 'NULLABLE' => false,
88
+ 'COMMENT' => 'Ratepay type',
89
+ 'DEFAULT' => '')
90
+ );
91
+ }
92
+
93
+ $installer->endSetup();
94
+
app/code/community/Payone/Core/sql/payone_core_setup/upgrade-3.7.1-3.7.2.sql ADDED
@@ -0,0 +1,15 @@
1
+ #-----------------------------------------------------------------
2
+ #-- Alter Table sales_flat_order_payment
3
+ #-----------------------------------------------------------------
4
+
5
+ ALTER TABLE `{{sales_flat_order_payment}}`
6
+ ADD `payone_wallet_type` VARCHAR(3) NOT NULL DEFAULT '',
7
+ ADD `payone_ratepay_type` VARCHAR(3) NOT NULL DEFAULT '';
8
+
9
+ #-----------------------------------------------------------------
10
+ #-- Alter Table sales_flat_quote_payment
11
+ #-----------------------------------------------------------------
12
+
13
+ ALTER TABLE `{{sales_flat_quote_payment}}`
14
+ ADD `payone_wallet_type` VARCHAR(3) NOT NULL DEFAULT '',
15
+ ADD `payone_ratepay_type` VARCHAR(3) NOT NULL DEFAULT '';
app/code/community/Payone/Core/sql/payone_core_setup/upgrade-3.7.3-3.7.4.sql ADDED
@@ -0,0 +1,6 @@
1
+ #-----------------------------------------------------------------
2
+ #-- DELETE old payoltion vales from payone_config_payment_method
3
+ #-----------------------------------------------------------------
4
+
5
+
6
+ DELETE FROM `payone_config_payment_method` WHERE code = 'payolution';
app/design/adminhtml/default/default/template/payone/core/payment/method/form/payolution.phtml CHANGED
@@ -21,33 +21,17 @@
21
* @link http://www.fatchip.com
22
*/
23
24
- /** @var $this Payone_Core_Block_Payment_Method_Form_RatePay */
25
$code = $this->getMethodCode();
26
$configId = $this->getPaymentConfig()->getId();
27
- $sType = $this->getPayolutionType();
28
- $aTypes = $this->getPayolutionTypesBackend();
29
30
?>
31
<ul id="payment_form_<?php echo $code ?>" style="display:none">
32
<li>
33
<div class="field">
34
- <?php if(count($aTypes) == 1) { ?>
35
- <input type="hidden" id="<?php echo $code ?>_type_select" name="payment[payone_payolution_type]"
36
- value="<?php echo $aTypes[0]; ?>">
37
- <?php } else { ?>
38
- <label for="<?php echo $code; ?>_type_select">
39
- <?php echo $this->__('Payment type'); ?>&nbsp;<span class="required">*</span>
40
- </label><br class="clear"/>
41
- <select id="<?php echo $code ?>_type_select" name="payment[payone_payolution_type]"
42
- class="required-entry" onchange="payoneSwitchPayolution(this, '<?php echo $code; ?>');">
43
- <option value=""><?php echo $this->__('--Please Select--') ?></option>
44
- <?php foreach ($aTypes as $type): ?>
45
- <option value="<?php echo $type ?>">
46
- <?php echo $this->__($type); ?>
47
- </option>
48
- <?php endforeach; ?>
49
- </select>
50
- <?php } ?>
51
</div>
52
<div id="<?php echo $code ?>_main_block" style="display:none;">
53
<div class="field" id="<?php echo $code; ?>_installment_wrap2" style="display:none;"></div>
@@ -136,7 +120,7 @@ $aTypes = $this->getPayolutionTypesBackend();
136
</div>
137
<div class="field" style="position:relative;">
138
<input type="hidden" name="payment[payone_config_payment_method_id]" value="<?php echo $configId; ?>"/>
139
- <input type="hidden" name="payment[payone_payolution_type]" value="<?php echo $sType; ?>"/>
140
<input type="hidden" name="payment[payone_payolution_installment_duration]" value="" id="<?php echo $code ?>_selected_installmentplan" />
141
<div id="payolution_overlay" style="display:none;">
142
<a href="#" onclick="removeOverlay();return false;" style="float:right;font-weight:bold;"><?php echo $this->__('Close window'); ?></a><br><br>
21
* @link http://www.fatchip.com
22
*/
23
24
+ /** @var $this Payone_Core_Block_Payment_Method_Form_Payolution */
25
$code = $this->getMethodCode();
26
$configId = $this->getPaymentConfig()->getId();
27
+ $getPayolutionTyp = $this->payolutionTypeMapping();
28
29
?>
30
<ul id="payment_form_<?php echo $code ?>" style="display:none">
31
<li>
32
<div class="field">
33
+ <input type="hidden" id="<?php echo $code ?>_type_select" name="payment[payone_payolution_type]"
34
+ value="<?php echo $getPayolutionTyp[$code] ?>">
35
</div>
36
<div id="<?php echo $code ?>_main_block" style="display:none;">
37
<div class="field" id="<?php echo $code; ?>_installment_wrap2" style="display:none;"></div>
120
</div>
121
<div class="field" style="position:relative;">
122
<input type="hidden" name="payment[payone_config_payment_method_id]" value="<?php echo $configId; ?>"/>
123
+ <input type="hidden" name="payment[payone_payolution_type]" value="<?php echo $getPayolutionTyp; ?>"/>
124
<input type="hidden" name="payment[payone_payolution_installment_duration]" value="" id="<?php echo $code ?>_selected_installmentplan" />
125
<div id="payolution_overlay" style="display:none;">
126
<a href="#" onclick="removeOverlay();return false;" style="float:right;font-weight:bold;"><?php echo $this->__('Close window'); ?></a><br><br>
app/design/adminhtml/default/default/template/payone/core/payment/method/info/payolution.phtml CHANGED
@@ -21,7 +21,7 @@
21
* @link http://www.fatchip.com
22
*/
23
24
- /** @var $this Payone_Core_Block_Payment_Method_Info_Barzahlen */
25
?>
26
<?php
27
echo $this->escapeHtml($this->getMethodTitle()) ?>
21
* @link http://www.fatchip.com
22
*/
23
24
+ /** @var $this Payone_Core_Block_Payment_Method_Info_Payolution */
25
?>
26
<?php
27
echo $this->escapeHtml($this->getMethodTitle()) ?>
app/design/adminhtml/default/default/template/payone/core/system/config/tooltip/payment/online_bank_transfer.phtml CHANGED
@@ -26,7 +26,7 @@
26
<?php echo $this->__('You can define here which types of online bank transfer are available during checkout.'); ?><br>
27
<?php echo $this->__('The following providers are currently supported'); ?>:<br>
28
<ul>
29
- <li><?php echo $this->__('Sofort-Überweisung'); ?></li>
30
<li><?php echo $this->__('giropay'); ?></li>
31
<li><?php echo $this->__('eps'); ?></li>
32
<li><?php echo $this->__('PostFinance E-Finance'); ?></li>
26
<?php echo $this->__('You can define here which types of online bank transfer are available during checkout.'); ?><br>
27
<?php echo $this->__('The following providers are currently supported'); ?>:<br>
28
<ul>
29
+ <li><?php echo $this->__('SOFORT Überweisung'); ?></li>
30
<li><?php echo $this->__('giropay'); ?></li>
31
<li><?php echo $this->__('eps'); ?></li>
32
<li><?php echo $this->__('PostFinance E-Finance'); ?></li>
app/design/frontend/base/default/layout/payone/core.xml CHANGED
@@ -149,8 +149,8 @@
149
<action method="setTemplate"><template>page/1column.phtml</template></action>
150
</reference>
151
</payone_core_iframe_show>
152
-
153
-
154
<payone_core_payolution_installmentplan>
155
<!-- Mage_Checkout -->
156
<remove name="right"/>
149
<action method="setTemplate"><template>page/1column.phtml</template></action>
150
</reference>
151
</payone_core_iframe_show>
152
+
153
+
154
<payone_core_payolution_installmentplan>
155
<!-- Mage_Checkout -->
156
<remove name="right"/>
app/design/frontend/base/default/template/payone/core/checkout/onepage/init.phtml CHANGED
@@ -27,7 +27,7 @@
27
new PAYONE.Handler.CreditCardCheck.OnepageCheckout()
28
);
29
30
- Event.observe(window, 'load', function () {
31
payone.form = payment.form;
32
payment.save = payment.save.wrap(
33
function (origMethod) {
@@ -36,4 +36,4 @@
36
);
37
});
38
//]]>
39
- </script>
27
new PAYONE.Handler.CreditCardCheck.OnepageCheckout()
28
);
29
30
+ document.observe('dom:loaded', function () {
31
payone.form = payment.form;
32
payment.save = payment.save.wrap(
33
function (origMethod) {
36
);
37
});
38
//]]>
39
+ </script>
app/design/frontend/base/default/template/payone/core/payment/method/form/payolution.phtml CHANGED
@@ -15,55 +15,42 @@
15
* @category Payone
16
* @package design_frontend_base_default
17
* @subpackage template
18
- * @copyright Copyright (c) 2015 <kontakt@fatchip.de> - www.fatchip.com
19
- * @author Robert M�ller <robert.mueller@fatchip.de>
20
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
21
- * @link http://www.fatchip.com
22
*/
23
24
- /** @var $this Payone_Core_Block_Payment_Method_Form_RatePay */
25
$code = $this->getMethodCode();
26
$configId = $this->getPaymentConfig()->getId();
27
- $aTypes = $this->getPayolutionTypes();
28
29
?>
30
<fieldset class="form-list">
31
<ul id="payment_form_<?php echo $code ?>" style="display:none">
32
<li class="fields">
33
<div class="field">
34
- <?php if(count($aTypes) == 1) { ?>
35
- <input type="hidden" id="<?php echo $code ?>_type_select" name="payment[payone_payolution_type]"
36
- value="<?php echo $aTypes[0]; ?>">
37
- <?php } else { ?>
38
- <label for="<?php echo $code; ?>_type_select">
39
- <?php echo $this->__('Payment type'); ?>&nbsp;<span class="required">*</span>
40
- </label><br class="clear"/>
41
- <select id="<?php echo $code ?>_type_select" name="payment[payone_payolution_type]"
42
- class="required-entry" onchange="payoneSwitchPayolution(this, '<?php echo $code; ?>');">
43
- <option value=""><?php echo $this->__('--Please Select--') ?></option>
44
- <?php foreach ($aTypes as $type): ?>
45
- <option value="<?php echo $type ?>">
46
- <?php echo $this->__($type); ?>
47
- </option>
48
- <?php endforeach; ?>
49
- </select>
50
- <?php } ?>
51
</div>
52
- <div id="<?php echo $code ?>_main_block" style="display:none;">
53
- <div class="field" id="<?php echo $code; ?>_installment_wrap2" style="display:none;"></div>
54
<?php if ($this->isB2BMode()) { ?>
55
<div id="<?php echo $code; ?>_b2b_wrap" class="field">
56
<div class="input-box">
57
- <label for="<?php echo $code ?>_trade_registry_number"><?php echo $this->__('Company trade registry number') ?>
58
<span class="required">*</span>
59
</label>
60
<br class="clear"/>
61
- <input type="text" id="<?php echo $code ?>_trade_registry_number" name="payment[payone_trade_registry_number]"
62
value="" title="" class="required-entry input-text no-submit"/>
63
</div>
64
</div>
65
<?php } ?>
66
- <?php if ($this->showBirthdayFields()){ ?>
67
<div id="<?php echo $code; ?>_birthday_wrap" class="field">
68
<label for="<?php echo $code ?>_additional_fields_customer_dob_month"
69
class="required"><em>*</em><?php echo $this->__('Date of birth (DD MM YYYY)') ?>
@@ -98,7 +85,7 @@ $aTypes = $this->getPayolutionTypes();
98
</select>
99
100
<input type="hidden" id="<?php echo $code ?>_additional_fields_customer_dob_full"
101
- name="payment[payone_customer_dob]" class="validate-18-years">
102
</div>
103
<?php } ?>
104
<div id="<?php echo $code; ?>_debit_wrap" class="field" style="display:none;">
@@ -145,36 +132,45 @@ $aTypes = $this->getPayolutionTypes();
145
</div>
146
</div>
147
<div id="<?php echo $code; ?>_acceptance_wrap" class="field" style="position:relative;">
148
- <input type="che