[{oxmultilang ident="FCPO_FORWARD_REDIRECTS"}]
diff --git a/core/fcpayone_events.php b/core/fcpayone_events.php
index ac928bc5..822dc551 100755
--- a/core/fcpayone_events.php
+++ b/core/fcpayone_events.php
@@ -47,7 +47,8 @@ class fcpayone_events
'fcpobillsafe',
'fcpoonlineueberweisung',
'fcpoklarna',
- 'fcpopaydirekt_express'
+ 'fcpopaydirekt_express',
+ 'fcpo_giropay'
);
/**
@@ -414,7 +415,7 @@ class fcpayone_events
'fcpoklarna_installments' => 'PAYONE Klarna Ratenkauf',
'fcpoklarna_directdebit' => 'PAYONE Klarna Sofort bezahlen',
'fcpobarzahlen' => 'PAYONE Barzahlen',
- 'fcpopaydirekt' => 'PAYONE paydirekt',
+ 'fcpopaydirekt' => 'PAYONE Giropay',
'fcpopo_bill' => 'PAYONE Unzer Rechnungskauf',
'fcpopo_debitnote' => 'PAYONE Unzer Lastschrift',
'fcpopo_installment' => 'PAYONE Unzer Ratenkauf',
@@ -422,7 +423,6 @@ class fcpayone_events
'fcpoamazonpay' => 'PAYONE Amazon Pay',
'fcpo_secinvoice' => 'PAYONE Gesicherter Rechnungskauf',
'fcpo_sofort' => 'PAYONE Sofort Überweisung',
- 'fcpo_giropay' => 'PAYONE Giropay',
'fcpo_eps' => 'PAYONE eps Überweisung',
'fcpo_pf_finance' => 'PAYONE PostFinance E-Finance',
'fcpo_pf_card' => 'PAYONE PostFinance Card',
@@ -1022,6 +1022,10 @@ public static function setDefaultConfigValues()
if (!$oConfig->getConfigParam('sFCPOAddresscheck')) {
$oConfig->saveShopConfVar('str', 'sFCPOAddresscheck', 'NO');
}
+
+ if (is_null($oConfig->getConfigParam('blFCPOPaydirektSecuredPreorder'))) {
+ $oConfig->saveShopConfVar('bool', 'blFCPOPaydirektSecuredPreorder', false);
+ }
}
/**
diff --git a/lib/fcporequest.php b/lib/fcporequest.php
index 33583d60..1b65ca41 100755
--- a/lib/fcporequest.php
+++ b/lib/fcporequest.php
@@ -321,7 +321,7 @@ protected function setAuthorizationParameters($oOrder, $oUser, $aDynvalue, $sRef
}
}
- $blPaymentTypeKnown = $this->setPaymentParameters($oOrder, $aDynvalue, $sRefNr);
+ $blPaymentTypeKnown = $this->setPaymentParameters($oOrder, $aDynvalue, $sRefNr, $blIsPreauthorization);
$blAddProductInfo = $oOrder->isDetailedProductInfoNeeded();
@@ -465,7 +465,7 @@ protected function _fcpoGetKlarnaFinancingType($sPaymentId)
*
* @return bool
*/
- protected function setPaymentParameters($oOrder, $aDynvalue, $sRefNr)
+ protected function setPaymentParameters($oOrder, $aDynvalue, $sRefNr, $blIsPreauthorization = false)
{
$blAddRedirectUrls = false;
$oConfig = $this->getConfig();
@@ -553,6 +553,14 @@ protected function setPaymentParameters($oOrder, $aDynvalue, $sRefNr)
$this->addParameter('add_paydata[over_capture]','yes');
}
}
+ $blIsSecuredPreorder = $blIsPreauthorization
+ && $oConfig->getConfigParam('blFCPOPaydirektSecuredPreorder');
+ if ($blIsSecuredPreorder) {
+ $iPaydirektGuaranteePeriod = (int) $oConfig->getConfigParam('sFCPOPaydirektSecuredPreorderGuaranteePeriod');
+ $this->addParameter('add_paydata[order_secured]', 'yes');
+ $this->addParameter('add_paydata[preauthorization_validity]', $iPaydirektGuaranteePeriod);
+ }
+
$blAddRedirectUrls = true;
break;
case 'fcpopo_bill':
diff --git a/out/src/js/fcpayone_main.js b/out/src/js/fcpayone_main.js
index 85dca1b9..ccadb828 100644
--- a/out/src/js/fcpayone_main.js
+++ b/out/src/js/fcpayone_main.js
@@ -69,4 +69,12 @@ function fcpoHandleCss(oSelect, sRowName) {
} else {
fcpoInputDisable('input_css_' + sRowName);
}
+}
+
+function fcpoTogglePaydirektGuaranteePeriod(oSelect, sFieldId) {
+ if (oSelect.options[oSelect.selectedIndex].value === 'true') {
+ document.getElementById(sFieldId).style.display = 'block';
+ } else {
+ document.getElementById(sFieldId).style.display = 'none';
+ }
}
\ No newline at end of file