Skip to content

Commit 02444a1

Browse files
janteuberjanteuber
authored
Merge branch 'master' into version-bump-1130
2 parents 12272de + 3e6eaf8 commit 02444a1

23 files changed

Lines changed: 734 additions & 3 deletions

‎application/controllers/admin/fcpayone_main.php‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -772,6 +772,28 @@ public function getCCFields()
772772
);
773773
}
774774

775+
/**
776+
* Returns fields belonging to click to pay UI style config
777+
*
778+
* @param void
779+
* @return array
780+
*/
781+
public function fcpoGetCCV2UIConfigFields()
782+
{
783+
return fcpopaymenthelper::getInstance()->fcpoGetCCV2UIConfigFields();
784+
}
785+
786+
/**
787+
* Returns fields belonging to click to pay CTP UI style config
788+
*
789+
* @param void
790+
* @return array
791+
*/
792+
public function fcpoGetCCV2CTPUIConfigFields()
793+
{
794+
return fcpopaymenthelper::getInstance()->fcpoGetCCV2CTPUIConfigFields();
795+
}
796+
775797
/**
776798
* Return array of cc types
777799
*

‎application/helper/fcpopaymenthelper.php‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,69 @@ public function getUnzerSepaAgreement ()
102102
{
103103
return 'https://payment.payolution.com/payolution-payment/infoport/sepa/mandate.pdf';
104104
}
105+
106+
/**
107+
* Returns fields belonging to click to pay UI style config
108+
*
109+
* @param void
110+
* @return array
111+
*/
112+
public function fcpoGetCCV2UIConfigFields()
113+
{
114+
return array(
115+
'formBgColor' => 'Form Background color',
116+
'fieldBgColor' => 'Field Background color',
117+
'fieldBorder' => 'Field Border',
118+
'fieldOutline' => 'Field Outline',
119+
'fieldLabelColor' => 'Field Label color',
120+
'fieldPlaceholderColor' => 'Field Placeholder color',
121+
'fieldTextColor' => 'Field Text color',
122+
'fieldErrorCodeColor' => 'Field Errorcode color',
123+
);
124+
}
125+
126+
/**
127+
* Returns fields belonging to click to pay CTP UI style config
128+
*
129+
* @param void
130+
* @return array
131+
*/
132+
public function fcpoGetCCV2CTPUIConfigFields()
133+
{
134+
return array(
135+
'buttonStyle' => 'Button Style',
136+
'buttonTextCase' => 'Button Text case',
137+
'buttonAndBadgeColor' => 'Button and Badge color',
138+
'buttonAndBadgeTextColor' => 'Button and Badge Text color',
139+
'buttonDisabledColor' => 'Button disabled color',
140+
'buttonFilledHoverColor' => 'Button filled Hover color',
141+
'buttonOutlinedHoverColor' => 'Button outline Hover color',
142+
'buttonAndInputRadius' => 'Button and Input radius',
143+
'cardItemActiveColor' => 'Card item active color',
144+
'cardItemRadius' => 'Card item Radius',
145+
'linkTextColor' => 'Link Text color',
146+
'accentColor' => 'Accent color',
147+
'fontFamily' => 'Font Family',
148+
);
149+
}
150+
151+
public function fcpoGetCCV2SchemeConfig()
152+
{
153+
$oHelper = $this->getMainHelper();
154+
$oConfig = $oHelper->fcpoGetConfig();
155+
156+
return [
157+
'merchantPresentationName' => "PayoneC2P-00004",
158+
'visaConfig' => [
159+
'srcInitiatorId' => '2662KBGOLX92KS4XIFYU213JLdGTvLhYkOB-_1gLo1D1jOqgM',
160+
'srcDpaId' => $oConfig->getConfigParam('sFCPOCCV2VisaDpaId'),
161+
'encryptionKey' => 'GQJIKLOAMZWIT8IRIGHR14vQUlllxiMWf-XSHQHvjI5wuTZ2w',
162+
'nModulus' => "kPujwVJjevI_oeZwZoA2Wjt94DFcMvRCab8iRiEGrGfKWtNCwQYkylyuRoB615cYm2BVbvoKH8Yyv0aC3dwah6UmOdJszmL0pV_cbx_tXzWgYg3sYNsp0sBxUFcQ1A6DVbyOxxJbmnwlHGE5fkuzJr-qqul3RswsCG-vPrh_--2_RSipa9lVr9gvfI4AbFABLTqKeto0rWPbIBKdhcGQ7JMPxzq8239KPUZfSyNueAcdL-yHADi3L2VSzdF7tS7si3ue_IFoXDpbggsFxvEt79UlBDOBsagc_ms9_ZsYlJaKCT8ZjwhakMo_-Zdc97mudVj1jz2_L5l4l_zibF5riw",
163+
],
164+
'mastercardConfig' => [
165+
'srcInitiatorId' => '559003b0-5d17-4d89-aa2b-b02a4023d64d',
166+
'srcDpaId' => $oConfig->getConfigParam('sFCPOCCV2MastercardDpaId'),
167+
]
168+
];
169+
}
105170
}

