Merge pull request #206 from BoulangerV/OX6-91-Rebranding_RatePay_int…

…o_Ratepay OX6-91 : Rebranding RatePay into Ratepay
PAYONE-GmbH · Mar 10, 2021 · 117a89e · 117a89e
2 parents 3608f5a + 9b35866
commit 117a89e
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 27 deletions.
diff --git a/application/controllers/admin/fcpayone_main.php b/application/controllers/admin/fcpayone_main.php
@@ -501,7 +501,7 @@ protected function _fcpoInsertStoreIds()
     }
 
     /**
-     * Insert RatePay profile
+     * Insert Ratepay profile
      * 
      * @param  void
      *  @return void
@@ -531,7 +531,7 @@ protected function _fcpoCheckAndAddStoreId()
     }
 
     /**
-     * Check and add a new RatePay Profile
+     * Check and add a new Ratepay Profile
      * 
      * @param  void
      * @return void

diff --git a/application/models/fcporatepay.php b/application/models/fcporatepay.php
@@ -45,7 +45,7 @@ public function __construct()
     }
 
     /**
-     * Add/Update RatePay profile
+     * Add/Update Ratepay profile
      *
      * @param string $sOxid
      * @param array  $aRatePayData
@@ -70,7 +70,7 @@ public function fcpoInsertProfile($sOxid, $aRatePayData)
     }
 
     /**
-     * Returns an array with RatePay profiles
+     * Returns an array with Ratepay profiles
      * 
      * @param  string $sPaymentId (optional)
      * @return array
@@ -98,7 +98,7 @@ public function fcpoGetRatePayProfiles($sPaymentId = null)
 
 
     /**
-     * Add RatePay shop
+     * Add Ratepay shop
      * 
      * @param  void
      * @return void

diff --git a/application/translations/de/fcPayOne_lang.php b/application/translations/de/fcPayOne_lang.php
@@ -197,12 +197,12 @@
     'FCPO_CC_HOSTED_ERROR_CARDTYPE'                       => 'Bitte wählen Sie einen Kartentyp',
     'FCPO_CC_HOSTED_ERROR_CVC'                            => 'Bitte CVC-Eingabe überprüfen',
     'FCPO_CC_HOSTED_ERROR_INCOMPLETE'                     => 'Eingaben unvollständig',
-    'FCPO_RATEPAY_AGREE'                                  => '<p>Im Rahmen des Bestellvorgangs übermitteln wir Ihre Daten zum Zwecke der Identitäts- und Bonitätsprüfung sowie der Vertragsabwicklung an RATEPAY. Es gelten die <a href="//ratepay.com/legal" title="Legal - RatePAY" target="_blank">zusätzlichen AGB für RATEPAY-Zahlungsarten und die Datenschutzhinweise der RatePAY GmbH</a> für SEPA-Lastschrift.</p>',
+    'FCPO_RATEPAY_AGREE'                                  => '<p>Im Rahmen des Bestellvorgangs übermitteln wir Ihre Daten zum Zwecke der Identitäts- und Bonitätsprüfung sowie der Vertragsabwicklung an RATEPAY. Es gelten die <a href="//ratepay.com/legal" title="Legal - Ratepay" target="_blank">zusätzlichen AGB für RATEPAY-Zahlungsarten und die Datenschutzhinweise der Ratepay GmbH</a> für SEPA-Lastschrift.</p>',
     'FCPO_RATEPAY_NOT_AGREED'                             => 'Sie haben die Einwilligung zur Übertragung der erforderlichen Daten an Ratepay nicht bestätigt.',
     'FCPO_RATEPAY_SEPA_NOT_AGREED'                        => 'Sie haben das SEPA Lastschriftmandat noch nicht erteilt.',
-    'FCPO_RATEPAY_SEPA_AGREE'                             => '<p>Ich ermächtige die RatePAY GmbH, Zahlungen von meinem Konto mittels Lastschrift einzuziehen. Zugleich weise ich mein	Kreditinstitut an, die von der RatePAY GmbH auf mein Konto gezogenen Lastschriften einzulösen.</p><p>Hinweis: Ich kann innerhalb von acht Wochen, beginnend mit dem	Belastungsdatum, die Erstattung des belasteten Betrages verlangen. Es gelten dabei die mit meinem Kreditinstitut vereinbarten Bedingungen.</p>',
+    'FCPO_RATEPAY_SEPA_AGREE'                             => '<p>Ich ermächtige die Ratepay GmbH, Zahlungen von meinem Konto mittels Lastschrift einzuziehen. Zugleich weise ich mein	Kreditinstitut an, die von der Ratepay GmbH auf mein Konto gezogenen Lastschriften einzulösen.</p><p>Hinweis: Ich kann innerhalb von acht Wochen, beginnend mit dem	Belastungsdatum, die Erstattung des belasteten Betrages verlangen. Es gelten dabei die mit meinem Kreditinstitut vereinbarten Bedingungen.</p>',
     'FCPO_RATEPAY_ACCOUNTHOLDER'                          => 'Kontoinhaber',
-    'FCPO_RATEPAY_MANDATE_IDENTIFICATION'                 => '<p>RatePAY GmbH, Franklinstraße 28-29, D-10587 Berlin<br> Gläubiger-ID: DE39RPY00000568463<br> Mandatsreferenz: WIRD SEPARAT MITGETEILT</p>',
+    'FCPO_RATEPAY_MANDATE_IDENTIFICATION'                 => '<p>Ratepay GmbH, Franklinstraße 28-29, D-10587 Berlin<br> Gläubiger-ID: DE39RPY00000568463<br> Mandatsreferenz: WIRD SEPARAT MITGETEILT</p>',
     'FCPO_EMAIL_CLEARING_SUBJECT'                         => 'Ihre Überweisungsdaten zur Bestellnummer',
     'FCPO_EMAIL_CLEARING_BODY_WELCOME'                    => "Hallo %NAME% %SURNAME%,\nzur Begleichung der Rechnung verwenden Sie bitte folgende Daten zur Überweisung:\n\n",
     'FCPO_EMAIL_CLEARING_BODY_THANKYOU'                   => 'Vielen Dank, dein %SHOPNAME%-Team',

diff --git a/application/translations/en/fcPayOne_lang.php b/application/translations/en/fcPayOne_lang.php
@@ -201,12 +201,12 @@
 'FCPO_SECINVOICE_NO_COMPANY'                    => 'Not a company? Click <a href="index.php?cl=account_user" style="color:green;">here</a> for changing your address.',
 'FCPO_NOT_ADULT'                                => 'Due to your age you are not allowed to use this payment. Please select another payment method',
 'FCPO_BIRTHDATE_INVALID'                        => 'Your birthdate has been entered incorrect.',
-'FCPO_RATEPAY_AGREE'                            => '<p>Within the order process, we will be sending your data to RatePAY GmbH for the purpose of verifying your identity and creditworthiness as well as the performance of the contract. The <a href="//ratepay.com/legal/" title="Legal - RatePAY" target="_blank">Additional Terms and Conditions and Data Protection Notice of RatePAY GmbH</a> apply.</p>',
-'FCPO_RATEPAY_NOT_AGREED'                       => 'You did not agree to send your data to RatePAY.',
-'FCPO_RATEPAY_SEPA_NOT_AGREED'                  => 'You did not authorized RatePAY to collect payments from your account.',
-'FCPO_RATEPAY_SEPA_AGREE'                       => '<p>I hereby authorise RatePAY GmbH to collect payments from my account by direct debit. At the same time, I authorise my bank to debit my account in accordance with the instructions from RatePAY GmbH.</p><p>Note: As part of my rights, I am entitled to a refund from my ibank under the terms and conditions of my agreement with my bank.	A refund must be claimed within 8 weeks starting from the date on which my account was debited. My rights are explained in a statement that I can obtain from my bank.</p>',
+'FCPO_RATEPAY_AGREE'                            => '<p>Within the order process, we will be sending your data to Ratepay GmbH for the purpose of verifying your identity and creditworthiness as well as the performance of the contract. The <a href="//ratepay.com/legal/" title="Legal - Ratepay" target="_blank">Additional Terms and Conditions and Data Protection Notice of Ratepay GmbH</a> apply.</p>',
+'FCPO_RATEPAY_NOT_AGREED'                       => 'You did not agree to send your data to Ratepay.',
+'FCPO_RATEPAY_SEPA_NOT_AGREED'                  => 'You did not authorized Ratepay to collect payments from your account.',
+'FCPO_RATEPAY_SEPA_AGREE'                       => '<p>I hereby authorise Ratepay GmbH to collect payments from my account by direct debit. At the same time, I authorise my bank to debit my account in accordance with the instructions from Ratepay GmbH.</p><p>Note: As part of my rights, I am entitled to a refund from my ibank under the terms and conditions of my agreement with my bank.	A refund must be claimed within 8 weeks starting from the date on which my account was debited. My rights are explained in a statement that I can obtain from my bank.</p>',
 'FCPO_RATEPAY_ACCOUNTHOLDER'                    => 'Accountholder',
-'FCPO_RATEPAY_MANDATE_IDENTIFICATION'           => '<p>RatePAY GmbH, Franklinstraße 28-29, D-10587 Berlin, Germany<br> Creditor ID: DE39RPY00000568463<br> Mandate Reference: WILL BE COMMUNICATED SEPARATELY</p>',
+'FCPO_RATEPAY_MANDATE_IDENTIFICATION'           => '<p>Ratepay GmbH, Franklinstraße 28-29, D-10587 Berlin, Germany<br> Creditor ID: DE39RPY00000568463<br> Mandate Reference: WILL BE COMMUNICATED SEPARATELY</p>',
 'FCPO_CC_HOSTED_ERROR_CARDTYPE'                 => 'Please select a cardtype',
 'FCPO_CC_HOSTED_ERROR_CVC'                      => 'Please check CVC',
 'FCPO_CC_HOSTED_ERROR_INCOMPLETE'               => 'Input incomplete',

diff --git a/application/views/admin/de/fcPayOne_lang.php b/application/views/admin/de/fcPayOne_lang.php
@@ -400,16 +400,16 @@
     'FCPO_CONFIG_DEBIT_BIC_MANDATORY'                  => 'BIC abfragen',
     'fcpo_admin_config_error_iframe_mapping'           => 'Eigene Fehlermeldungen für Hosted iFrame',
     'fcpo_admin_config_payone_error_code'              => 'Fehlerkennung',
-    'FCPO_CONFIG_GROUP_RATEPAY'                        => 'RatePay',
-    'FCPO_PROFILES_RATEPAY'                            => 'RatePay Profile',
+    'FCPO_CONFIG_GROUP_RATEPAY'                        => 'Ratepay',
+    'FCPO_PROFILES_RATEPAY'                            => 'Ratepay Profile',
     'FCPO_RATEPAY_DELETE_PROFILE'                      => 'Profil löschen',
     'FCPO_RATEPAY_ADD_PROFILE'                         => 'Profil hinzufügen',
     'FCPO_PROFILES_RATEPAY_CURRENCY'                   => 'Währung',
-    'FCPO_PROFILES_RATEPAY_PAYMENT'                    => 'RatePay Zahlungsmethode',
+    'FCPO_PROFILES_RATEPAY_PAYMENT'                    => 'Ratepay Zahlungsmethode',
     'FCPO_RATEPAY_PROFILE_TOGGLE_DETAILS'              => 'Konfigurationsdetails dieses Profils ein-/ausblenden',
     'FCPO_RATEPAY_PROFILE_DETAILS_FOR_ID'              => 'Profilkonfiguration für ShopID',
-    'FCPO_RATEPAY_GENERAL_SETTINGS'                    => 'RatePay Einstellungen',
-    'FCPO_RATEPAY_B2BMODE'                             => 'RatePay im B2B-Modus betreiben',
+    'FCPO_RATEPAY_GENERAL_SETTINGS'                    => 'Ratepay Einstellungen',
+    'FCPO_RATEPAY_B2BMODE'                             => 'Ratepay im B2B-Modus betreiben',
     'FCPO_HELP_RATEPAY_B2BMODE'                        => 'Bei aktiviertem B2B Modus und vom Benutzer angegebenem Firmennamen wird die USt-IdNr. abgefragt. Bei B2C Kunden wird stattdessen das Geburtsdatum abgefragt.',
     'FCPO_MALUSHANDLING'                               => 'Personstatus Abzug Handling',
     'FCPO_PERSONSTATUS'                                => 'Personstatus',

diff --git a/application/views/admin/en/fcPayOne_lang.php b/application/views/admin/en/fcPayOne_lang.php
@@ -301,15 +301,15 @@
     'FCPO_AMAZONPAY_LOGINMODE_POPUP'            => 'Popup (requires SSL)',
     'FCPO_AMAZONPAY_LOGINMODE_REDIRECT'         => 'Redirect',
 
-    'FCPO_PROFILES_RATEPAY'               => 'RatePay Profile',
+    'FCPO_PROFILES_RATEPAY'               => 'Ratepay Profile',
     'FCPO_RATEPAY_DELETE_PROFILE'         => 'Delete profile',
     'FCPO_RATEPAY_ADD_PROFILE'            => 'Add profile',
     'FCPO_PROFILES_RATEPAY_CURRENCY'      => 'Currency',
-    'FCPO_PROFILES_RATEPAY_PAYMENT'       => 'RatePay Payment method',
+    'FCPO_PROFILES_RATEPAY_PAYMENT'       => 'Ratepay Payment method',
     'FCPO_RATEPAY_PROFILE_TOGGLE_DETAILS' => 'Toggle configuration details',
     'FCPO_RATEPAY_PROFILE_DETAILS_FOR_ID' => 'Profile configuration for ShopID',
-    'FCPO_RATEPAY_GENERAL_SETTINGS'       => 'RatePay Settings',
-    'FCPO_RATEPAY_B2BMODE'                => 'Enable RatePay B2B-Mode',
+    'FCPO_RATEPAY_GENERAL_SETTINGS'       => 'Ratepay Settings',
+    'FCPO_RATEPAY_B2BMODE'                => 'Enable Ratepay B2B-Mode',
     'FCPO_HELP_RATEPAY_B2BMODE'           => 'If B2B-Mode is enabled Vat-Id and company name will be requested, birthday for B2C customers',
 
     'FCPO_PAYOLUTION_B2BMODE'          => 'Activate Payolution B2B-Mode',

diff --git a/application/views/admin/tpl/fcpayone_main.tpl b/application/views/admin/tpl/fcpayone_main.tpl
@@ -753,8 +753,8 @@
                         </select>&nbsp;
                         [{oxmultilang ident="FCPO_PROFILES_RATEPAY_PAYMENT"}]: 
                         <select class="edittext" name="aRatepayProfiles[[{$sOxid}]][paymentid]">
-                            <option value="fcporp_bill" [{if $aRatePayProfile.OXPAYMENTID == 'fcporp_bill'}]selected[{/if}]>RatePay Rechnung</option>
-                            <option value="fcporp_debitnote" [{if $aRatePayProfile.OXPAYMENTID == 'fcporp_debitnote'}]selected[{/if}]>RatePay Lastschrift</option>
+                            <option value="fcporp_bill" [{if $aRatePayProfile.OXPAYMENTID == 'fcporp_bill'}]selected[{/if}]>Ratepay Rechnung</option>
+                            <option value="fcporp_debitnote" [{if $aRatePayProfile.OXPAYMENTID == 'fcporp_debitnote'}]selected[{/if}]>Ratepay Lastschrift</option>
                         </select>
                         <input type="submit" class="edittext" name="aRatepayProfiles[[{$sOxid}]][delete]" value="[{oxmultilang ident="FCPO_RATEPAY_DELETE_PROFILE"}]" onClick="Javascript:document.myedit.fnc.value='save'" [{$readonly}]><br>
                         [{if $aRatePayProfile.merchant_name != ''}]

diff --git a/extend/application/controllers/fcPayOnePaymentView.php b/extend/application/controllers/fcPayOnePaymentView.php
@@ -1130,7 +1130,7 @@ protected function _fcpoGetRatePayStringAdditionByPaymentId($sPaymentId)
     }
 
     /**
-     * Returns all profiles for given RatePay payment type
+     * Returns all profiles for given Ratepay payment type
      * 
      * @param  string $sPaymentId
      * @return array

diff --git a/lib/fcporequest.php b/lib/fcporequest.php
@@ -128,7 +128,7 @@ class fcpoRequest extends oxSuperCfg
     protected $_sApiVersion = '3.10';
 
     /**
-     * List of RatePay related payment Ids
+     * List of Ratepay related payment Ids
      *
      * @var array
      */
@@ -2443,7 +2443,7 @@ protected function _fcpoSetSecurePayPortal($oOrder)
     }
 
     /**
-     * Adds RatePay specific parameters
+     * Adds Ratepay specific parameters
      *
      * @param  object $oOrder
      * @return void