From 70636d884951ee74ca6aac50ad465a5653ae5188 Mon Sep 17 00:00:00 2001
From: Vincent Boulanger <vincent@mail.domain.tld>
Date: Mon, 10 Feb 2025 15:47:53 +0100
Subject: [PATCH] MAGE-544: Extend regex and error messages

---
 app/locale/de_DE/Payone_Core.csv | 2 +-
 app/locale/en_US/Payone_Core.csv | 2 +-
 js/payone/core/creditcard.js     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/locale/de_DE/Payone_Core.csv b/app/locale/de_DE/Payone_Core.csv
index f9cc6a06..7f7251ea 100644
--- a/app/locale/de_DE/Payone_Core.csv
+++ b/app/locale/de_DE/Payone_Core.csv
@@ -413,7 +413,7 @@
 "Credit Card Owner","Kreditkarteninhaber"
 "Expiration Date","Verfallsdatum"
 "Please fill in all required fields","Bitte f&uuml;llen Sie alle Pflichtfelder aus"
-CREDITCARD_INVALID_OWNER_ERROR_MESSAGE, "Der Name des Kreditkarteninhabers ist ungültig. [max 50 char. aus dem lateinischen Alphabet einschließlich Bindestrich / Leerzeichen / Umlaut | mindestens 1 Buchstabe]"
+CREDITCARD_INVALID_OWNER_ERROR_MESSAGE, "Der Name des Kreditkarteninhabers ist ungültig. [max 50 char. aus dem lateinischen/kyrillisch Alphabet einschließlich Bindestrich / Leerzeichen / Umlaut / Punkt | mindestens 1 Buchstabe]"
 
 "You have to be at least 18 years old to use this payment type!","Sie m&uuml;ssen mindestens 18 Jahre alt sein um diese Zahlart nutzen zu k&ouml;nnen!"
 
diff --git a/app/locale/en_US/Payone_Core.csv b/app/locale/en_US/Payone_Core.csv
index 50c3013c..0cd8fa0f 100644
--- a/app/locale/en_US/Payone_Core.csv
+++ b/app/locale/en_US/Payone_Core.csv
@@ -77,7 +77,7 @@
 
 RATEPAY_TNC,"With clicking on 'Submit order' you agree to the <a target='_blank' href='https://www.ratepay.com/en/ratepay-terms-of-payment/'>terms of payment of our payment partner</a><br /> as well as to the performance of a <a target='_blank' href='https://www.ratepay.com/en/ratepay-data-privacy-statement/'>risk check by our payment partner</a>."
 
-CREDITCARD_INVALID_OWNER_ERROR_MESSAGE, "Credit card owner name is invalid. [max 50 char. from latin alphabet including dash/space/umlaut | at least 1 letter]"
+CREDITCARD_INVALID_OWNER_ERROR_MESSAGE, "Credit card owner name is invalid. [max 50 char. from latin/cyrillic alphabet including dash/space/umlaut/dot | at least 1 letter]"
 
 "RATEPAY_TEXT_LOGO", "ratepay_logo_instalments_whitelabel_en_black.png"
 
diff --git a/js/payone/core/creditcard.js b/js/payone/core/creditcard.js
index 7f4411da..e52bf983 100644
--- a/js/payone/core/creditcard.js
+++ b/js/payone/core/creditcard.js
@@ -412,7 +412,7 @@ PAYONE.Validation.CreditCard = function (config, translatedErrorMessages) {
 
         // MAGE-508: Re-introduce CC owner field
         if ('' === this.translatedErrorMessages.ccOwnerErrorMessage || 'undefined' === typeof this.translatedErrorMessages.ccOwnerErrorMessage) {
-            this.translatedErrorMessages.ccOwnerErrorMessage = 'Credit card owner name is invalid. [max 50 char. from latin alphabet including dash/space/umlaut | at least 1 letter]';
+            this.translatedErrorMessages.ccOwnerErrorMessage = 'Credit card owner name is invalid. [max 50 char. from latin/cyrillic alphabet including dash/space/umlaut/dot | at least 1 letter]';
         }
         Validation.add(
             'validate-payone-cc-owner',
@@ -494,7 +494,7 @@ PAYONE.Validation.CreditCard = function (config, translatedErrorMessages) {
      */
     this.validateOwner = function (v, elm) {
         var ownerName = elm.value;
-        var regex = new RegExp("^[a-zA-Z äëïöüÄËÏÖÜß\-]*[a-zA-ZäëïöüÄËÏÖÜß][a-zA-Z äëïöüÄËÏÖÜß\-]*$");
+        var regex = new RegExp("^[a-zA-Z äëïöüÄËÏÖÜß\u0400-\u052f\-.]*[a-zA-ZäëïöüÄËÏÖÜß\u0400-\u052f][a-zA-Z äëïöüÄËÏÖÜß\u0400-\u052f\-.]*$");
         return regex.test(ownerName)
             && (ownerName.length > 0)
             && (ownerName.length <= 50);