diff --git a/application/controllers/admin/fcpayone_main.php b/application/controllers/admin/fcpayone_main.php index c25b796..e9d8ec5 100755 --- a/application/controllers/admin/fcpayone_main.php +++ b/application/controllers/admin/fcpayone_main.php @@ -1155,4 +1155,13 @@ private function writeFile($filename, $content, $destinationPath) } } + public function isPayPalV2DelAddressActive() + { + $aConfBools = $this->fcpoGetConfBools(); + $sConfigOptionName = "blFCPOPayPalV2DelAddress"; + if (!isset($aConfBools[$sConfigOptionName]) || $aConfBools[$sConfigOptionName] === true) { + return true; + } + return false; + } } diff --git a/application/views/admin/de/fcPayOne_lang.php b/application/views/admin/de/fcPayOne_lang.php index ba7eb16..d6368ff 100755 --- a/application/views/admin/de/fcPayOne_lang.php +++ b/application/views/admin/de/fcPayOne_lang.php @@ -270,7 +270,9 @@ 'FCPO_EXPORT_CONFIG' => "Konfiguration exportieren", 'FCPO_PAYPAL_DELADDRESS' => 'Rechnungsadresse bei fehlender Lieferadresse als Lieferadresse übergeben.', + 'FCPO_PAYPALV2_DELADDRESS' => 'Rechnungsadresse bei fehlender Lieferadresse als Lieferadresse übergeben.', 'FCPO_HELP_PAYPAL_DELADDRESS' => 'Wird für den PayPal Verkäuferschutz benötigt.', + 'FCPO_HELP_PAYPALV2_DELADDRESS' => 'Wird für den PayPal Verkäuferschutz benötigt.', 'FCPO_PAYPAL_LOGOS' => 'Hier können Sie die verwendeten PayPal Express Logos hinterlegen.', 'FCPO_PAYPAL_LOGOS_ACTIVE' => 'Aktiv', 'FCPO_PAYPAL_LOGOS_LANG' => 'Sprache', diff --git a/application/views/admin/en/fcPayOne_lang.php b/application/views/admin/en/fcPayOne_lang.php index 202dc8b..851fa69 100644 --- a/application/views/admin/en/fcPayOne_lang.php +++ b/application/views/admin/en/fcPayOne_lang.php @@ -335,7 +335,9 @@ 'FCPO_EXPORT_CONFIG' => "Export configuration", 'FCPO_PAYPAL_DELADDRESS' => 'Transmit the billing-address as delivery-address if delivery-address is missing.', + 'FCPO_PAYPALV2_DELADDRESS' => 'Transmit the billing-address as delivery-address if delivery-address is missing.', 'FCPO_HELP_PAYPAL_DELADDRESS' => 'This is used for the PayPal seller protection.', + 'FCPO_HELP_PAYPALV2_DELADDRESS' => 'This is used for the PayPal seller protection.', 'FCPO_PAYPAL_LOGOS' => 'You can upload the PayPal Express logos here.', 'FCPO_PAYPAL_LOGOS_ACTIVE' => 'active', 'FCPO_PAYPAL_LOGOS_LANG' => 'language', diff --git a/application/views/admin/tpl/fcpayone_main.tpl b/application/views/admin/tpl/fcpayone_main.tpl index 9f69023..256e29e 100755 --- a/application/views/admin/tpl/fcpayone_main.tpl +++ b/application/views/admin/tpl/fcpayone_main.tpl @@ -541,6 +541,17 @@