Skip to content

Commit 4a493f3

Browse files
authored
Merge pull request #316 from fatchip-Stefan/OX6-160_C2P_1.5
OX6-190: updated CTP to 1.5
2 parents 421f228 + da871d3 commit 4a493f3

6 files changed

Lines changed: 16 additions & 44 deletions

File tree

application/helper/fcpopaymenthelper.php

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -147,24 +147,4 @@ public function fcpoGetCCV2CTPUIConfigFields()
147147
'fontFamily' => 'Font Family',
148148
);
149149
}
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-
}
170150
}

application/views/admin/de/fcPayOne_lang.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,6 @@
387387
'FCPO_CCV2_LIVE_MODE_ALERT' => 'Click to Pay funktioniert nur im Live-Modus (automatische Einstellung)',
388388
'FCPO_CCV2_CTP_ENABLE' => 'Click2Pay aktivieren',
389389
'FCPO_CCV2_CTP_ONBOARDING_ENABLE' => 'Click2Pay Onboarding aktivieren',
390-
'FCPO_CCV2_CTP_VISA_DPAID' => 'Visa DpaId',
391-
'FCPO_CCV2_CTP_MASTERCARD_DPAID' => 'Mastercard DpaId',
392390

393391
'FCPO_CONFIG_GROUP_PAYOLUTION' => 'Unzer',
394392
'FCPO_PAYOLUTION_B2BMODE' => 'Unzer im B2B-Modus betreiben',

application/views/admin/en/fcPayOne_lang.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,6 @@
453453
'FCPO_CCV2_LIVE_MODE_ALERT' => 'Click to Pay works in LIVE mode only (set automatically)',
454454
'FCPO_CCV2_CTP_ENABLE' => 'Enable Click2Pay',
455455
'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',
458456

459457
'FCPO_CONFIG_DEBIT_BIC_MANDATORY' => 'Entering BIC is mandatory',
460458
'FCPO_CONFIG_GROUP_SECINVOICE' => 'Secure Invoice (rec/POV)',

application/views/admin/tpl/fcpayone_main.tpl

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -396,24 +396,6 @@
396396
</dd>
397397
<div class="spacer"></div>
398398
</dl>
399-
<dl>
400-
<dt>
401-
<input aria-label="Visa DpaId" type="text" class="txt" name="confstrs[sFCPOCCV2VisaDpaId]" value="[{$confstrs.sFCPOCCV2VisaDpaId}]" [{$readonly}]>
402-
</dt>
403-
<dd>
404-
[{oxmultilang ident="FCPO_CCV2_CTP_VISA_DPAID"}]
405-
</dd>
406-
<div class="spacer"></div>
407-
</dl>
408-
<dl>
409-
<dt>
410-
<input aria-label="Mastercard DpaId" type="text" class="txt" name="confstrs[sFCPOCCV2MastercardDpaId]" value="[{$confstrs.sFCPOCCV2MastercardDpaId}]" [{$readonly}]>
411-
</dt>
412-
<dd>
413-
[{oxmultilang ident="FCPO_CCV2_CTP_MASTERCARD_DPAID"}]
414-
</dd>
415-
<div class="spacer"></div>
416-
</dl>
417399
<dl>
418400
<dt></dt>
419401
<dd>

application/views/frontend/tpl/fcpo_payment_creditcardv2_script.tpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<script src="https://sdk.tokenization.secure.payone.com/1.3.0/hosted-tokenization-sdk.js" crossorigin="anonymous"></script>
1+
<script src="https://sdk.tokenization.secure.payone.com/1.5.0/hosted-tokenization-sdk.js"
2+
crossorigin="anonymous"
3+
integrity="sha384-qV/kvLA3YM9ZkCKfcliuCeR0PkqumnwfDNDF2FwkbZCQTMFJ5kzJc/7dH4E3rT0L"></script>
24

35
<script type="text/javascript">
46
let oHostedTokenizationConfig = JSON.parse('[{$oView->fcpoGetHostedTokenizationConfig()}]');

extend/application/controllers/fcPayOnePaymentView.php

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3908,6 +3908,18 @@ public function fcpoBNPLShowFon($sPaymentID = '')
39083908
);
39093909
}
39103910

3911+
/**
3912+
* Template getter for email address
3913+
*
3914+
* @param void
3915+
* @return bool
3916+
*/
3917+
public function getEmail()
3918+
{
3919+
$oUser = $this->getUser();
3920+
return $oUser->oxuser__oxusername->value;
3921+
}
3922+
39113923
/**
39123924
* Template getter which checks if requesting birthdate is needed
39133925
*
@@ -3988,7 +4000,6 @@ public function fcpoGetCTPConfig($sToken)
39884000
$aConfig = [
39894001
'enableCTP' => (bool) $this->getConfigParam('blFCPOCCV2CtpEnabled'),
39904002
'enableCustomerOnboarding' => (bool) $this->getConfigParam('blFCPOCCV2CtpOnboardingEnabled'),
3991-
'schemeConfig' => fcpopaymenthelper::getInstance()->fcpoGetCCV2SchemeConfig(),
39924003
'transactionAmount' => [
39934004
'amount' => $this->getAmount(),
39944005
'currencyCode' => $this->fcpoGetCurrency(),
@@ -4022,6 +4033,7 @@ public function fcpoGetHostedTokenizationConfig()
40224033
'uiConfig' => (object) $this->fcpoGetUIConfig(),
40234034
'locale' => $sLocale,
40244035
'token' => $sToken,
4036+
'email' => $this->getEmail(),
40254037
'mode' => $oPayment->fcpoGetOperationMode(),
40264038
'allowedCardSchemes' => [
40274039
"visa",

0 commit comments

Comments
 (0)