Merge pull request #23400 from eileenmcnaughton/import_no_match

[Import] Reduce unused copy & paste
civicrm · May 7, 2022 · a4bf93f · a4bf93f
2 parents cb21080 + 67fa4d5
commit a4bf93f
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 156 deletions.
diff --git a/CRM/Activity/Import/Form/Preview.php b/CRM/Activity/Import/Form/Preview.php
@@ -29,7 +29,6 @@ public function preProcess() {
     $dataValues = $this->get('dataValues');
     $mapper = $this->get('mapper');
     $invalidRowCount = $this->get('invalidRowCount');
-    $mismatchCount = $this->get('unMatchCount');
 
     // Get the mapping name displayed if the mappingId is set.
     $mappingId = $this->get('loadMappingId');
@@ -45,11 +44,6 @@ public function preProcess() {
       $this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
 
-    if ($mismatchCount) {
-      $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Activity_Import_Parser_Activity';
-      $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
-    }
-
     $properties = [
       'mapper',
       'dataValues',
@@ -58,7 +52,6 @@ public function preProcess() {
       'validRowCount',
       'invalidRowCount',
       'downloadErrorRecordsUrl',
-      'downloadMismatchRecordsUrl',
     ];
     $this->setStatusUrl();
 
@@ -130,8 +123,6 @@ public function postProcess() {
       $this->set('errorFile', $errorFile);
       $urlParams = 'type=' . CRM_Import_Parser::ERROR . '&parser=CRM_Activity_Import_Parser_Activity';
       $this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
-      $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Activity_Import_Parser_Activity';
-      $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
   }
 

diff --git a/CRM/Activity/Import/Form/Summary.php b/CRM/Activity/Import/Form/Summary.php
@@ -35,15 +35,11 @@ public function preProcess() {
     $invalidRowCount = $this->get('invalidRowCount');
     $duplicateRowCount = $this->get('duplicateRowCount');
     $onDuplicate = $this->get('onDuplicate');
-    $mismatchCount = $this->get('unMatchCount');
+
     if ($duplicateRowCount > 0) {
       $urlParams = 'type=' . CRM_Import_Parser::DUPLICATE . '&parser=CRM_Activity_Import_Parser_Activity';
       $this->set('downloadDuplicateRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
-    elseif ($mismatchCount) {
-      $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Activity_Import_Parser_Activity';
-      $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
-    }
     else {
       $duplicateRowCount = 0;
       $this->set('duplicateRowCount', $duplicateRowCount);
@@ -67,7 +63,7 @@ public function preProcess() {
       // Only subtract dupes from successful import if we're skipping.
 
       $this->set('validRowCount', $totalRowCount - $invalidRowCount -
-         $duplicateRowCount - $mismatchCount
+         $duplicateRowCount
       );
     }
     $this->assign('dupeActionString', $dupeActionString);
@@ -79,9 +75,7 @@ public function preProcess() {
       'downloadErrorRecordsUrl',
       'duplicateRowCount',
       'downloadDuplicateRecordsUrl',
-      'downloadMismatchRecordsUrl',
       'groupAdditions',
-      'unMatchCount',
     ];
     foreach ($properties as $property) {
       $this->assign($property, $this->get($property));

diff --git a/CRM/Contribute/Import/Form/Preview.php b/CRM/Contribute/Import/Form/Preview.php
@@ -31,7 +31,6 @@ public function preProcess() {
     $softCreditFields = $this->get('softCreditFields');
     $mapperSoftCreditType = $this->get('mapperSoftCreditType');
     $invalidRowCount = $this->get('invalidRowCount');
-    $mismatchCount = $this->get('unMatchCount');
 
     //get the mapping name displayed if the mappingId is set
     $mappingId = $this->get('loadMappingId');
@@ -47,11 +46,6 @@ public function preProcess() {
       $this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
 
-    if ($mismatchCount) {
-      $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Contribute_Import_Parser_Contribution';
-      $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
-    }
-
     $properties = [
       'mapper',
       'softCreditFields',
@@ -62,7 +56,6 @@ public function preProcess() {
       'validRowCount',
       'invalidRowCount',
       'downloadErrorRecordsUrl',
-      'downloadMismatchRecordsUrl',
     ];
     $this->setStatusUrl();
 
@@ -143,8 +136,6 @@ public function postProcess() {
       $this->set('errorFile', $errorFile);
       $urlParams = 'type=' . CRM_Import_Parser::ERROR . '&parser=CRM_Contribute_Import_Parser_Contribution';
       $this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
-      $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Contribute_Import_Parser_Contribution';
-      $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
   }
 

diff --git a/CRM/Contribute/Import/Form/Summary.php b/CRM/Contribute/Import/Form/Summary.php
@@ -47,15 +47,10 @@ public function preProcess() {
     $validPledgePaymentRowCount = $this->get('validPledgePaymentRowCount');
     $duplicateRowCount = $this->get('duplicateRowCount');
     $onDuplicate = $this->get('onDuplicate');
-    $mismatchCount = $this->get('unMatchCount');
     if ($duplicateRowCount > 0) {
       $urlParams = 'type=' . CRM_Import_Parser::DUPLICATE . '&parser=CRM_Contribute_Import_Parser_Contribution';
       $this->set('downloadDuplicateRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
-    elseif ($mismatchCount) {
-      $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Contribute_Import_Parser_Contribution';
-      $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
-    }
     else {
       $duplicateRowCount = 0;
       $this->set('duplicateRowCount', $duplicateRowCount);
@@ -79,7 +74,7 @@ public function preProcess() {
       /* only subtract dupes from successful import if we're skipping */
 
       $this->set('validRowCount', $totalRowCount - $invalidRowCount -
-        $duplicateRowCount - $mismatchCount - $invalidSoftCreditRowCount - $invalidPledgePaymentRowCount
+        $duplicateRowCount - $invalidSoftCreditRowCount - $invalidPledgePaymentRowCount
       );
     }
     $this->assign('dupeActionString', $dupeActionString);
@@ -93,9 +88,7 @@ public function preProcess() {
       'downloadErrorRecordsUrl',
       'duplicateRowCount',
       'downloadDuplicateRecordsUrl',
-      'downloadMismatchRecordsUrl',
       'groupAdditions',
-      'unMatchCount',
       'validPledgePaymentRowCount',
       'invalidPledgePaymentRowCount',
       'downloadPledgePaymentErrorRecordsUrl',

diff --git a/CRM/Custom/Import/Form/Preview.php b/CRM/Custom/Import/Form/Preview.php
@@ -18,7 +18,6 @@ public function preProcess() {
     $dataValues = $this->get('dataValues');
     $mapper = $this->get('mapper');
     $invalidRowCount = $this->get('invalidRowCount');
-    $mismatchCount = $this->get('unMatchCount');
     $entity = $this->get('_entity');
 
     //get the mapping name displayed if the mappingId is set
@@ -35,11 +34,6 @@ public function preProcess() {
       $this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
 
-    if ($mismatchCount) {
-      $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . $this->_importParserUrl;
-      $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
-    }
-
     $properties = [
       'mapper',
       'dataValues',
@@ -48,7 +42,6 @@ public function preProcess() {
       'validRowCount',
       'invalidRowCount',
       'downloadErrorRecordsUrl',
-      'downloadMismatchRecordsUrl',
     ];
 
     foreach ($properties as $property) {
@@ -119,8 +112,6 @@ public function postProcess() {
       $this->set('errorFile', $errorFile);
       $urlParams = 'type=' . CRM_Import_Parser::ERROR . $this->_importParserUrl;
       $this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
-      $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . $this->_importParserUrl;
-      $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
   }
 

diff --git a/CRM/Event/Import/Form/Preview.php b/CRM/Event/Import/Form/Preview.php
@@ -33,7 +33,6 @@ public function preProcess() {
     $dataValues = $this->get('dataValues');
     $mapper = $this->get('mapper');
     $invalidRowCount = $this->get('invalidRowCount');
-    $mismatchCount = $this->get('unMatchCount');
 
     //get the mapping name displayed if the mappingId is set
     $mappingId = $this->get('loadMappingId');
@@ -49,11 +48,6 @@ public function preProcess() {
       $this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
 
-    if ($mismatchCount) {
-      $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Event_Import_Parser_Participant';
-      $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
-    }
-
     $properties = [
       'mapper',
       'dataValues',
@@ -62,7 +56,6 @@ public function preProcess() {
       'validRowCount',
       'invalidRowCount',
       'downloadErrorRecordsUrl',
-      'downloadMismatchRecordsUrl',
     ];
 
     foreach ($properties as $property) {
@@ -132,8 +125,6 @@ public function postProcess() {
       $this->set('errorFile', $errorFile);
       $urlParams = 'type=' . CRM_Import_Parser::ERROR . '&parser=CRM_Event_Import_Parser_Participant';
       $this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
-      $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Event_Import_Parser_Participant';
-      $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
   }
 

diff --git a/CRM/Event/Import/Form/Summary.php b/CRM/Event/Import/Form/Summary.php
@@ -37,15 +37,10 @@ public function preProcess() {
     $invalidRowCount = $this->get('invalidRowCount');
     $duplicateRowCount = $this->get('duplicateRowCount');
     $onDuplicate = $this->get('onDuplicate');
-    $mismatchCount = $this->get('unMatchCount');
     if ($duplicateRowCount > 0) {
       $urlParams = 'type=' . CRM_Import_Parser::DUPLICATE . '&parser=CRM_Event_Import_Parser_Participant';
       $this->set('downloadDuplicateRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
-    elseif ($mismatchCount) {
-      $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Event_Import_Parser_Participant';
-      $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
-    }
     else {
       $duplicateRowCount = 0;
       $this->set('duplicateRowCount', $duplicateRowCount);
@@ -69,7 +64,7 @@ public function preProcess() {
       /* only subtract dupes from successful import if we're skipping */
 
       $this->set('validRowCount', $totalRowCount - $invalidRowCount -
-        $duplicateRowCount - $mismatchCount
+        $duplicateRowCount
       );
     }
     $this->assign('dupeActionString', $dupeActionString);
@@ -81,9 +76,7 @@ public function preProcess() {
       'downloadErrorRecordsUrl',
       'duplicateRowCount',
       'downloadDuplicateRecordsUrl',
-      'downloadMismatchRecordsUrl',
       'groupAdditions',
-      'unMatchCount',
     ];
     foreach ($properties as $property) {
       $this->assign($property, $this->get($property));

diff --git a/CRM/Member/Import/Form/Preview.php b/CRM/Member/Import/Form/Preview.php
@@ -32,7 +32,6 @@ public function preProcess() {
     $dataValues = $this->get('dataValues');
     $mapper = $this->get('mapper');
     $invalidRowCount = $this->get('invalidRowCount');
-    $mismatchCount = $this->get('unMatchCount');
 
     //get the mapping name displayed if the mappingId is set
     $mappingId = $this->get('loadMappingId');
@@ -48,11 +47,6 @@ public function preProcess() {
       $this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
 
-    if ($mismatchCount) {
-      $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Member_Import_Parser_Membership';
-      $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
-    }
-
     $properties = [
       'mapper',
       'dataValues',
@@ -61,7 +55,6 @@ public function preProcess() {
       'validRowCount',
       'invalidRowCount',
       'downloadErrorRecordsUrl',
-      'downloadMismatchRecordsUrl',
     ];
     $this->setStatusUrl();
 
@@ -151,8 +144,6 @@ public function postProcess() {
       $this->set('errorFile', $errorFile);
       $urlParams = 'type=' . CRM_Import_Parser::ERROR . '&parser=CRM_Member_Import_Parser_Membership';
       $this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
-      $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Member_Import_Parser_Membership';
-      $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
   }
 

diff --git a/CRM/Member/Import/Form/Summary.php b/CRM/Member/Import/Form/Summary.php
@@ -37,15 +37,11 @@ public function preProcess() {
     $invalidRowCount = $this->get('invalidRowCount');
     $duplicateRowCount = $this->get('duplicateRowCount');
     $onDuplicate = $this->get('onDuplicate');
-    $mismatchCount = $this->get('unMatchCount');
+
     if ($duplicateRowCount > 0) {
       $urlParams = 'type=' . CRM_Import_Parser::DUPLICATE . '&parser=CRM_Member_Import_Parser_Membership';
       $this->set('downloadDuplicateRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
-    elseif ($mismatchCount) {
-      $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Member_Import_Parser_Membership';
-      $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
-    }
     else {
       $duplicateRowCount = 0;
       $this->set('duplicateRowCount', $duplicateRowCount);
@@ -69,7 +65,7 @@ public function preProcess() {
       /* only subtract dupes from successful import if we're skipping */
 
       $this->set('validRowCount', $totalRowCount - $invalidRowCount -
-        $duplicateRowCount - $mismatchCount
+        $duplicateRowCount
       );
     }
     $this->assign('dupeActionString', $dupeActionString);
@@ -81,9 +77,7 @@ public function preProcess() {
       'downloadErrorRecordsUrl',
       'duplicateRowCount',
       'downloadDuplicateRecordsUrl',
-      'downloadMismatchRecordsUrl',
       'groupAdditions',
-      'unMatchCount',
     ];
     foreach ($properties as $property) {
       $this->assign($property, $this->get($property));

diff --git a/templates/CRM/Activity/Import/Form/Summary.tpl b/templates/CRM/Activity/Import/Form/Summary.tpl
@@ -19,15 +19,6 @@
     {ts}<strong>Import has completed successfully.</strong> The information below summarizes the results.{/ts}
     </p>
 
-   {if $unMatchCount }
-        <p class="error">
-        {ts count=$unMatchCount plural='CiviCRM has detected mismatched activity IDs. These records have not been Updated.'}CiviCRM has detected mismatched activity ID. This record have not been updated.{/ts}
-        </p>
-        <p class="error">
-        {ts 1=$downloadMismatchRecordsUrl}You can <a href='%1'>Download Mismatched Activity records</a>. You may then correct them, and import the new file with the corrected data.{/ts}
-        </p>
-    {/if}
-
     {if $invalidRowCount }
         <p class="error">
         {ts count=$invalidRowCount plural='CiviCRM has detected invalid data and/or formatting errors in %count records. These records have not been imported.'}CiviCRM has detected invalid data and/or formatting errors in one record. This record have not been imported.{/ts}
@@ -65,17 +56,6 @@
     </tr>
     {/if}
 
-    {if $unMatchCount }
-    <tr class="error"><td class="label crm-grid-cell">{ts}Mismatched Rows (skipped){/ts}</td>
-        <td class="data">{$unMatchCount}</td>
-        <td class="explanation">{ts}Rows with mismatched activity IDs (NOT updated).{/ts}
-            {if $unMatchCount}
-                <p><a href="{$downloadMismatchRecordsUrl}">{ts}Download Mismatched Activity records{/ts}</a></p>
-            {/if}
-        </td>
-    </tr>
-    {/if}
-
     {if $duplicateRowCount}
     <tr class="error"><td class="label crm-grid-cell">{ts}Duplicate Rows{/ts}</td>
         <td class="data">{$duplicateRowCount}</td>

diff --git a/templates/CRM/Contribute/Import/Form/Summary.tpl b/templates/CRM/Contribute/Import/Form/Summary.tpl
@@ -18,15 +18,6 @@
     <strong>{ts}Import has completed successfully.{/ts}</strong> {ts}The information below summarizes the results.{/ts}
     </p>
 
-   {if $unMatchCount }
-        <p class="error">
-        {ts count=$unMatchCount plural='CiviCRM has detected mismatched contribution IDs. These records have not been Updated.'}CiviCRM has detected mismatched contribution ID. This record has not been updated.{/ts}
-        </p>
-        <p class="error">
-        {ts 1=$downloadMismatchRecordsUrl}You can <a href='%1'>Download Mismatched Contributions</a>. You may then correct them, and import the new file with the corrected data.{/ts}
-        </p>
-    {/if}
-
     {if $invalidRowCount }
         <p class="error">
         {ts count=$invalidRowCount plural='CiviCRM has detected invalid data and/or formatting errors in %count records. These records have not been imported.'}CiviCRM has detected invalid data and/or formatting errors in one record. This record has not been imported.{/ts}
@@ -99,16 +90,6 @@
         </td>
     </tr>
     {/if}
-    {if $unMatchCount }
-    <tr class="error"><td class="label crm-grid-cell">{ts}Mismatched Rows (skipped){/ts}</td>
-        <td class="data">{$unMatchCount}</td>
-        <td class="explanation">{ts}Rows with mismatched contribution IDs... (NOT updated).{/ts}
-            {if $unMatchCount}
-                <p><a href="{$downloadMismatchRecordsUrl}">{ts}Download Mismatched Contributions{/ts}</a></p>
-            {/if}
-        </td>
-    </tr>
-    {/if}
 
     {if $duplicateRowCount}
     <tr class="error"><td class="label crm-grid-cell">{ts}Duplicate Rows{/ts}</td>