OX6-47: Added reference type change to be compatible with alphanumeric prefix

Author: andrefatchip

application/controllers/admin/fcpayone_main.php

@@ -411,19 +411,7 @@ protected function _fcpoValidateData()
      */
     protected function _fcpoValidateAccountData()
     {
-        $aConfStrs = $this->_oFcpoHelper->fcpoGetRequestParameter("confstrs");
-
-        $blValidPrefix = is_numeric($aConfStrs['sFCPORefPrefix']);
-
-        if (!$blValidPrefix) {
-            $this->_fcpoAddConfigError('FCPO_CONFERROR_PREFIX_NUMERIC');
-        }
-
-        $blValid = (
-            $blValidPrefix
-        );
-
-        return $blValid;
+        return true;
     }
 
     /**

application/views/admin/de/fcPayOne_lang.php

@@ -483,7 +483,6 @@
     'FCPO_EMAIL_IBAN'                               => 'IBAN:',
     'FCPO_EMAIL_CLEARING_BODY_THANKYOU'             => 'Vielen Dank, dein %SHOPNAME%-Team',
     'FCPO_EMAIL_USAGE'                              => 'Verwendungszweck',
-    'FCPO_CONFERROR_PREFIX_NUMERIC'                 => 'Der optionale Referenznummernpräfix muss numerisch sein.',
 );
 
 /*

application/views/admin/en/fcPayOne_lang.php

@@ -492,8 +492,6 @@
 'FCPO_EMAIL_IBAN'                               => 'IBAN:',
 'FCPO_EMAIL_CLEARING_BODY_THANKYOU'             => 'Thank you, your %SHOPNAME%-Team',
 'FCPO_EMAIL_USAGE'                              => 'Usage',
-'FCPO_CONFERROR_PREFIX_NUMERIC'                 => 'The optional reference prefix must be numeric.',
-
 );
 
 /*

core/fcpayone_events.php

@@ -550,7 +550,7 @@ public static function addDatabaseStructure()
 
         self::changeColumnTypeIfWrong('fcpotransactionstatus', 'FCPO_USERID', 'varchar(32)', self::$sQueryChangeToVarchar1);
         self::changeColumnTypeIfWrong('fcpotransactionstatus', 'FCPO_TXID', 'varchar(32)', self::$sQueryChangeToVarchar2);
-        self::changeColumnTypeIfWrong('fcporequestlog', 'FCPO_REFNR', 'varchar(32)', self::$sQueryChangeFcporequestlog);
+        self::changeColumnTypeIfWrong('fcporequestlog', 'FCPO_REFNR', 'int(11)', self::$sQueryChangeFcporequestlog);
         self::changeColumnTypeIfWrong('oxorder', 'FCPOREFNR', 'varchar(32)', self::$sQueryChangeRefNrToVarchar);
 
         self::dropIndexIfExists('fcporefnr', 'FCPO_REFNR');
@@ -642,9 +642,14 @@ public static function insertRowIfNotExists($sTableName, $aKeyValue, $sQuery)
      */
     public static function changeColumnTypeIfWrong($sTableName, $sColumnName, $sExpectedType, $sQuery)
     {
-        if (oxDb::getDb()->getOne("SHOW COLUMNS FROM {$sTableName} WHERE FIELD = '{$sColumnName}' AND TYPE = '{$sExpectedType}'")) {
+        $sCheckQuery = "
+            SHOW COLUMNS 
+            FROM {$sTableName} 
+            WHERE FIELD = '{$sColumnName}' 
+            AND TYPE = '{$sExpectedType}'
+        ";
+        if (oxDb::getDb()->getOne($sCheckQuery)) {
             oxDb::getDb()->Execute($sQuery);
-            // echo 'In Tabelle '.$sTableName.' Spalte '.$sColumnName.' auf Typ '.$sExpectedType.' umgestellt.<br>';
             return true;
         }
         return false;