Bläddra i källkod

Adding extra field terms_adresse to the list of fields that interact with TCC -refs BT#11068

Nicolas Ducoulombier 8 år sedan
förälder
incheckning
86117835c7
2 ändrade filer med 11 tillägg och 6 borttagningar
  1. 4 1
      main/auth/profile.php
  2. 7 5
      main/webservices/tcc.soap.php

+ 4 - 1
main/auth/profile.php

@@ -828,6 +828,9 @@ if ($form->validate()) {
         $cityData = $extraField->get_values_by_handler_and_field_variable(api_get_user_id(), 'terms_ville');
         $city = $cityData['value'];
 
+        $AddressData = $extraField->get_values_by_handler_and_field_variable(api_get_user_id(), 'terms_adresse');
+        $Adresse = $AddressData['value'];
+
         switch ($user_data['language']) {
             case 'french':
             case 'french2':
@@ -850,7 +853,7 @@ if ($form->validate()) {
             'DateNaissance' => $birthDate,
             'Langue' => $language,
             'Nationalite' => $citizenship,
-            'Adresse' => $user_data['address'],
+            'Adresse' => $Adresse,
             'CP' => $cp,
             'PaysResidence' => $country,
             'Ville' => $city,

+ 7 - 5
main/webservices/tcc.soap.php

@@ -209,7 +209,8 @@ function WSUpdateTCCUserIdAndGetUser($params)
                 'terms_ville',
                 'terms_paysresidence',
                 'terms_nationalite',
-                'terms_codepostal'
+                'terms_codepostal',
+                'terms_adresse'
             ];
 
             $extraFieldResults = [];
@@ -235,6 +236,7 @@ function WSUpdateTCCUserIdAndGetUser($params)
                     $language = 'fr-FR';
                     break;
                 case 'german':
+                case 'german2':
                     $language = 'de-DE';
                     break;
             }
@@ -247,7 +249,7 @@ function WSUpdateTCCUserIdAndGetUser($params)
                 'Langue' => $language,
                 'Nationalite' => $extraFieldResults['terms_nationalite'],
                 'Pays' => $extraFieldResults['terms_paysresidence'],
-                'Adresse' => $user->getAddress() ,
+                'Adresse' => $extraFieldResults['terms_adresse'],
                 'CodePostal' => $extraFieldResults['terms_codepostal'],
                 'Ville' => $extraFieldResults['terms_ville'],
                 'Email' => $user->getEmail(),
@@ -309,7 +311,7 @@ function WSEditUserTCC($params)
                     $params['Langue'] = 'french2';
                     break;
                 case 'de-DE':
-                    $params['Langue'] = 'german';
+                    $params['Langue'] = 'german2';
                     break;
             }
 
@@ -317,7 +319,6 @@ function WSEditUserTCC($params)
                 ->setFirstname($params['Prenom'])
                 ->setLastname($params['Nom'])
                 ->setLanguage($params['Langue'])
-                ->setAddress($params['Adresse'])
                 ->setEmail($params['Email'])
             ;
 
@@ -334,7 +335,8 @@ function WSEditUserTCC($params)
                 'terms_ville' => 'Ville',
                 'terms_paysresidence' => 'Pays',
                 'terms_nationalite' => 'Nationalite',
-                'terms_codepostal' => 'CodePostal'
+                'terms_codepostal' => 'CodePostal',
+                'terms_adresse' => 'Adresse'
             ];
 
             foreach ($fields as $extraFieldName => $externalName) {