From 638a0140965d3044bb5870e5ba50de15f9eb7a20 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 3 Jun 2022 15:23:29 +1200
Subject: [PATCH] Add import labels fixes that I figured out doing memberhsip

Importantly do_not_import should be added
---
 CRM/Contribute/Import/Form/MapField.php      | 2 +-
 CRM/Upgrade/Incremental/php/FiveFiftyOne.php | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CRM/Contribute/Import/Form/MapField.php b/CRM/Contribute/Import/Form/MapField.php
index 78e6a869d8..8c24947a2b 100644
--- a/CRM/Contribute/Import/Form/MapField.php
+++ b/CRM/Contribute/Import/Form/MapField.php
@@ -433,7 +433,7 @@ class CRM_Contribute_Import_Form_MapField extends CRM_Import_Form_MapField {
       if (isset($mapperKeys[$i][0]) && $mapperKeys[$i][0] == 'soft_credit') {
         $mapperSoftCredit[$i] = $mapperKeys[$i][1];
         if (strpos($mapperSoftCredit[$i], '_') !== FALSE) {
-          list($first, $second) = explode('_', $mapperSoftCredit[$i]);
+          [$first, $second] = explode('_', $mapperSoftCredit[$i]);
           $softCreditFields[$i] = ucwords($first . " " . $second);
         }
         else {
diff --git a/CRM/Upgrade/Incremental/php/FiveFiftyOne.php b/CRM/Upgrade/Incremental/php/FiveFiftyOne.php
index fe10b78e63..3de256e0ff 100644
--- a/CRM/Upgrade/Incremental/php/FiveFiftyOne.php
+++ b/CRM/Upgrade/Incremental/php/FiveFiftyOne.php
@@ -71,6 +71,7 @@ class CRM_Upgrade_Incremental_php_FiveFiftyOne extends CRM_Upgrade_Incremental_B
    * @throws \API_Exception
    */
   public static function convertMappingFieldLabelsToNames(): bool {
+    // Contribution fields....
     $mappings = MappingField::get(FALSE)
       ->setSelect(['id', 'name'])
       ->addWhere('mapping_id.mapping_type_id:name', '=', 'Import Contribution')
@@ -79,12 +80,16 @@ class CRM_Upgrade_Incremental_php_FiveFiftyOne extends CRM_Upgrade_Incremental_B
     $fieldMap = [];
     foreach ($fields as $fieldName => $field) {
       $fieldMap[$field['title']] = $fieldName;
+      if (!empty($field['html']['label'])) {
+        $fieldMap[$field['html']['label']] = $fieldName;
+      }
     }
     $fieldMap[ts('Soft Credit')] = 'soft_credit';
     $fieldMap[ts('Pledge Payment')] = 'pledge_payment';
     $fieldMap[ts(ts('Pledge ID'))] = 'pledge_id';
     $fieldMap[ts(ts('Financial Type'))] = 'financial_type_id';
     $fieldMap[ts(ts('Payment Method'))] = 'payment_instrument_id';
+    $fieldMap[ts('- do not import -')] = 'do_not_import';
 
     foreach ($mappings as $mapping) {
       if (!empty($fieldMap[$mapping['name']])) {
-- 
2.25.1