[REF] [Import] Remove another good intention - conflict

There is all sorts of handling for 'conflict' - but a conflict return code is never
generated

diff --git a/CRM/Activity/Import/Form/Preview.php b/CRM/Activity/Import/Form/Preview.php
index 75cd9db82effc20c4424dc3741e633dfa513a332..e991b978e00fba7628ce8a3210a16bbb139d06ae 100644 (file)
--- a/CRM/Activity/Import/Form/Preview.php
+++ b/CRM/Activity/Import/Form/Preview.php
@@ -29,7 +29,6 @@ class CRM_Activity_Import_Form_Preview extends CRM_Import_Form_Preview {
     $dataValues = $this->get('dataValues');
     $mapper = $this->get('mapper');
     $invalidRowCount = $this->get('invalidRowCount');
-    $conflictRowCount = $this->get('conflictRowCount');
     $mismatchCount = $this->get('unMatchCount');
 
     // Get the mapping name displayed if the mappingId is set.
@@ -46,11 +45,6 @@ class CRM_Activity_Import_Form_Preview extends CRM_Import_Form_Preview {
       $this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
 
-    if ($conflictRowCount) {
-      $urlParams = 'type=' . CRM_Import_Parser::CONFLICT . '&parser=CRM_Activity_Import_Parser_Activity';
-      $this->set('downloadConflictRecordsUrl', 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));
@@ -63,9 +57,7 @@ class CRM_Activity_Import_Form_Preview extends CRM_Import_Form_Preview {
       'totalRowCount',
       'validRowCount',
       'invalidRowCount',
-      'conflictRowCount',
       'downloadErrorRecordsUrl',
-      'downloadConflictRecordsUrl',
       'downloadMismatchRecordsUrl',
     ];
     $this->setStatusUrl();
@@ -83,7 +75,6 @@ class CRM_Activity_Import_Form_Preview extends CRM_Import_Form_Preview {
   public function postProcess() {
     $fileName = $this->controller->exportValue('DataSource', 'uploadFile');
     $invalidRowCount = $this->get('invalidRowCount');
-    $conflictRowCount = $this->get('conflictRowCount');
     $onDuplicate = $this->get('onDuplicate');
 
     $mapper = $this->controller->exportValue('MapField', 'mapper');
@@ -139,8 +130,6 @@ class CRM_Activity_Import_Form_Preview extends CRM_Import_Form_Preview {
       $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::CONFLICT . '&parser=CRM_Activity_Import_Parser_Activity';
-      $this->set('downloadConflictRecordsUrl', 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
index e2543665ccb6471e9201dfd64f1d5b0249da4dc2..a4c9b66e9793721608fdae205b49cf21b0debd07 100644 (file)
--- a/CRM/Activity/Import/Form/Summary.php
+++ b/CRM/Activity/Import/Form/Summary.php
@@ -33,7 +33,6 @@ class CRM_Activity_Import_Form_Summary extends CRM_Import_Form_Summary {
     $this->set('totalRowCount', $totalRowCount);
 
     $invalidRowCount = $this->get('invalidRowCount');
-    $conflictRowCount = $this->get('conflictRowCount');
     $duplicateRowCount = $this->get('duplicateRowCount');
     $onDuplicate = $this->get('onDuplicate');
     $mismatchCount = $this->get('unMatchCount');
@@ -68,7 +67,7 @@ class CRM_Activity_Import_Form_Summary extends CRM_Import_Form_Summary {
       // Only subtract dupes from successful import if we're skipping.
 
       $this->set('validRowCount', $totalRowCount - $invalidRowCount -
-        $conflictRowCount - $duplicateRowCount - $mismatchCount
+         $duplicateRowCount - $mismatchCount
       );
     }
     $this->assign('dupeActionString', $dupeActionString);
@@ -77,8 +76,6 @@ class CRM_Activity_Import_Form_Summary extends CRM_Import_Form_Summary {
       'totalRowCount',
       'validRowCount',
       'invalidRowCount',
-      'conflictRowCount',
-      'downloadConflictRecordsUrl',
       'downloadErrorRecordsUrl',
       'duplicateRowCount',
       'downloadDuplicateRecordsUrl',

diff --git a/CRM/Activity/Import/Parser/Activity.php b/CRM/Activity/Import/Parser/Activity.php
index 19d40ae451b9323bcfd3a32e208db9baec88fc03..19f4361ebebc023d0d369ae02896265dd8488431 100644 (file)
--- a/CRM/Activity/Import/Parser/Activity.php
+++ b/CRM/Activity/Import/Parser/Activity.php
@@ -485,11 +485,10 @@ class CRM_Activity_Import_Parser_Activity extends CRM_Import_Parser {
 
     $this->_lineCount = 0;
     $this->_invalidRowCount = $this->_validCount = 0;
-    $this->_totalCount = $this->_conflictCount = 0;
+    $this->_totalCount = 0;
 
     $this->_errors = [];
     $this->_warnings = [];
-    $this->_conflicts = [];
 
     $this->_fileSize = number_format(filesize($fileName) / 1024.0, 2);
 
@@ -571,16 +570,6 @@ class CRM_Activity_Import_Parser_Activity extends CRM_Import_Parser {
         $this->_errors[] = $values;
       }
 
-      if ($returnCode & self::CONFLICT) {
-        $this->_conflictCount++;
-        $recordNumber = $this->_lineCount;
-        if ($this->_haveColumnHeader) {
-          $recordNumber--;
-        }
-        array_unshift($values, $recordNumber);
-        $this->_conflicts[] = $values;
-      }
-
       if ($returnCode & self::DUPLICATE) {
         $this->_duplicateCount++;
         $recordNumber = $this->_lineCount;
@@ -620,14 +609,7 @@ class CRM_Activity_Import_Parser_Activity extends CRM_Import_Parser {
         $this->_errorFileName = self::errorFileName(self::ERROR);
         self::exportCSV($this->_errorFileName, $headers, $this->_errors);
       }
-      if ($this->_conflictCount) {
-        $headers = array_merge(
-          [ts('Line Number'), ts('Reason')],
-          $customHeaders
-        );
-        $this->_conflictFileName = self::errorFileName(self::CONFLICT);
-        self::exportCSV($this->_conflictFileName, $headers, $this->_conflicts);
-      }
+
       if ($this->_duplicateCount) {
         $headers = array_merge(
           [ts('Line Number'), ts('View Activity History URL')],
@@ -700,14 +682,11 @@ class CRM_Activity_Import_Parser_Activity extends CRM_Import_Parser {
     $store->set('totalRowCount', $this->_totalCount);
     $store->set('validRowCount', $this->_validCount);
     $store->set('invalidRowCount', $this->_invalidRowCount);
-    $store->set('conflictRowCount', $this->_conflictCount);
 
     if ($this->_invalidRowCount) {
       $store->set('errorsFileName', $this->_errorFileName);
     }
-    if ($this->_conflictCount) {
-      $store->set('conflictsFileName', $this->_conflictFileName);
-    }
+
     if (isset($this->_rows) && !empty($this->_rows)) {
       $store->set('dataValues', $this->_rows);
     }

diff --git a/CRM/Contact/Import/Form/Preview.php b/CRM/Contact/Import/Form/Preview.php
index 922745ad8202a5f785c0fa1a2c5132f1aa7243ea..931cd856ad234659ea12b63128321a87bec5dbe7 100644 (file)
--- a/CRM/Contact/Import/Form/Preview.php
+++ b/CRM/Contact/Import/Form/Preview.php
@@ -34,7 +34,6 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview {
    * @throws \CRM_Core_Exception
    */
   public function preProcess() {
-    $conflictRowCount = $this->get('conflictRowCount');
     $mismatchCount = $this->get('unMatchCount');
     $columnNames = $this->get('columnNames');
     $this->_disableUSPS = $this->get('disableUSPS');
@@ -66,12 +65,6 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview {
     $this->assign('validRowCount', $this->getRowCount(CRM_Import_Parser::VALID));
     $this->assign('totalRowCount', $this->getRowCount([]));
 
-    // @todo conflict rows are still being output in the parser & not updating the temp table - fix
-    if ($conflictRowCount) {
-      $urlParams = 'type=' . CRM_Import_Parser::CONFLICT . '&parser=CRM_Contact_Import_Parser_Contact';
-      $this->set('downloadConflictRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
-    }
-
     if ($mismatchCount) {
       $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Contact_Import_Parser_Contact';
       $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
@@ -185,7 +178,6 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview {
     $importJobParams = array(
       'doGeocodeAddress' => $this->controller->exportValue('DataSource', 'doGeocodeAddress'),
       'invalidRowCount' => $this->get('invalidRowCount'),
-      'conflictRowCount' => $this->get('conflictRowCount'),
       'onDuplicate' => $this->get('onDuplicate'),
       'dedupe' => $this->getSubmittedValue('dedupe_rule_id'),
       'newGroupName' => $this->controller->exportValue($this->_name, 'newGroupName'),
@@ -251,10 +243,6 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview {
 
       $this->set('errorFile', $errorFile);
 
-      // @todo - these should use the new url but are not reliably updating the table yet.
-      $urlParams = 'type=' . CRM_Import_Parser::CONFLICT . '&parser=CRM_Contact_Import_Parser_Contact';
-      $this->set('downloadConflictRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
-
       $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Contact_Import_Parser_Contact';
       $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }

diff --git a/CRM/Contact/Import/Form/Summary.php b/CRM/Contact/Import/Form/Summary.php
index ab526d4e014d7ad664068e22f8dcf1291061a98f..ab86d5bcda1b78899f6eadf6c292be2ba11916c8 100644 (file)
--- a/CRM/Contact/Import/Form/Summary.php
+++ b/CRM/Contact/Import/Form/Summary.php
@@ -32,7 +32,6 @@ class CRM_Contact_Import_Form_Summary extends CRM_Import_Form_Summary {
     $totalRowCount += $relatedCount;
 
     $invalidRowCount = $this->get('invalidRowCount');
-    $conflictRowCount = $this->get('conflictRowCount');
     $duplicateRowCount = $this->get('duplicateRowCount');
     $onDuplicate = $this->get('onDuplicate');
     $mismatchCount = $this->get('unMatchCount');
@@ -75,14 +74,12 @@ class CRM_Contact_Import_Form_Summary extends CRM_Import_Form_Summary {
     }
     //now we also create relative contact in update and fill mode
     $this->set('validRowCount', $totalRowCount - $invalidRowCount -
-      $conflictRowCount - $duplicateRowCount - $mismatchCount
+       $duplicateRowCount - $mismatchCount
     );
 
     $this->assign('dupeActionString', $dupeActionString);
 
     $properties = [
-      'conflictRowCount',
-      'downloadConflictRecordsUrl',
       'downloadErrorRecordsUrl',
       'duplicateRowCount',
       'downloadDuplicateRecordsUrl',

diff --git a/CRM/Contact/Import/ImportJob.php b/CRM/Contact/Import/ImportJob.php
index 36fe0f835a7febe54bff9e2e4b6901d074bcc0d4..f9f3c49cc9728c2d4b0ba94215231322f05806fd 100644 (file)
--- a/CRM/Contact/Import/ImportJob.php
+++ b/CRM/Contact/Import/ImportJob.php
@@ -26,7 +26,6 @@ class CRM_Contact_Import_ImportJob {
 
   protected $_doGeocodeAddress;
   protected $_invalidRowCount;
-  protected $_conflictRowCount;
   protected $_onDuplicate;
   protected $_dedupe;
   protected $_newGroupName;

diff --git a/CRM/Contact/Import/Parser/Contact.php b/CRM/Contact/Import/Parser/Contact.php
index 78138d4a25560120326d8065438e6208ede5d924..a87437f035af1477c2e8f8272f6fbe688f1b0bac 100644 (file)
--- a/CRM/Contact/Import/Parser/Contact.php
+++ b/CRM/Contact/Import/Parser/Contact.php
@@ -2576,11 +2576,10 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
 
     $this->_rowCount = 0;
     $this->_invalidRowCount = $this->_validCount = 0;
-    $this->_totalCount = $this->_conflictCount = 0;
+    $this->_totalCount = 0;
 
     $this->_errors = [];
     $this->_warnings = [];
-    $this->_conflicts = [];
     $this->_unparsedAddresses = [];
 
     $this->_tableName = $tableName = $this->getUserJob()['metadata']['DataSource']['table_name'];
@@ -2672,12 +2671,6 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
         $this->_errors[] = $values;
       }
 
-      if ($returnCode & self::CONFLICT) {
-        $this->_conflictCount++;
-        array_unshift($values, $this->_rowCount);
-        $this->_conflicts[] = $values;
-      }
-
       if ($returnCode & self::NO_MATCH) {
         $this->_unMatchCount++;
         array_unshift($values, $this->_rowCount);
@@ -2715,14 +2708,6 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
         }
       }
 
-      if ($this->_conflictCount) {
-        $headers = array_merge([
-          ts('Line Number'),
-          ts('Reason'),
-        ], $customHeaders);
-        $this->_conflictFileName = self::errorFileName(self::CONFLICT);
-        self::exportCSV($this->_conflictFileName, $headers, $this->_conflicts);
-      }
       if ($this->_unMatchCount) {
         $headers = array_merge([
           ts('Line Number'),
@@ -3039,7 +3024,6 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
     $store->set('totalRowCount', $this->_totalCount);
     $store->set('validRowCount', $this->_validCount);
     $store->set('invalidRowCount', $this->_invalidRowCount);
-    $store->set('conflictRowCount', $this->_conflictCount);
     $store->set('unMatchCount', $this->_unMatchCount);
 
     switch ($this->_contactType) {
@@ -3055,9 +3039,6 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
         $store->set('contactType', CRM_Import_Parser::CONTACT_ORGANIZATION);
     }
 
-    if ($this->_conflictCount) {
-      $store->set('conflictsFileName', $this->_conflictFileName);
-    }
     if (isset($this->_rows) && !empty($this->_rows)) {
       $store->set('dataValues', $this->_rows);
     }

diff --git a/CRM/Contribute/Import/Form/Preview.php b/CRM/Contribute/Import/Form/Preview.php
index b9abde34ac0fcbd4fc44ddd31ff874d1c0d232b7..6640b01d1975e707a7e070601114baa033216c15 100644 (file)
--- a/CRM/Contribute/Import/Form/Preview.php
+++ b/CRM/Contribute/Import/Form/Preview.php
@@ -31,7 +31,6 @@ class CRM_Contribute_Import_Form_Preview extends CRM_Import_Form_Preview {
     $softCreditFields = $this->get('softCreditFields');
     $mapperSoftCreditType = $this->get('mapperSoftCreditType');
     $invalidRowCount = $this->get('invalidRowCount');
-    $conflictRowCount = $this->get('conflictRowCount');
     $mismatchCount = $this->get('unMatchCount');
 
     //get the mapping name displayed if the mappingId is set
@@ -48,11 +47,6 @@ class CRM_Contribute_Import_Form_Preview extends CRM_Import_Form_Preview {
       $this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
 
-    if ($conflictRowCount) {
-      $urlParams = 'type=' . CRM_Import_Parser::CONFLICT . '&parser=CRM_Contribute_Import_Parser_Contribution';
-      $this->set('downloadConflictRecordsUrl', 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));
@@ -67,9 +61,7 @@ class CRM_Contribute_Import_Form_Preview extends CRM_Import_Form_Preview {
       'totalRowCount',
       'validRowCount',
       'invalidRowCount',
-      'conflictRowCount',
       'downloadErrorRecordsUrl',
-      'downloadConflictRecordsUrl',
       'downloadMismatchRecordsUrl',
     ];
     $this->setStatusUrl();
@@ -85,7 +77,6 @@ class CRM_Contribute_Import_Form_Preview extends CRM_Import_Form_Preview {
   public function postProcess() {
     $fileName = $this->controller->exportValue('DataSource', 'uploadFile');
     $invalidRowCount = $this->get('invalidRowCount');
-    $conflictRowCount = $this->get('conflictRowCount');
     $onDuplicate = $this->get('onDuplicate');
     $mapperSoftCreditType = $this->get('mapperSoftCreditType');
 
@@ -152,8 +143,6 @@ class CRM_Contribute_Import_Form_Preview extends CRM_Import_Form_Preview {
       $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::CONFLICT . '&parser=CRM_Contribute_Import_Parser_Contribution';
-      $this->set('downloadConflictRecordsUrl', 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
index 6714befabc7ef7418452cad13f130391ba18b3dd..b1fc36d05c4b5c49bd0ec2d4d6090b55e73b07c1 100644 (file)
--- a/CRM/Contribute/Import/Form/Summary.php
+++ b/CRM/Contribute/Import/Form/Summary.php
@@ -45,7 +45,6 @@ class CRM_Contribute_Import_Form_Summary extends CRM_Import_Form_Summary {
       $this->set('downloadPledgePaymentErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
     $validPledgePaymentRowCount = $this->get('validPledgePaymentRowCount');
-    $conflictRowCount = $this->get('conflictRowCount');
     $duplicateRowCount = $this->get('duplicateRowCount');
     $onDuplicate = $this->get('onDuplicate');
     $mismatchCount = $this->get('unMatchCount');
@@ -80,7 +79,7 @@ class CRM_Contribute_Import_Form_Summary extends CRM_Import_Form_Summary {
       /* only subtract dupes from successful import if we're skipping */
 
       $this->set('validRowCount', $totalRowCount - $invalidRowCount -
-        $conflictRowCount - $duplicateRowCount - $mismatchCount - $invalidSoftCreditRowCount - $invalidPledgePaymentRowCount
+        $duplicateRowCount - $mismatchCount - $invalidSoftCreditRowCount - $invalidPledgePaymentRowCount
       );
     }
     $this->assign('dupeActionString', $dupeActionString);
@@ -91,8 +90,6 @@ class CRM_Contribute_Import_Form_Summary extends CRM_Import_Form_Summary {
       'invalidRowCount',
       'validSoftCreditRowCount',
       'invalidSoftCreditRowCount',
-      'conflictRowCount',
-      'downloadConflictRecordsUrl',
       'downloadErrorRecordsUrl',
       'duplicateRowCount',
       'downloadDuplicateRecordsUrl',

diff --git a/CRM/Contribute/Import/Parser/Contribution.php b/CRM/Contribute/Import/Parser/Contribution.php
index 3fe3493a49e4535e7071e88e4c6e7983e178b669..4a639e2f5a516b73d28510cd8ec36f9f52b441b1 100644 (file)
--- a/CRM/Contribute/Import/Parser/Contribution.php
+++ b/CRM/Contribute/Import/Parser/Contribution.php
@@ -191,11 +191,10 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
 
     $this->_lineCount = $this->_validSoftCreditRowCount = $this->_validPledgePaymentRowCount = 0;
     $this->_invalidRowCount = $this->_validCount = $this->_invalidSoftCreditRowCount = $this->_invalidPledgePaymentRowCount = 0;
-    $this->_totalCount = $this->_conflictCount = 0;
+    $this->_totalCount = 0;
 
     $this->_errors = [];
     $this->_warnings = [];
-    $this->_conflicts = [];
     $this->_pledgePaymentErrors = [];
     $this->_softCreditErrors = [];
     if ($statusID) {
@@ -317,16 +316,6 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
         $this->_softCreditErrors[] = $values;
       }
 
-      if ($returnCode == self::CONFLICT) {
-        $this->_conflictCount++;
-        $recordNumber = $this->_lineCount;
-        if ($this->_haveColumnHeader) {
-          $recordNumber--;
-        }
-        array_unshift($values, $recordNumber);
-        $this->_conflicts[] = $values;
-      }
-
       if ($returnCode == self::DUPLICATE) {
         $this->_duplicateCount++;
         $recordNumber = $this->_lineCount;
@@ -387,14 +376,6 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
         self::exportCSV($this->_softCreditErrorsFileName, $headers, $this->_softCreditErrors);
       }
 
-      if ($this->_conflictCount) {
-        $headers = array_merge([
-          ts('Line Number'),
-          ts('Reason'),
-        ], $customHeaders);
-        $this->_conflictFileName = self::errorFileName(self::CONFLICT);
-        self::exportCSV($this->_conflictFileName, $headers, $this->_conflicts);
-      }
       if ($this->_duplicateCount) {
         $headers = array_merge([
           ts('Line Number'),
@@ -536,7 +517,6 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
     $store->set('validSoftCreditRowCount', $this->_validSoftCreditRowCount);
     $store->set('invalidPledgePaymentRowCount', $this->_invalidPledgePaymentRowCount);
     $store->set('validPledgePaymentRowCount', $this->_validPledgePaymentRowCount);
-    $store->set('conflictRowCount', $this->_conflictCount);
 
     switch ($this->_contactType) {
       case 'Individual':
@@ -554,9 +534,6 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
     if ($this->_invalidRowCount) {
       $store->set('errorsFileName', $this->_errorFileName);
     }
-    if ($this->_conflictCount) {
-      $store->set('conflictsFileName', $this->_conflictFileName);
-    }
     if (isset($this->_rows) && !empty($this->_rows)) {
       $store->set('dataValues', $this->_rows);
     }

diff --git a/CRM/Custom/Import/Form/Preview.php b/CRM/Custom/Import/Form/Preview.php
index 75a51cfcb32388e30aebbe720a8cd5bc5e26835e..b917b928e15aa76282734ec866ba56d99c51b991 100644 (file)
--- a/CRM/Custom/Import/Form/Preview.php
+++ b/CRM/Custom/Import/Form/Preview.php
@@ -18,7 +18,6 @@ class CRM_Custom_Import_Form_Preview extends CRM_Import_Form_Preview {
     $dataValues = $this->get('dataValues');
     $mapper = $this->get('mapper');
     $invalidRowCount = $this->get('invalidRowCount');
-    $conflictRowCount = $this->get('conflictRowCount');
     $mismatchCount = $this->get('unMatchCount');
     $entity = $this->get('_entity');
 
@@ -36,11 +35,6 @@ class CRM_Custom_Import_Form_Preview extends CRM_Import_Form_Preview {
       $this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
 
-    if ($conflictRowCount) {
-      $urlParams = 'type=' . CRM_Import_Parser::CONFLICT . $this->_importParserUrl;
-      $this->set('downloadConflictRecordsUrl', 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));
@@ -53,9 +47,7 @@ class CRM_Custom_Import_Form_Preview extends CRM_Import_Form_Preview {
       'totalRowCount',
       'validRowCount',
       'invalidRowCount',
-      'conflictRowCount',
       'downloadErrorRecordsUrl',
-      'downloadConflictRecordsUrl',
       'downloadMismatchRecordsUrl',
     ];
 
@@ -73,7 +65,6 @@ class CRM_Custom_Import_Form_Preview extends CRM_Import_Form_Preview {
   public function postProcess() {
     $fileName = $this->getSubmittedValue('uploadFile');
     $invalidRowCount = $this->get('invalidRowCount');
-    $conflictRowCount = $this->get('conflictRowCount');
     $onDuplicate = $this->get('onDuplicate');
     $entity = $this->get('_entity');
 
@@ -128,8 +119,6 @@ class CRM_Custom_Import_Form_Preview extends CRM_Import_Form_Preview {
       $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::CONFLICT . $this->_importParserUrl;
-      $this->set('downloadConflictRecordsUrl', 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/Custom/Import/Parser/Api.php b/CRM/Custom/Import/Parser/Api.php
index 5bfb22f23839414ed079ffc78812636115c06fd5..042c910c0292947488b8620455193cf40fc94052 100644 (file)
--- a/CRM/Custom/Import/Parser/Api.php
+++ b/CRM/Custom/Import/Parser/Api.php
@@ -395,11 +395,10 @@ class CRM_Custom_Import_Parser_Api extends CRM_Import_Parser {
 
     $this->_lineCount = $this->_warningCount = 0;
     $this->_invalidRowCount = $this->_validCount = 0;
-    $this->_totalCount = $this->_conflictCount = 0;
+    $this->_totalCount = 0;
 
     $this->_errors = [];
     $this->_warnings = [];
-    $this->_conflicts = [];
 
     $this->_fileSize = number_format(filesize($fileName) / 1024.0, 2);
 
@@ -481,16 +480,6 @@ class CRM_Custom_Import_Parser_Api extends CRM_Import_Parser {
         $this->_errors[] = $values;
       }
 
-      if ($returnCode & self::CONFLICT) {
-        $this->_conflictCount++;
-        $recordNumber = $this->_lineCount;
-        if ($this->_haveColumnHeader) {
-          $recordNumber--;
-        }
-        array_unshift($values, $recordNumber);
-        $this->_conflicts[] = $values;
-      }
-
       if ($returnCode & self::DUPLICATE) {
         $this->_duplicateCount++;
         $recordNumber = $this->_lineCount;
@@ -530,14 +519,7 @@ class CRM_Custom_Import_Parser_Api extends CRM_Import_Parser {
         $this->_errorFileName = self::errorFileName(self::ERROR);
         CRM_Contact_Import_Parser_Contact::exportCSV($this->_errorFileName, $headers, $this->_errors);
       }
-      if ($this->_conflictCount) {
-        $headers = array_merge([
-          ts('Line Number'),
-          ts('Reason'),
-        ], $customHeaders);
-        $this->_conflictFileName = self::errorFileName(self::CONFLICT);
-        CRM_Contact_Import_Parser_Contact::exportCSV($this->_conflictFileName, $headers, $this->_conflicts);
-      }
+
       if ($this->_duplicateCount) {
         $headers = array_merge([
           ts('Line Number'),
@@ -612,7 +594,6 @@ class CRM_Custom_Import_Parser_Api extends CRM_Import_Parser {
     $store->set('totalRowCount', $this->_totalCount);
     $store->set('validRowCount', $this->_validCount);
     $store->set('invalidRowCount', $this->_invalidRowCount);
-    $store->set('conflictRowCount', $this->_conflictCount);
 
     switch ($this->_contactType) {
       case 'Individual':
@@ -630,9 +611,7 @@ class CRM_Custom_Import_Parser_Api extends CRM_Import_Parser {
     if ($this->_invalidRowCount) {
       $store->set('errorsFileName', $this->_errorFileName);
     }
-    if ($this->_conflictCount) {
-      $store->set('conflictsFileName', $this->_conflictFileName);
-    }
+
     if (isset($this->_rows) && !empty($this->_rows)) {
       $store->set('dataValues', $this->_rows);
     }

diff --git a/CRM/Event/Import/Form/Preview.php b/CRM/Event/Import/Form/Preview.php
index 3357c97f4f99d42080e34fd5fca6ad3c81d692ce..79a76fde22a122d9e0d7aba0dc1d56b8e98f37f7 100644 (file)
--- a/CRM/Event/Import/Form/Preview.php
+++ b/CRM/Event/Import/Form/Preview.php
@@ -33,7 +33,6 @@ class CRM_Event_Import_Form_Preview extends CRM_Import_Form_Preview {
     $dataValues = $this->get('dataValues');
     $mapper = $this->get('mapper');
     $invalidRowCount = $this->get('invalidRowCount');
-    $conflictRowCount = $this->get('conflictRowCount');
     $mismatchCount = $this->get('unMatchCount');
 
     //get the mapping name displayed if the mappingId is set
@@ -50,11 +49,6 @@ class CRM_Event_Import_Form_Preview extends CRM_Import_Form_Preview {
       $this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
 
-    if ($conflictRowCount) {
-      $urlParams = 'type=' . CRM_Import_Parser::CONFLICT . '&parser=CRM_Event_Import_Parser_Participant';
-      $this->set('downloadConflictRecordsUrl', 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));
@@ -67,9 +61,7 @@ class CRM_Event_Import_Form_Preview extends CRM_Import_Form_Preview {
       'totalRowCount',
       'validRowCount',
       'invalidRowCount',
-      'conflictRowCount',
       'downloadErrorRecordsUrl',
-      'downloadConflictRecordsUrl',
       'downloadMismatchRecordsUrl',
     ];
 
@@ -88,7 +80,6 @@ class CRM_Event_Import_Form_Preview extends CRM_Import_Form_Preview {
     $fileName = $this->controller->exportValue('DataSource', 'uploadFile');
     $separator = $this->controller->exportValue('DataSource', 'fieldSeparator');
     $invalidRowCount = $this->get('invalidRowCount');
-    $conflictRowCount = $this->get('conflictRowCount');
     $onDuplicate = $this->get('onDuplicate');
 
     $mapper = $this->controller->exportValue('MapField', 'mapper');
@@ -141,8 +132,6 @@ class CRM_Event_Import_Form_Preview extends CRM_Import_Form_Preview {
       $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::CONFLICT . '&parser=CRM_Event_Import_Parser_Participant';
-      $this->set('downloadConflictRecordsUrl', 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
index a5b546e433e0a16bc2177c3c8c1f8eefdd22aec4..6184807db93b4bb46af230df4c86e398c9e4efbb 100644 (file)
--- a/CRM/Event/Import/Form/Summary.php
+++ b/CRM/Event/Import/Form/Summary.php
@@ -35,7 +35,6 @@ class CRM_Event_Import_Form_Summary extends CRM_Import_Form_Summary {
     $this->set('totalRowCount', $totalRowCount);
 
     $invalidRowCount = $this->get('invalidRowCount');
-    $conflictRowCount = $this->get('conflictRowCount');
     $duplicateRowCount = $this->get('duplicateRowCount');
     $onDuplicate = $this->get('onDuplicate');
     $mismatchCount = $this->get('unMatchCount');
@@ -70,7 +69,7 @@ class CRM_Event_Import_Form_Summary extends CRM_Import_Form_Summary {
       /* only subtract dupes from successful import if we're skipping */
 
       $this->set('validRowCount', $totalRowCount - $invalidRowCount -
-        $conflictRowCount - $duplicateRowCount - $mismatchCount
+        $duplicateRowCount - $mismatchCount
       );
     }
     $this->assign('dupeActionString', $dupeActionString);
@@ -79,8 +78,6 @@ class CRM_Event_Import_Form_Summary extends CRM_Import_Form_Summary {
       'totalRowCount',
       'validRowCount',
       'invalidRowCount',
-      'conflictRowCount',
-      'downloadConflictRecordsUrl',
       'downloadErrorRecordsUrl',
       'duplicateRowCount',
       'downloadDuplicateRecordsUrl',

diff --git a/CRM/Event/Import/Parser/Participant.php b/CRM/Event/Import/Parser/Participant.php
index bd32fcf4d8db528a7c75d52c714f1776638d633f..adbd4d43f8a4170f1db37b9ba1684af373fe9b74 100644 (file)
--- a/CRM/Event/Import/Parser/Participant.php
+++ b/CRM/Event/Import/Parser/Participant.php
@@ -759,11 +759,10 @@ class CRM_Event_Import_Parser_Participant extends CRM_Import_Parser {
 
     $this->_lineCount = 0;
     $this->_invalidRowCount = $this->_validCount = 0;
-    $this->_totalCount = $this->_conflictCount = 0;
+    $this->_totalCount = 0;
 
     $this->_errors = [];
     $this->_warnings = [];
-    $this->_conflicts = [];
 
     $this->_fileSize = number_format(filesize($fileName) / 1024.0, 2);
 
@@ -838,16 +837,6 @@ class CRM_Event_Import_Parser_Participant extends CRM_Import_Parser {
         $this->_errors[] = $values;
       }
 
-      if ($returnCode & self::CONFLICT) {
-        $this->_conflictCount++;
-        $recordNumber = $this->_lineCount;
-        if ($this->_haveColumnHeader) {
-          $recordNumber--;
-        }
-        array_unshift($values, $recordNumber);
-        $this->_conflicts[] = $values;
-      }
-
       if ($returnCode & self::DUPLICATE) {
         $this->_duplicateCount++;
         $recordNumber = $this->_lineCount;
@@ -888,14 +877,6 @@ class CRM_Event_Import_Parser_Participant extends CRM_Import_Parser {
         $this->_errorFileName = self::errorFileName(self::ERROR);
         self::exportCSV($this->_errorFileName, $headers, $this->_errors);
       }
-      if ($this->_conflictCount) {
-        $headers = array_merge([
-          ts('Line Number'),
-          ts('Reason'),
-        ], $customHeaders);
-        $this->_conflictFileName = self::errorFileName(self::CONFLICT);
-        self::exportCSV($this->_conflictFileName, $headers, $this->_conflicts);
-      }
       if ($this->_duplicateCount) {
         $headers = array_merge([
           ts('Line Number'),
@@ -977,7 +958,6 @@ class CRM_Event_Import_Parser_Participant extends CRM_Import_Parser {
     $store->set('totalRowCount', $this->_totalCount);
     $store->set('validRowCount', $this->_validCount);
     $store->set('invalidRowCount', $this->_invalidRowCount);
-    $store->set('conflictRowCount', $this->_conflictCount);
 
     switch ($this->_contactType) {
       case 'Individual':
@@ -995,9 +975,6 @@ class CRM_Event_Import_Parser_Participant extends CRM_Import_Parser {
     if ($this->_invalidRowCount) {
       $store->set('errorsFileName', $this->_errorFileName);
     }
-    if ($this->_conflictCount) {
-      $store->set('conflictsFileName', $this->_conflictFileName);
-    }
     if (isset($this->_rows) && !empty($this->_rows)) {
       $store->set('dataValues', $this->_rows);
     }

diff --git a/CRM/Import/Forms.php b/CRM/Import/Forms.php
index d2b7d98ad8ed66a2b94b5f29286268023d9ff889..3816383234d16941d69a72004be4f547b3280578 100644 (file)
--- a/CRM/Import/Forms.php
+++ b/CRM/Import/Forms.php
@@ -441,7 +441,7 @@ class CRM_Import_Forms extends CRM_Core_Form {
    * @return array|int
    *   One or more of the statues available - e.g
    *   CRM_Import_Parser::VALID
-   *   or [CRM_Import_Parser::ERROR, CRM_Import_Parser::CONFLICT]
+   *   or [CRM_Import_Parser::ERROR, CRM_Import_Parser::VALID]
    *
    * @throws \CRM_Core_Exception
    * @throws \API_Exception

diff --git a/CRM/Import/Parser.php b/CRM/Import/Parser.php
index 3ba55c5f48e9d58d5b8522e1e0443cd4cec1b9c7..1880d33b9acb8e0c7d1b9545ca53bb47bedf62a1 100644 (file)
--- a/CRM/Import/Parser.php
+++ b/CRM/Import/Parser.php
@@ -160,18 +160,6 @@ abstract class CRM_Import_Parser {
    */
   protected $_errors;
 
-  /**
-   * Total number of conflict lines
-   * @var int
-   */
-  protected $_conflictCount;
-
-  /**
-   * Array of conflict lines
-   * @var array
-   */
-  protected $_conflicts;
-
   /**
    * Total number of duplicate (from database) lines
    * @var int
@@ -260,13 +248,6 @@ abstract class CRM_Import_Parser {
    */
   protected $_errorFileName;
 
-  /**
-   * Filename of conflict data
-   *
-   * @var string
-   */
-  protected $_conflictFileName;
-
   /**
    * Filename of duplicate data
    *
@@ -502,10 +483,6 @@ abstract class CRM_Import_Parser {
         $fileName .= '.errors';
         break;
 
-      case self::CONFLICT:
-        $fileName .= '.conflicts';
-        break;
-
       case self::DUPLICATE:
         $fileName .= '.duplicates';
         break;
@@ -538,10 +515,6 @@ abstract class CRM_Import_Parser {
         $fileName = 'Import_Errors.csv';
         break;
 
-      case self::CONFLICT:
-        $fileName = 'Import_Conflicts.csv';
-        break;
-
       case self::DUPLICATE:
         $fileName = 'Import_Duplicates.csv';
         break;

diff --git a/CRM/Member/Import/Form/Preview.php b/CRM/Member/Import/Form/Preview.php
index 91959809adae6bb1aa5004967f53175a2b38c6b7..4c43964b58a67b334210a9a5d6a3857bb27544a3 100644 (file)
--- a/CRM/Member/Import/Form/Preview.php
+++ b/CRM/Member/Import/Form/Preview.php
@@ -32,7 +32,6 @@ class CRM_Member_Import_Form_Preview extends CRM_Import_Form_Preview {
     $dataValues = $this->get('dataValues');
     $mapper = $this->get('mapper');
     $invalidRowCount = $this->get('invalidRowCount');
-    $conflictRowCount = $this->get('conflictRowCount');
     $mismatchCount = $this->get('unMatchCount');
 
     //get the mapping name displayed if the mappingId is set
@@ -49,11 +48,6 @@ class CRM_Member_Import_Form_Preview extends CRM_Import_Form_Preview {
       $this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
 
-    if ($conflictRowCount) {
-      $urlParams = 'type=' . CRM_Import_Parser::CONFLICT . '&parser=CRM_Member_Import_Parser_Membership';
-      $this->set('downloadConflictRecordsUrl', 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));
@@ -66,9 +60,7 @@ class CRM_Member_Import_Form_Preview extends CRM_Import_Form_Preview {
       'totalRowCount',
       'validRowCount',
       'invalidRowCount',
-      'conflictRowCount',
       'downloadErrorRecordsUrl',
-      'downloadConflictRecordsUrl',
       'downloadMismatchRecordsUrl',
     ];
     $this->setStatusUrl();
@@ -87,7 +79,6 @@ class CRM_Member_Import_Form_Preview extends CRM_Import_Form_Preview {
   public function postProcess() {
     $fileName = $this->getSubmittedValue('uploadFile');
     $invalidRowCount = $this->get('invalidRowCount');
-    $conflictRowCount = $this->get('conflictRowCount');
     $onDuplicate = $this->get('onDuplicate');
 
     $mapper = $this->controller->exportValue('MapField', 'mapper');
@@ -160,8 +151,6 @@ class CRM_Member_Import_Form_Preview extends CRM_Import_Form_Preview {
       $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::CONFLICT . '&parser=CRM_Member_Import_Parser_Membership';
-      $this->set('downloadConflictRecordsUrl', 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
index 890725426b183b7d1e35d6df467be81ac87fa901..a21a567b6aca89953cdeab4b5f419fb4fe371e08 100644 (file)
--- a/CRM/Member/Import/Form/Summary.php
+++ b/CRM/Member/Import/Form/Summary.php
@@ -35,7 +35,6 @@ class CRM_Member_Import_Form_Summary extends CRM_Import_Form_Summary {
     $this->set('totalRowCount', $totalRowCount);
 
     $invalidRowCount = $this->get('invalidRowCount');
-    $conflictRowCount = $this->get('conflictRowCount');
     $duplicateRowCount = $this->get('duplicateRowCount');
     $onDuplicate = $this->get('onDuplicate');
     $mismatchCount = $this->get('unMatchCount');
@@ -70,7 +69,7 @@ class CRM_Member_Import_Form_Summary extends CRM_Import_Form_Summary {
       /* only subtract dupes from successful import if we're skipping */
 
       $this->set('validRowCount', $totalRowCount - $invalidRowCount -
-        $conflictRowCount - $duplicateRowCount - $mismatchCount
+        $duplicateRowCount - $mismatchCount
       );
     }
     $this->assign('dupeActionString', $dupeActionString);
@@ -79,8 +78,6 @@ class CRM_Member_Import_Form_Summary extends CRM_Import_Form_Summary {
       'totalRowCount',
       'validRowCount',
       'invalidRowCount',
-      'conflictRowCount',
-      'downloadConflictRecordsUrl',
       'downloadErrorRecordsUrl',
       'duplicateRowCount',
       'downloadDuplicateRecordsUrl',

diff --git a/CRM/Member/Import/Parser/Membership.php b/CRM/Member/Import/Parser/Membership.php
index 357339d5e529dc16e8fa83601b80d593d6798821..0e643ceb516c0450ebe344a4f8f7dff844e262b2 100644 (file)
--- a/CRM/Member/Import/Parser/Membership.php
+++ b/CRM/Member/Import/Parser/Membership.php
@@ -133,11 +133,10 @@ class CRM_Member_Import_Parser_Membership extends CRM_Import_Parser {
 
     $this->_lineCount = 0;
     $this->_invalidRowCount = $this->_validCount = 0;
-    $this->_totalCount = $this->_conflictCount = 0;
+    $this->_totalCount = 0;
 
     $this->_errors = [];
     $this->_warnings = [];
-    $this->_conflicts = [];
 
     $this->_fileSize = number_format(filesize($fileName) / 1024.0, 2);
 
@@ -214,13 +213,6 @@ class CRM_Member_Import_Parser_Membership extends CRM_Import_Parser {
         $this->_errors[] = $values;
       }
 
-      if ($returnCode & self::CONFLICT) {
-        $this->_conflictCount++;
-        $recordNumber = $this->_lineCount;
-        array_unshift($values, $recordNumber);
-        $this->_conflicts[] = $values;
-      }
-
       if ($returnCode & self::DUPLICATE) {
         $this->_duplicateCount++;
         $recordNumber = $this->_lineCount;
@@ -258,14 +250,6 @@ class CRM_Member_Import_Parser_Membership extends CRM_Import_Parser {
 
         self::exportCSV($this->_errorFileName, $headers, $this->_errors);
       }
-      if ($this->_conflictCount) {
-        $headers = array_merge([
-          ts('Line Number'),
-          ts('Reason'),
-        ], $customHeaders);
-        $this->_conflictFileName = self::errorFileName(self::CONFLICT);
-        self::exportCSV($this->_conflictFileName, $headers, $this->_conflicts);
-      }
       if ($this->_duplicateCount) {
         $headers = array_merge([
           ts('Line Number'),
@@ -367,7 +351,6 @@ class CRM_Member_Import_Parser_Membership extends CRM_Import_Parser {
     $store->set('totalRowCount', $this->_totalCount);
     $store->set('validRowCount', $this->_validCount);
     $store->set('invalidRowCount', $this->_invalidRowCount);
-    $store->set('conflictRowCount', $this->_conflictCount);
 
     switch ($this->_contactType) {
       case 'Individual':
@@ -385,9 +368,6 @@ class CRM_Member_Import_Parser_Membership extends CRM_Import_Parser {
     if ($this->_invalidRowCount) {
       $store->set('errorsFileName', $this->_errorFileName);
     }
-    if ($this->_conflictCount) {
-      $store->set('conflictsFileName', $this->_conflictFileName);
-    }
     if (isset($this->_rows) && !empty($this->_rows)) {
       $store->set('dataValues', $this->_rows);
     }

diff --git a/templates/CRM/Activity/Import/Form/Preview.tpl b/templates/CRM/Activity/Import/Form/Preview.tpl
index 111dddc6446d9b4e17d72a2b5121ccb0a36d003a..33b4be00097b4545e07e5d183016a7749492d91d 100644 (file)
--- a/templates/CRM/Activity/Import/Form/Preview.tpl
+++ b/templates/CRM/Activity/Import/Form/Preview.tpl
@@ -25,13 +25,6 @@
         </p>
     {/if}
 
-    {if $conflictRowCount}
-        <p class="error">
-        {ts 1=$conflictRowCount 2=$downloadConflictRecordsUrl}CiviCRM has detected %1 records with conflicting transaction ids within this data file. If you continue, these records will be skipped. OR, you can download a file with just these problem records - <a href='%2'>Download Conflicts</a>. Then correct them in the original import file, cancel this import and begin again at step 1.{/ts}
-        </p>
-    {/if}
-
-
     <p>{ts}Click 'Import Now' if you are ready to proceed.{/ts}</p>
  </div>
  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
@@ -54,17 +47,6 @@
     </tr>
     {/if}
 
-   {if $conflictRowCount}
-    <tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows{/ts}</td>
-        <td class="data">{$conflictRowCount}</td>
-        <td class="explanation">{ts}Rows with conflicting transaction ids within this file. These rows will be skipped (not imported).{/ts}
-            {if $conflictRowCount}
-                <p><a href="{$downloadConflictRecordsUrl}">{ts}Download Conflicts{/ts}</a></p>
-            {/if}
-        </td>
-    </tr>
-    {/if}
-
     <tr><td class="label crm-grid-cell">{ts}Valid Rows{/ts}</td>
         <td class="data">{$validRowCount}</td>
         <td class="explanation">{ts}Total rows to be imported.{/ts}</td>

diff --git a/templates/CRM/Activity/Import/Form/Summary.tpl b/templates/CRM/Activity/Import/Form/Summary.tpl
index 6f054ee7267656b7607aabb1e8b71b9a681f6d0b..09388501e89dc62e842e02f4a99bc7fb570a42c4 100644 (file)
--- a/templates/CRM/Activity/Import/Form/Summary.tpl
+++ b/templates/CRM/Activity/Import/Form/Summary.tpl
@@ -37,15 +37,6 @@
         </p>
     {/if}
 
-    {if $conflictRowCount}
-        <p class="error">
-        {ts count=$conflictRowCount plural='CiviCRM has detected %count records with conflicting transaction IDs within this data file or relative to existing activity records. These records have not been imported.'}CiviCRM has detected one record with conflicting transaction ID within this data file or relative to existing activity records. This record have not been imported.{/ts}
-        </p>
-        <p class="error">
-        {ts 1=$downloadConflictRecordsUrl}You can <a href='%1'>Download Conflicts</a>. You may then review these records to determine if they are actually conflicts, and correct the transaction IDs for those that are not.{/ts}
-        </p>
-    {/if}
-
     {if $duplicateRowCount}
         <p {if $dupeError}class="error"{/if}>
         {ts count=$duplicateRowCount plural='CiviCRM has detected %count records which are duplicates of existing CiviCRM activity records.'}CiviCRM has detected one record which is a duplicate of existing CiviCRM activity record.{/ts} {$dupeActionString}
@@ -85,17 +76,6 @@
     </tr>
     {/if}
 
-    {if $conflictRowCount}
-    <tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows (skipped){/ts}</td>
-        <td class="data">{$conflictRowCount}</td>
-        <td class="explanation">{ts}Rows with conflicting transaction IDs (NOT imported).{/ts}
-            {if $conflictRowCount}
-                <p><a href="{$downloadConflictRecordsUrl}">{ts}Download Conflicts{/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/Contact/Import/Form/Preview.tpl b/templates/CRM/Contact/Import/Form/Preview.tpl
index 93bea4cec1f2bd0f60dadbea14e95f867ee4223b..1dbbbb983009b9893752952ad22be27994974ce4 100644 (file)
--- a/templates/CRM/Contact/Import/Form/Preview.tpl
+++ b/templates/CRM/Contact/Import/Form/Preview.tpl
@@ -24,12 +24,6 @@
         </p>
     {/if}
 
-    {if $conflictRowCount}
-        <p class="error">
-        {ts 1=$conflictRowCount 2=$downloadConflictRecordsUrl}CiviCRM has detected %1 records with conflicting email addresses within this data file. If you continue, these records will be skipped. OR, you can download a file with just these problem records - <a href='%2'>Download Conflicts</a>. Then correct them in the original import file, cancel this import and begin again at step 1.{/ts}
-        </p>
-    {/if}
-
     <p>{ts}Click 'Import Now' if you are ready to proceed.{/ts}</p>
 </div>
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>

diff --git a/templates/CRM/Contact/Import/Form/Summary.tpl b/templates/CRM/Contact/Import/Form/Summary.tpl
index 1a4a9baad8f359890810e5bd04b507e498b1c047..39c022d0a08a7e15cf1c201fa5f84d3081d11906 100644 (file)
--- a/templates/CRM/Contact/Import/Form/Summary.tpl
+++ b/templates/CRM/Contact/Import/Form/Summary.tpl
@@ -37,15 +37,6 @@
         </p>
     {/if}
 
-    {if $conflictRowCount}
-        <p class="error">
-        {ts count=$conflictRowCount plural='CiviCRM has detected %count records with conflicting email addresses within this data file or relative to existing contact records. These records have not been imported.'}CiviCRM has detected one record with conflicting email addresses within this data file or relative to existing contact records. This record has not been imported.{/ts} {ts}CiviCRM does not allow multiple contact records to have the same primary email address.{/ts}
-        </p>
-        <p class="error">
-        {ts 1=$downloadConflictRecordsUrl}You can <a href='%1'>Download Conflicts</a>. You may then review these records to determine if they are actually conflicts, and correct the email addresses for those that are not.{/ts}
-        </p>
-    {/if}
-
     {if $duplicateRowCount}
         <p {if $dupeError}class="error"{/if}>
         {ts count=$duplicateRowCount plural='CiviCRM has detected %count records which are duplicates of existing CiviCRM contact records.'}CiviCRM has detected one record which is a duplicate of existing CiviCRM contact record.{/ts} {$dupeActionString}
@@ -92,17 +83,6 @@
     </tr>
     {/if}
 
-    {if $conflictRowCount}
-    <tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows (skipped){/ts}</td>
-        <td class="data">{$conflictRowCount}</td>
-        <td class="explanation">{ts}Rows with conflicting email addresses (NOT imported).{/ts}
-            {if $conflictRowCount}
-                <div class="action-link"><a href="{$downloadConflictRecordsUrl}"><i class="crm-i fa-download" aria-hidden="true"></i> {ts}Download Conflicts{/ts}</a></div>
-            {/if}
-        </td>
-    </tr>
-    {/if}
-
     {if $duplicateRowCount && $dupeError}
     <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/Preview.tpl b/templates/CRM/Contribute/Import/Form/Preview.tpl
index 2f1a625acd6b155d1a57f7f37f650d42f0272a20..bf4557bcf0c06a53f28676d8c928a7f4d2096f8e 100644 (file)
--- a/templates/CRM/Contribute/Import/Form/Preview.tpl
+++ b/templates/CRM/Contribute/Import/Form/Preview.tpl
@@ -24,13 +24,6 @@
         </p>
     {/if}
 
-    {if $conflictRowCount}
-        <p class="error">
-        {ts 1=$conflictRowCount 2=$downloadConflictRecordsUrl}CiviCRM has detected %1 records with conflicting transaction ids within this data file. If you continue, these records will be skipped.  You can download a file with just these problem records: <a href='%2'>Download Conflicts</a>.  If you wish, you can then correct them in the original import file, cancel this import and begin again at step 1.{/ts}
-        </p>
-    {/if}
-
-
     <p>{ts}Click 'Import Now' if you are ready to proceed.{/ts}</p>
  </div>
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
@@ -53,17 +46,6 @@
     </tr>
     {/if}
 
-    {if $conflictRowCount}
-    <tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows{/ts}</td>
-        <td class="data">{$conflictRowCount}</td>
-        <td class="explanation">{ts}Rows with conflicting transaction ids within this file. These rows will be skipped (not imported).{/ts}
-            {if $conflictRowCount}
-                <p><a href="{$downloadConflictRecordsUrl}">{ts}Download Conflicts{/ts}</a></p>
-            {/if}
-        </td>
-    </tr>
-    {/if}
-
     <tr><td class="label crm-grid-cell">{ts}Valid Rows{/ts}</td>
         <td class="data">{$validRowCount}</td>
         <td class="explanation">{ts}Total rows to be imported.{/ts}</td>

diff --git a/templates/CRM/Contribute/Import/Form/Summary.tpl b/templates/CRM/Contribute/Import/Form/Summary.tpl
index ae7bc83cb7894dc7613b9e9c7280f385bd0a0b86..7d0c86006049c8e7ddf60854162a3a7e365ffa4f 100644 (file)
--- a/templates/CRM/Contribute/Import/Form/Summary.tpl
+++ b/templates/CRM/Contribute/Import/Form/Summary.tpl
@@ -36,15 +36,6 @@
         </p>
     {/if}
 
-    {if $conflictRowCount}
-        <p class="error">
-        {ts count=$conflictRowCount plural='CiviCRM has detected %count records with conflicting transaction IDs within this data file or relative to existing contribution records. These records have not been imported.'}CiviCRM has detected one record with conflicting transaction ID within this data file or relative to existing contribution records. This record has not been imported.{/ts}
-        </p>
-        <p class="error">
-        {ts 1=$downloadConflictRecordsUrl}You can <a href="%1">Download Conflicts</a>. You may then review these records to determine if they are actually conflicts, and correct the transaction IDs for those that are not.{/ts}
-        </p>
-    {/if}
-
     {if $duplicateRowCount}
         <p {if $dupeError}class="error"{/if}>
         {ts count=$duplicateRowCount plural='CiviCRM has detected %count records which are duplicates of existing CiviCRM contribution records.'}CiviCRM has detected one record which is a duplicate of existing CiviCRM contribution record.{/ts} {$dupeActionString}
@@ -119,17 +110,6 @@
     </tr>
     {/if}
 
-    {if $conflictRowCount}
-    <tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows (skipped){/ts}</td>
-        <td class="data">{$conflictRowCount}</td>
-        <td class="explanation">{ts}Rows with conflicting transaction IDs (NOT imported).{/ts}
-            {if $conflictRowCount}
-                <p><a href="{$downloadConflictRecordsUrl}">{ts}Download Conflicts{/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/Event/Import/Form/Preview.tpl b/templates/CRM/Event/Import/Form/Preview.tpl
index 62220cc98572bd40f4820886db183c50bd670c74..e7266aac90b4c3275eee97a748f584ffc5b2d7b6 100644 (file)
--- a/templates/CRM/Event/Import/Form/Preview.tpl
+++ b/templates/CRM/Event/Import/Form/Preview.tpl
@@ -25,13 +25,6 @@
         </p>
     {/if}
 
-    {if $conflictRowCount}
-        <p class="error">
-        {ts 1=$conflictRowCount 2=$downloadConflictRecordsUrl}CiviCRM has detected %1 records with conflicting participant IDs within this data file. If you continue, these records will be skipped. OR, you can download a file with just these problem records - <a href='%2'>Download Conflicts</a>. Then correct them in the original import file, cancel this import and begin again at step 1.{/ts}
-        </p>
-    {/if}
-
-
     <p>{ts}Click 'Import Now' if you are ready to proceed.{/ts}</p>
  </div>
 
@@ -56,17 +49,6 @@
     </tr>
     {/if}
 
-    {if $conflictRowCount}
-    <tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows{/ts}</td>
-        <td class="data">{$conflictRowCount}</td>
-        <td class="explanation">{ts}Rows with conflicting participant IDs within this file. These rows will be skipped (not imported).{/ts}
-            {if $conflictRowCount}
-                <p><a href="{$downloadConflictRecordsUrl}">{ts}Download Conflicts{/ts}</a></p>
-            {/if}
-        </td>
-    </tr>
-    {/if}
-
     <tr><td class="label crm-grid-cell">{ts}Valid Rows{/ts}</td>
         <td class="data">{$validRowCount}</td>
         <td class="explanation">{ts}Total rows to be imported.{/ts}</td>

diff --git a/templates/CRM/Event/Import/Form/Summary.tpl b/templates/CRM/Event/Import/Form/Summary.tpl
index 5d600cdf402c06eb6feba6b35474efd019f9dfe6..b27daf6ad08a3c80c79e4b59eda91418f3b32028 100644 (file)
--- a/templates/CRM/Event/Import/Form/Summary.tpl
+++ b/templates/CRM/Event/Import/Form/Summary.tpl
@@ -38,15 +38,6 @@
         </p>
     {/if}
 
-    {if $conflictRowCount}
-        <p class="error">
-        {ts count=$conflictRowCount plural='CiviCRM has detected %count records with conflicting participant IDs within this data file or relative to existing participant records. These records have not been imported.'}CiviCRM has detected one record with conflicting participant ID within this data file or relative to existing participant records. This record has not been imported.{/ts}
-        </p>
-        <p class="error">
-        {ts 1=$downloadConflictRecordsUrl}You can <a href="%1">Download Conflicts</a>. You may then review these records to determine if they are actually conflicts, and correct the participant IDs for those that are not.{/ts}
-        </p>
-    {/if}
-
     {if $duplicateRowCount}
         <p {if $dupeError}class="error"{/if}>
         {ts count=$duplicateRowCount plural='CiviCRM has detected %count records which are duplicates of existing CiviCRM participant records.'}CiviCRM has detected one record which is a duplicate of existing CiviCRM participant record.{/ts} {$dupeActionString}
@@ -89,17 +80,6 @@
     </tr>
     {/if}
 
-    {if $conflictRowCount}
-    <tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows (skipped){/ts}</td>
-        <td class="data">{$conflictRowCount}</td>
-        <td class="explanation">{ts}Rows with conflicting participant IDs (NOT imported).{/ts}
-            {if $conflictRowCount}
-                <p><a href="{$downloadConflictRecordsUrl}">{ts}Download Conflicts{/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/Member/Import/Form/Preview.tpl b/templates/CRM/Member/Import/Form/Preview.tpl
index 390b7e225052ba4e18ac449c7500ed00608abf07..809193341af134a85a1e1a99d094e16e0a3deab5 100644 (file)
--- a/templates/CRM/Member/Import/Form/Preview.tpl
+++ b/templates/CRM/Member/Import/Form/Preview.tpl
@@ -25,13 +25,6 @@
         </p>
     {/if}
 
-    {if $conflictRowCount}
-        <p class="error">
-        {ts 1=$conflictRowCount 2=$downloadConflictRecordsUrl}CiviCRM has detected %1 records with conflicting transaction ids within this data file. If you continue, these records will be skipped. OR, you can download a file with just these problem records - <a href='%2'>Download Conflicts</a>. Then correct them in the original import file, cancel this import and begin again at step 1.{/ts}
-        </p>
-    {/if}
-
-
     <p>{ts}Click 'Import Now' if you are ready to proceed.{/ts}</p>
  </div>
  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
@@ -54,17 +47,6 @@
     </tr>
     {/if}
 
-    {if $conflictRowCount}
-    <tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows{/ts}</td>
-        <td class="data">{$conflictRowCount}</td>
-        <td class="explanation">{ts}Rows with conflicting transaction ids within this file. These rows will be skipped (not imported).{/ts}
-            {if $conflictRowCount}
-                <div class="action-link"><a href="{$downloadConflictRecordsUrl}"><i class="crm-i fa-download" aria-hidden="true"></i> {ts}Download Conflicts{/ts}</a></div>
-            {/if}
-        </td>
-    </tr>
-    {/if}
-
     <tr><td class="label crm-grid-cell">{ts}Valid Rows{/ts}</td>
         <td class="data">{$validRowCount}</td>
         <td class="explanation">{ts}Total rows to be imported.{/ts}</td>

diff --git a/templates/CRM/Member/Import/Form/Summary.tpl b/templates/CRM/Member/Import/Form/Summary.tpl
index 70fd4ccdc171b05758c0c152287b19bc0f49373c..f2ea3263f18ded65794524ad98009de7ffc5b3f7 100644 (file)
--- a/templates/CRM/Member/Import/Form/Summary.tpl
+++ b/templates/CRM/Member/Import/Form/Summary.tpl
@@ -37,15 +37,6 @@
         </p>
     {/if}
 
-    {if $conflictRowCount}
-        <p class="error">
-        {ts count=$conflictRowCount plural='CiviCRM has detected %count records with conflicting transaction IDs within this data file or relative to existing membership records. These records have not been imported.'}CiviCRM has detected one record with conflicting transaction ID within this data file or relative to existing membership records. This record has not been imported.{/ts}
-        </p>
-        <p class="error">
-        {ts 1=$downloadConflictRecordsUrl}You can <a href="%1">Download Conflicts</a>. You may then review these records to determine if they are actually conflicts, and correct the transaction IDs for those that are not.{/ts}
-        </p>
-    {/if}
-
     {if $duplicateRowCount}
         <p {if $dupeError}class="error"{/if}>
         {ts count=$duplicateRowCount plural='CiviCRM has detected %count records which are duplicates of existing CiviCRM membership records.'}CiviCRM has detected one record which is a duplicate of existing CiviCRM membership record.{/ts} {$dupeActionString}
@@ -85,17 +76,6 @@
     </tr>
     {/if}
 
-    {if $conflictRowCount}
-    <tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows (skipped){/ts}</td>
-        <td class="data">{$conflictRowCount}</td>
-        <td class="explanation">{ts}Rows with conflicting transaction IDs (NOT imported).{/ts}
-            {if $conflictRowCount}
-                <p><a href="{$downloadConflictRecordsUrl}">{ts}Download Conflicts{/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>