Merge pull request #316 from fatchip-Stefan/OX6-160_C2P_1.5

OX6-190: updated CTP to 1.5

Author: jvarelmann

application/helper/fcpopaymenthelper.php

@@ -147,24 +147,4 @@ public function fcpoGetCCV2CTPUIConfigFields()
             'fontFamily' => 'Font Family',
         );
     }
-
-    public function fcpoGetCCV2SchemeConfig()
-    {
-        $oHelper = $this->getMainHelper();
-        $oConfig = $oHelper->fcpoGetConfig();
-
-        return [
-            'merchantPresentationName' => "PayoneC2P-00004",
-            'visaConfig' => [
-                'srcInitiatorId' => '2662KBGOLX92KS4XIFYU213JLdGTvLhYkOB-_1gLo1D1jOqgM',
-                'srcDpaId' => $oConfig->getConfigParam('sFCPOCCV2VisaDpaId'),
-                'encryptionKey' => 'GQJIKLOAMZWIT8IRIGHR14vQUlllxiMWf-XSHQHvjI5wuTZ2w',
-                'nModulus' => "kPujwVJjevI_oeZwZoA2Wjt94DFcMvRCab8iRiEGrGfKWtNCwQYkylyuRoB615cYm2BVbvoKH8Yyv0aC3dwah6UmOdJszmL0pV_cbx_tXzWgYg3sYNsp0sBxUFcQ1A6DVbyOxxJbmnwlHGE5fkuzJr-qqul3RswsCG-vPrh_--2_RSipa9lVr9gvfI4AbFABLTqKeto0rWPbIBKdhcGQ7JMPxzq8239KPUZfSyNueAcdL-yHADi3L2VSzdF7tS7si3ue_IFoXDpbggsFxvEt79UlBDOBsagc_ms9_ZsYlJaKCT8ZjwhakMo_-Zdc97mudVj1jz2_L5l4l_zibF5riw",
-            ],
-            'mastercardConfig' => [
-                'srcInitiatorId' => '559003b0-5d17-4d89-aa2b-b02a4023d64d',
-                'srcDpaId' => $oConfig->getConfigParam('sFCPOCCV2MastercardDpaId'),
-            ]
-        ];
-    }
 }

application/views/admin/de/fcPayOne_lang.php

@@ -387,8 +387,6 @@
     'FCPO_CCV2_LIVE_MODE_ALERT'         => 'Click to Pay funktioniert nur im Live-Modus (automatische Einstellung)',
     'FCPO_CCV2_CTP_ENABLE'              => 'Click2Pay aktivieren',
     'FCPO_CCV2_CTP_ONBOARDING_ENABLE'   => 'Click2Pay Onboarding aktivieren',
-    'FCPO_CCV2_CTP_VISA_DPAID'          => 'Visa DpaId',
-    'FCPO_CCV2_CTP_MASTERCARD_DPAID'    => 'Mastercard DpaId',
 
     'FCPO_CONFIG_GROUP_PAYOLUTION'                     => 'Unzer',
     'FCPO_PAYOLUTION_B2BMODE'                          => 'Unzer im B2B-Modus betreiben',

application/views/admin/en/fcPayOne_lang.php

@@ -453,8 +453,6 @@
     'FCPO_CCV2_LIVE_MODE_ALERT'                        => 'Click to Pay works in LIVE mode only (set automatically)',
     'FCPO_CCV2_CTP_ENABLE'                             => 'Enable Click2Pay',
     'FCPO_CCV2_CTP_ONBOARDING_ENABLE'                  => 'Enable Click2Pay Customer Onboarding',
-    'FCPO_CCV2_CTP_VISA_DPAID'                         => 'Visa DpaId',
-    'FCPO_CCV2_CTP_MASTERCARD_DPAID'                   => 'Mastercard DpaId',
 
     'FCPO_CONFIG_DEBIT_BIC_MANDATORY'                  => 'Entering BIC is mandatory',
     'FCPO_CONFIG_GROUP_SECINVOICE'                     => 'Secure Invoice (rec/POV)',

application/views/admin/tpl/fcpayone_main.tpl

@@ -396,24 +396,6 @@
                 </dd>
                 <div class="spacer"></div>
             </dl>
-            <dl>
-                <dt>
-                    <input aria-label="Visa DpaId" type="text" class="txt" name="confstrs[sFCPOCCV2VisaDpaId]" value="[{$confstrs.sFCPOCCV2VisaDpaId}]" [{$readonly}]>
-                </dt>
-                <dd>
-                    [{oxmultilang ident="FCPO_CCV2_CTP_VISA_DPAID"}]
-                </dd>
-                <div class="spacer"></div>
-            </dl>
-            <dl>
-                <dt>
-                    <input aria-label="Mastercard DpaId" type="text" class="txt" name="confstrs[sFCPOCCV2MastercardDpaId]" value="[{$confstrs.sFCPOCCV2MastercardDpaId}]" [{$readonly}]>
-                </dt>
-                <dd>
-                    [{oxmultilang ident="FCPO_CCV2_CTP_MASTERCARD_DPAID"}]
-                </dd>
-                <div class="spacer"></div>
-            </dl>
             <dl>
                 <dt></dt>
                 <dd>

application/views/frontend/tpl/fcpo_payment_creditcardv2_script.tpl

@@ -1,4 +1,6 @@
-<script src="https://sdk.tokenization.secure.payone.com/1.3.0/hosted-tokenization-sdk.js" crossorigin="anonymous"></script>
+<script src="https://sdk.tokenization.secure.payone.com/1.5.0/hosted-tokenization-sdk.js" 
+        crossorigin="anonymous" 
+        integrity="sha384-qV/kvLA3YM9ZkCKfcliuCeR0PkqumnwfDNDF2FwkbZCQTMFJ5kzJc/7dH4E3rT0L"></script>
 
 <script type="text/javascript">
     let oHostedTokenizationConfig = JSON.parse('[{$oView->fcpoGetHostedTokenizationConfig()}]');

extend/application/controllers/fcPayOnePaymentView.php

@@ -3908,6 +3908,18 @@ public function fcpoBNPLShowFon($sPaymentID = '')
         );
     }
 
+    /**
+     * Template getter for email address
+     *
+     * @param  void
+     * @return bool
+     */
+    public function getEmail()
+    {
+        $oUser = $this->getUser();
+        return $oUser->oxuser__oxusername->value;
+    }
+
     /**
      * Template getter which checks if requesting birthdate is needed
      *
@@ -3988,7 +4000,6 @@ public function fcpoGetCTPConfig($sToken)
         $aConfig = [
             'enableCTP' => (bool) $this->getConfigParam('blFCPOCCV2CtpEnabled'),
             'enableCustomerOnboarding' => (bool)  $this->getConfigParam('blFCPOCCV2CtpOnboardingEnabled'),
-            'schemeConfig' => fcpopaymenthelper::getInstance()->fcpoGetCCV2SchemeConfig(),
             'transactionAmount' => [
                 'amount' => $this->getAmount(),
                 'currencyCode' => $this->fcpoGetCurrency(),
@@ -4022,6 +4033,7 @@ public function fcpoGetHostedTokenizationConfig()
             'uiConfig' => (object) $this->fcpoGetUIConfig(),
             'locale' => $sLocale,
             'token' => $sToken,
+            'email' => $this->getEmail(),
             'mode' => $oPayment->fcpoGetOperationMode(),
             'allowedCardSchemes' => [
                 "visa",