‎application/models/fcpoconfigexport.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,7 @@ protected function _getPaymentAbbreviation($sPaymentId)
481481

482482
$aAbbreviations = array(
483483
'fcpocreditcard' => 'cc',
484+
'fcpocreditcardv2' => 'cc',
484485
'fcpocashondel' => 'cod',
485486
'fcpodebitnote' => 'elv',
486487
'fcpopayadvance' => 'vor',

‎application/translations/de/fcPayOne_lang.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@
255255
'PAYONE Klarna Rechnung' => 'PAYONE Klarna Rechnung',
256256
'PAYONE Klarna Sofort bezahlen' => 'PAYONE Klarna Sofort bezahlen',
257257
'PAYONE Kreditkarte' => 'PAYONE Kreditkarte',
258+
'PAYONE Kreditkarte (Click to Pay)' => 'PAYONE Kreditkarte (Click to Pay)',
258259
'PAYONE Lastschrift' => 'PAYONE Lastschrift',
259260
'PAYONE Nachnahme' => 'PAYONE Nachnahme',
260261
'PAYONE PayPal Express' => 'PAYONE PayPal Express',

‎application/translations/en/fcPayOne_lang.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@
266266
'PAYONE Klarna Rechnung' => 'PAYONE Klarna Rechnung',
267267
'PAYONE Klarna Sofort bezahlen' => 'PAYONE Klarna Sofort bezahlen',
268268
'PAYONE Kreditkarte' => 'PAYONE Credit Card',
269+
'PAYONE Kreditkarte (Click to Pay)' => 'PAYONE Credit card (Click to Pay)',
269270
'PAYONE Lastschrift' => 'PAYONE Direct Debit',
270271
'PAYONE Nachnahme' => 'PAYONE Cash on Delivery',
271272
'PAYONE PayPal Express' => 'PAYONE PayPal Express',

‎application/views/admin/de/fcPayOne_lang.php‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@
226226
'FCPO_CONFIG_GROUP_GENERAL' => "Allgemein",
227227
'FCPO_CONFIG_GROUP_DEBITNOTE' => "Lastschrift",
228228
'FCPO_CONFIG_GROUP_CREDITCARD' => "Kreditkarte",
229+
'FCPO_CONFIG_GROUP_CREDITCARDV2' => "Kreditkarte (Click to Pay)",
229230

230231
'FCPO_CONFIG_GROUP_PP_EXPRESS_LOGOS' => "PayPal",
231232
'FCPO_CONFIG_ADD_PP_EXPRESS_LOGO' => "Weitere Sprache hinzufügen",
@@ -303,6 +304,53 @@
303304
'FCPO_CC_CUSTOM_TEMPLATE' => 'Benutzerdefinierte Anpassung hosted-Iframe',
304305
'FCPO_CC_PREVIEW' => 'Vorschau',
305306

307+
'FCPO_CCV2_CUSTOM_TEMPLATE' => 'Benutzerdefinierte Anpassung Click to pay iFrame',
308+
'FCPO_CCV2_UI_CONFIG_UNDERTITLE' => 'UI Config',
309+
'FCPO_CCV2_CTP_UI_CONFIG_UNDERTITLE' => 'CTP UI Config',
310+
311+
'FCPO_CCV2_UI_CONFIG_formBgColor' => 'Formular Hintergrundfarbe',
312+
'FCPO_CCV2_UI_CONFIG_fieldBgColor' => 'Feld Hintergrundfarbe',
313+
'FCPO_CCV2_UI_CONFIG_fieldBorder' => 'Feldrahmen',
314+
'FCPO_CCV2_UI_CONFIG_fieldOutline' => 'Feldumriss',
315+
'FCPO_CCV2_UI_CONFIG_fieldLabelColor' => 'Feldbezeichnung Farbe',
316+
'FCPO_CCV2_UI_CONFIG_fieldPlaceholderColor' => 'Feld Platzhalterfarbe',
317+
'FCPO_CCV2_UI_CONFIG_fieldTextColor' => 'Feld Textfarbe',
318+
'FCPO_CCV2_UI_CONFIG_fieldErrorCodeColor' => 'Feld Fehlercodefarbe',
319+
320+
'FCPO_CCV2_CTP_UI_CONFIG_buttonStyle' => 'Button-Stil',
321+
'FCPO_CCV2_CTP_UI_CONFIG_buttonStyle_Outlined' => 'OUTLINED',
322+
'FCPO_CCV2_CTP_UI_CONFIG_buttonStyle_Filled' => 'FILLED',
323+
'FCPO_CCV2_CTP_UI_CONFIG_buttonTextCase' => 'Button Textschreibweise',
324+
'FCPO_CCV2_CTP_UI_CONFIG_buttonTextCase_Capitalize' => 'Capitalize',
325+
'FCPO_CCV2_CTP_UI_CONFIG_buttonTextCase_Uppercase' => 'UPPERCASE',
326+
'FCPO_CCV2_CTP_UI_CONFIG_buttonAndBadgeColor' => 'Button- und Badge-Farbe',
327+
'FCPO_CCV2_CTP_UI_CONFIG_buttonAndBadgeTextColor' => 'Button- und Badge-Textfarbe',
328+
'FCPO_CCV2_CTP_UI_CONFIG_buttonDisabledColor' => 'Button-Farbe (deaktiviert)',
329+
'FCPO_CCV2_CTP_UI_CONFIG_buttonFilledHoverColor' => 'Button Hover-Farbe (gefüllt)',
330+
'FCPO_CCV2_CTP_UI_CONFIG_buttonOutlinedHoverColor' => 'Button Hover-Farbe (umrandet)',
331+
'FCPO_CCV2_CTP_UI_CONFIG_buttonAndInputRadius' => 'Button- und Eingabe-Radius',
332+
'FCPO_CCV2_CTP_UI_CONFIG_cardItemActiveColor' => 'Kartenelement Farbe (aktiv)',
333+
'FCPO_CCV2_CTP_UI_CONFIG_cardItemRadius' => 'Kartenelement Radius',
334+
'FCPO_CCV2_CTP_UI_CONFIG_linkTextColor' => 'Link Textfarbe',
335+
'FCPO_CCV2_CTP_UI_CONFIG_accentColor' => 'Akzentfarbe',
336+
'FCPO_CCV2_CTP_UI_CONFIG_fontFamily' => 'Schriftart',
337+
338+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_buttonTextCase' => '"capitalize" oder "uppercase"',
339+
'FCPO_HELP_CCV2_UI_CONFIG_formBgColor' => 'Verwenden Sie Hexadezimalzahlen, mit #',
340+
'FCPO_HELP_CCV2_UI_CONFIG_fieldBgColor' => 'Verwenden Sie Hexadezimalzahlen, mit #',
341+
'FCPO_HELP_CCV2_UI_CONFIG_fieldLabelColor' => 'Verwenden Sie Hexadezimalzahlen, mit #',
342+
'FCPO_HELP_CCV2_UI_CONFIG_fieldPlaceholderColor' => 'Verwenden Sie Hexadezimalzahlen, mit #',
343+
'FCPO_HELP_CCV2_UI_CONFIG_fieldTextColor' => 'Verwenden Sie Hexadezimalzahlen, mit #',
344+
'FCPO_HELP_CCV2_UI_CONFIG_fieldErrorCodeColor' => 'Verwenden Sie Hexadezimalzahlen, mit #',
345+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_buttonAndBadgeColor' => 'Verwenden Sie Hexadezimalzahlen, mit #',
346+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_buttonAndBadgeTextColor' => 'Verwenden Sie Hexadezimalzahlen, mit #',
347+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_buttonDisabledColor' => 'Verwenden Sie Hexadezimalzahlen, mit #',
348+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_buttonFilledHoverColor' => 'Verwenden Sie Hexadezimalzahlen, mit #',
349+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_buttonOutlinedHoverColor' => 'Verwenden Sie Hexadezimalzahlen, mit #',
350+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_cardItemActiveColor' => 'Verwenden Sie Hexadezimalzahlen, mit #',
351+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_linkTextColor' => 'Verwenden Sie Hexadezimalzahlen, mit #',
352+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_accentColor' => 'Verwenden Sie Hexadezimalzahlen, mit #',
353+
306354
'FCPO_CREDITCARD' => 'Karte:',
307355
'FCPO_NUMBER' => 'Nummer:',
308356
'FCPO_CARD_SECURITY_CODE' => 'Prüfziffer:',
@@ -336,6 +384,12 @@
336384
'FCPO_CC_IFRAME_STANDARD' => 'Standard',
337385
'FCPO_CC_IFRAME_CUSTOM' => 'Benutzerdefiniert',
338386

387+
'FCPO_CCV2_LIVE_MODE_ALERT' => 'Click to Pay funktioniert nur im Live-Modus (automatische Einstellung)',
388+
'FCPO_CCV2_CTP_ENABLE' => 'Click2Pay aktivieren',
389+
'FCPO_CCV2_CTP_ONBOARDING_ENABLE' => 'Click2Pay Onboarding aktivieren',
390+
'FCPO_CCV2_CTP_VISA_DPAID' => 'Visa DpaId',
391+
'FCPO_CCV2_CTP_MASTERCARD_DPAID' => 'Mastercard DpaId',
392+
339393
'FCPO_CONFIG_GROUP_PAYOLUTION' => 'Unzer',
340394
'FCPO_PAYOLUTION_B2BMODE' => 'Unzer im B2B-Modus betreiben',
341395
'FCPO_HELP_PAYOLUTION_B2BMODE' => 'Bei aktiviertem B2B Modus und vom Benutzer angegebenem Firmennamen wird die USt-IdNr. abgefragt. Bei B2C Kunden wird stattdessen das Geburtsdatum abgefragt.',
@@ -475,6 +529,7 @@
475529
'PAYONE Klarna Rechnung' => 'PAYONE Klarna Rechnung',
476530
'PAYONE Klarna Sofort bezahlen' => 'PAYONE Klarna Sofort bezahlen',
477531
'PAYONE Kreditkarte' => 'PAYONE Kreditkarte',
532+
'PAYONE Kreditkarte (Click to Pay)' => 'PAYONE Kreditkarte (Click to Pay)',
478533
'PAYONE Lastschrift' => 'PAYONE Lastschrift',
479534
'PAYONE Nachnahme' => 'PAYONE Nachnahme',
480535
'PAYONE PayPal Express' => 'PAYONE PayPal Express',

‎application/views/admin/en/fcPayOne_lang.php‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@
216216
'FCPO_CONFIG_GROUP_GENERAL' => "General",
217217
'FCPO_CONFIG_GROUP_DEBITNOTE' => "Debit",
218218
'FCPO_CONFIG_GROUP_CREDITCARD' => "Creditcard",
219+
'FCPO_CONFIG_GROUP_CREDITCARDV2' => "Creditcard (Click to Pay)",
219220
'FCPO_CONFIG_GROUP_PAYOLUTION' => 'Unzer',
220221
'FCPO_CONFIG_GROUP_RATEPAY' => 'Ratepay',
221222
'FCPO_CONFIG_GROUP_AMAZONPAY' => 'AmazonPay',
@@ -368,6 +369,53 @@
368369
'FCPO_CC_CUSTOM_TEMPLATE' => 'Custom styling hosted-Iframe',
369370
'FCPO_CC_PREVIEW' => 'Preview',
370371

372+
'FCPO_CCV2_CUSTOM_TEMPLATE' => 'Custom styling of Click to pay iFrame',
373+
'FCPO_CCV2_UI_CONFIG_UNDERTITLE' => 'UI Config',
374+
'FCPO_CCV2_CTP_UI_CONFIG_UNDERTITLE' => 'CTP UI Config',
375+
376+
'FCPO_CCV2_UI_CONFIG_formBgColor' => 'Form Background color',
377+
'FCPO_CCV2_UI_CONFIG_fieldBgColor' => 'Field Background color',
378+
'FCPO_CCV2_UI_CONFIG_fieldBorder' => 'Field Border',
379+
'FCPO_CCV2_UI_CONFIG_fieldOutline' => 'Field Outline',
380+
'FCPO_CCV2_UI_CONFIG_fieldLabelColor' => 'Field Label color',
381+
'FCPO_CCV2_UI_CONFIG_fieldPlaceholderColor' => 'Field Placeholder color',
382+
'FCPO_CCV2_UI_CONFIG_fieldTextColor' => 'Field Text color',
383+
'FCPO_CCV2_UI_CONFIG_fieldErrorCodeColor' => 'Field Errorcode color',
384+
385+
'FCPO_CCV2_CTP_UI_CONFIG_buttonStyle' => 'Button Style',
386+
'FCPO_CCV2_CTP_UI_CONFIG_buttonStyle_Outlined' => 'OUTLINED',
387+
'FCPO_CCV2_CTP_UI_CONFIG_buttonStyle_Filled' => 'FILLED',
388+
'FCPO_CCV2_CTP_UI_CONFIG_buttonTextCase' => 'Button Text case',
389+
'FCPO_CCV2_CTP_UI_CONFIG_buttonTextCase_Capitalize' => 'Capitalize',
390+
'FCPO_CCV2_CTP_UI_CONFIG_buttonTextCase_Uppercase' => 'UPPERCASE',
391+
'FCPO_CCV2_CTP_UI_CONFIG_buttonAndBadgeColor' => 'Button and Badge color',
392+
'FCPO_CCV2_CTP_UI_CONFIG_buttonAndBadgeTextColor' => 'Button and Badge Text color',
393+
'FCPO_CCV2_CTP_UI_CONFIG_buttonDisabledColor' => 'Button disabled color',
394+
'FCPO_CCV2_CTP_UI_CONFIG_buttonFilledHoverColor' => 'Button filled Hover color',
395+
'FCPO_CCV2_CTP_UI_CONFIG_buttonOutlinedHoverColor' => 'Button outline Hover color',
396+
'FCPO_CCV2_CTP_UI_CONFIG_buttonAndInputRadius' => 'Button and Input radius',
397+
'FCPO_CCV2_CTP_UI_CONFIG_cardItemActiveColor' => 'Card item active color',
398+
'FCPO_CCV2_CTP_UI_CONFIG_cardItemRadius' => 'Card item Radius',
399+
'FCPO_CCV2_CTP_UI_CONFIG_linkTextColor' => 'Link Text color',
400+
'FCPO_CCV2_CTP_UI_CONFIG_accentColor' => 'Accent color',
401+
'FCPO_CCV2_CTP_UI_CONFIG_fontFamily' => 'Font Family',
402+
403+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_buttonTextCase' => '"capitalize" or "uppercase"',
404+
'FCPO_HELP_CCV2_UI_CONFIG_formBgColor' => 'use hexadecimal, with #',
405+
'FCPO_HELP_CCV2_UI_CONFIG_fieldBgColor' => 'use hexadecimal, with #',
406+
'FCPO_HELP_CCV2_UI_CONFIG_fieldLabelColor' => 'use hexadecimal, with #',
407+
'FCPO_HELP_CCV2_UI_CONFIG_fieldPlaceholderColor' => 'use hexadecimal, with #',
408+
'FCPO_HELP_CCV2_UI_CONFIG_fieldTextColor' => 'use hexadecimal, with #',
409+
'FCPO_HELP_CCV2_UI_CONFIG_fieldErrorCodeColor' => 'use hexadecimal, with #',
410+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_buttonAndBadgeColor' => 'use hexadecimal, with #',
411+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_buttonAndBadgeTextColor' => 'use hexadecimal, with #',
412+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_buttonDisabledColor' => 'use hexadecimal, with #',
413+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_buttonFilledHoverColor' => 'use hexadecimal, with #',
414+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_buttonOutlinedHoverColor' => 'use hexadecimal, with #',
415+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_cardItemActiveColor' => 'use hexadecimal, with #',
416+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_linkTextColor' => 'use hexadecimal, with #',
417+
'FCPO_HELP_CCV2_CTP_UI_CONFIG_accentColor' => 'use hexadecimal, with #',
418+
371419
'FCPO_CREDITCARD' => 'Credit card:',
372420
'FCPO_NUMBER' => 'Number:',
373421
'FCPO_CARD_SECURITY_CODE' => 'CVV2 or CVC2 security code:',
@@ -401,6 +449,13 @@
401449
'FCPO_CC_IFRAME_STANDARD' => 'Standard',
402450
'FCPO_CC_IFRAME_CUSTOM' => 'Custom',
403451
'FCPO_CC_USE_CVC' => 'Use CVC as mandatory field',
452+
453+
'FCPO_CCV2_LIVE_MODE_ALERT' => 'Click to Pay works in LIVE mode only (set automatically)',
454+
'FCPO_CCV2_CTP_ENABLE' => 'Enable Click2Pay',
455+
'FCPO_CCV2_CTP_ONBOARDING_ENABLE' => 'Enable Click2Pay Customer Onboarding',
456+
'FCPO_CCV2_CTP_VISA_DPAID' => 'Visa DpaId',
457+
'FCPO_CCV2_CTP_MASTERCARD_DPAID' => 'Mastercard DpaId',
458+
404459
'FCPO_CONFIG_DEBIT_BIC_MANDATORY' => 'Entering BIC is mandatory',
405460
'FCPO_CONFIG_GROUP_SECINVOICE' => 'Secure Invoice (rec/POV)',
406461
'FCPO_CONFIG_GROUP_BNPL' => 'BNPL Zahlarten (fnc/PIV, fnc/PIN, fnc/PDD)',
@@ -484,6 +539,7 @@
484539
'PAYONE Klarna Rechnung' => 'PAYONE Klarna Rechnung',
485540
'PAYONE Klarna Sofort bezahlen' => 'PAYONE Klarna Sofort bezahlen',
486541
'PAYONE Kreditkarte' => 'PAYONE Credit Card',
542+
'PAYONE Kreditkarte (Click to Pay)' => 'PAYONE Credit Card (Click to Pay)',
487543
'PAYONE Lastschrift' => 'PAYONE Direct Debit',
488544
'PAYONE Nachnahme' => 'PAYONE Cash on Delivery',
489545
'PAYONE PayPal Express' => 'PAYONE PayPal Express',

0 commit comments

Comments
 (0)