From 006f8d5bd8867319dc7a249d744acb7274bb50fc Mon Sep 17 00:00:00 2001
From: Ruben <r.pineda@ixiam.com>
Date: Fri, 23 Jul 2021 13:15:58 +0200
Subject: [PATCH] Import csv-Fix not importing extension in phones

---
 CRM/Contact/Import/Form/MapField.php | 8 +++++---
 CRM/Contact/Import/ImportJob.php     | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php
index ac0a0d65ab..368e221f6b 100644
--- a/CRM/Contact/Import/Form/MapField.php
+++ b/CRM/Contact/Import/Form/MapField.php
@@ -214,6 +214,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
 
     foreach ($this->_location_types as $key => $value) {
       $sel3['phone'][$key] = &$phoneTypes;
+      $sel3['phone_ext'][$key] = &$phoneTypes;
       //build array for IM service provider type for contact
       $sel3['im'][$key] = &$imProviders;
     }
@@ -322,6 +323,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
 
         foreach ($this->_location_types as $k => $value) {
           $sel4[$key]['phone'][$k] = &$phoneTypes;
+          $sel4[$key]['phone_ext'][$k] = &$phoneTypes;
           //build array of IM service provider for related contact
           $sel4[$key]['im'][$k] = &$imProviders;
         }
@@ -546,7 +548,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
           $locations[$i] = $locationTypes[$selOne];
           $parserParameters['mapperLocType'][$i] = $selOne;
           if ($selTwo && is_numeric($selTwo)) {
-            if ($fldName === 'phone') {
+            if ($fldName === 'phone' || $fldName === 'phone') {
               $parserParameters['mapperPhoneType'][$i] = $phoneTypes[$selTwo];
             }
             elseif ($fldName === 'im') {
@@ -569,7 +571,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
           else {
             $parserParameters['relatedContactLocType'][$i] = $locationTypes[$selTwo] ?? NULL;
             if ($selThree) {
-              if ($selOne === 'phone') {
+              if ($selOne === 'phone' || $selOne === 'phone_ext') {
                 $parserParameters['relatedContactPhoneType'][$i] = $phoneTypes[$selThree];
               }
               elseif ($selOne === 'im') {
@@ -776,7 +778,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
         $saveMappingFields->website_type_id = $mapperKeys[$i][1] ?? NULL;
       }
       else {
-        if (CRM_Utils_Array::value('0', $mapperKeys[$i]) == 'phone') {
+        if (CRM_Utils_Array::value('0', $mapperKeys[$i]) == 'phone' || CRM_Utils_Array::value('0', $mapperKeys[$i]) == 'phone_ext') {
           $saveMappingFields->phone_type_id = $mapperKeys[$i][2] ?? NULL;
         }
         elseif (CRM_Utils_Array::value('0', $mapperKeys[$i]) == 'im') {
diff --git a/CRM/Contact/Import/ImportJob.php b/CRM/Contact/Import/ImportJob.php
index 75d570e637..249bedc76a 100644
--- a/CRM/Contact/Import/ImportJob.php
+++ b/CRM/Contact/Import/ImportJob.php
@@ -149,7 +149,7 @@ class CRM_Contact_Import_ImportJob {
           $header[] = $locationTypes[$selOne];
           $parserParameters['mapperLocType'][$key] = $selOne;
           if ($selTwo && is_numeric($selTwo)) {
-            if ($fldName === 'phone') {
+            if ($fldName === 'phone' || $fldName === 'phone_ext') {
               $header[] = $phoneTypes[$selTwo];
               $parserParameters['mapperPhoneType'][$key] = $selTwo;
             }
@@ -188,7 +188,7 @@ class CRM_Contact_Import_ImportJob {
               $header[] = $locationTypes[$selTwo];
               $parserParameters['relatedContactLocType'][$key] = $selTwo;
               if ($selThree) {
-                if ($selOne == 'phone') {
+                if ($selOne == 'phone' || $selOne == 'phone_ext') {
                   $header[] = $phoneTypes[$selThree];
                   $parserParameters['relatedContactPhoneType'][$key] = $selThree;
                 }
-- 
2.25.1