Merge pull request #23464 from eileenmcnaughton/import_on_dup

[REF] [Import] Minor simplification
civicrm · May 17, 2022 · a4f37d9 · a4f37d9
2 parents 3408e34 + fa41c52
commit a4f37d9
Showing 1 changed file with 3 additions and 20 deletions.
diff --git a/CRM/Contact/Import/Parser/Contact.php b/CRM/Contact/Import/Parser/Contact.php
@@ -2339,8 +2339,6 @@ private function getParams(array $values): array {
       $relatedContactType = $this->getRelatedContactType($mappedField['relationship_type_id'], $mappedField['relationship_direction']);
       $relatedContactLocationTypeID = $relatedContactKey ? $mappedField['location_type_id'] : NULL;
       $relatedContactWebsiteTypeID = $relatedContactKey ? $mappedField['website_type_id'] : NULL;
-      $relatedContactIMProviderID = $relatedContactKey ? $mappedField['provider_id'] : NULL;
-      $relatedContactPhoneTypeID = $relatedContactKey ? $mappedField['phone_type_id'] : NULL;
 
       $locationFields = ['location_type_id', 'phone_type_id', 'provider_id', 'website_type_id'];
       $value = array_filter(array_intersect_key($mappedField, array_fill_keys($locationFields, 1)));
@@ -2375,27 +2373,12 @@ private function getParams(array $values): array {
           ) {
             $params[$relatedContactKey][$relatedContactFieldName] = [];
           }
-          $value = [
-            $relatedContactFieldName => $importedValue,
-            'location_type_id' => $relatedContactLocationTypeID,
-          ];
-
-          if (isset($relatedContactPhoneTypeID)) {
-            $value['phone_type_id'] = $relatedContactPhoneTypeID;
-          }
-
-          // get IM service Provider type id for related contact
-          if (isset($relatedContactIMProviderID)) {
-            $value['provider_id'] = $relatedContactIMProviderID;
-          }
-
+          $value[$relatedContactFieldName] = $importedValue;
           $params[$relatedContactKey][$relatedContactFieldName][] = $value;
         }
         elseif (isset($relatedContactWebsiteTypeID)) {
-          $params[$relatedContactKey][$relatedContactFieldName][] = [
-            'url' => $importedValue,
-            'website_type_id' => $relatedContactWebsiteTypeID,
-          ];
+          $value[$relatedContactFieldName] = $importedValue;
+          $params[$relatedContactKey][$relatedContactFieldName][] = $value;
         }
         elseif (empty($importedValue) && isset($relatedContactLocationTypeID)) {
           if (empty($params[$relatedContactKey][$relatedContactFieldName])) {