Remove some more unused code

diff --git a/CRM/Contribute/Import/Parser/Contribution.php b/CRM/Contribute/Import/Parser/Contribution.php
index f98f1bc2d161bd8c935dc9996dd0983d7ac50769..91095018a4d35d1db5832db88776f16b74c99db5 100644 (file)
--- a/CRM/Contribute/Import/Parser/Contribution.php
+++ b/CRM/Contribute/Import/Parser/Contribution.php
@@ -201,6 +201,8 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
    * The initializer code, called before the processing
    */
   public function init() {
+    // Force re-load of user job.
+    unset($this->userJob);
     $this->setFieldMetadata();
     foreach ($this->getImportableFieldsMetadata() as $name => $field) {
       $this->addField($name, $field['title'], $field['type'], $field['headerPattern'], $field['dataPattern']);
@@ -212,7 +214,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
    */
   protected function setFieldMetadata() {
     if (empty($this->importableFieldsMetadata)) {
-      $fields = CRM_Contribute_BAO_Contribution::importableFields($this->_contactType, FALSE);
+      $fields = CRM_Contribute_BAO_Contribution::importableFields($this->getContactType(), FALSE);
 
       $fields = array_merge($fields,
         [
@@ -220,6 +222,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
             'title' => ts('Soft Credit'),
             'softCredit' => TRUE,
             'headerPattern' => '/Soft Credit/i',
+            'options' => FALSE,
           ],
         ]
       );
@@ -250,29 +253,6 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
     }
   }
 
-  /**
-   * Handle the values in summary mode.
-   *
-   * @param array $values
-   *   The array of values belonging to this line.
-   *
-   * @return int
-   *   CRM_Import_Parser::VALID or CRM_Import_Parser::ERROR
-   */
-  public function summary(&$values) {
-    $rowNumber = (int) ($values[array_key_last($values)]);
-    $params = $this->getMappedRow($values);
-    $errorMessage = implode(';', $this->getInvalidValues($params));
-    $params['contact_type'] = 'Contribution';
-
-    if ($errorMessage) {
-      $this->setImportStatus($rowNumber, 'ERROR', "Invalid value for field(s) : $errorMessage");
-      return CRM_Import_Parser::ERROR;
-    }
-
-    return CRM_Import_Parser::VALID;
-  }
-
   /**
    * Handle the values in import mode.
    *
@@ -302,15 +282,15 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
       if ($this->isSkipDuplicates() &&
         (!empty($paramValues['contribution_contact_id']) || !empty($paramValues['external_identifier']))
       ) {
-        $paramValues['contact_type'] = $this->_contactType;
+        $paramValues['contact_type'] = $this->getContactType();
       }
       elseif ($this->isUpdateExisting() &&
         (!empty($paramValues['contribution_id']) || !empty($values['trxn_id']) || !empty($paramValues['invoice_id']))
       ) {
-        $paramValues['contact_type'] = $this->_contactType;
+        $paramValues['contact_type'] = $this->getContactType();
       }
       elseif (!empty($paramValues['pledge_payment'])) {
-        $paramValues['contact_type'] = $this->_contactType;
+        $paramValues['contact_type'] = $this->getContactType();
       }
 
       $formatError = $this->deprecatedFormatParams($paramValues, $formatted);
@@ -451,7 +431,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
 
         // Using new Dedupe rule.
         $ruleParams = [
-          'contact_type' => $this->_contactType,
+          'contact_type' => $this->getContactType(),
           'used' => 'Unsupervised',
         ];
         $fieldsArray = CRM_Dedupe_BAO_DedupeRule::dedupeRuleFields($ruleParams);

diff --git a/templates/CRM/Contribute/Import/Form/Preview.tpl b/templates/CRM/Contribute/Import/Form/Preview.tpl
index 61f1d14e11f9541e8e213eba906154f30209dc9f..03458208b07cf513aeed2132031ecde7e4fbb647 100644 (file)
--- a/templates/CRM/Contribute/Import/Form/Preview.tpl
+++ b/templates/CRM/Contribute/Import/Form/Preview.tpl
@@ -27,7 +27,7 @@
     <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>
- {include file="CRM/common/importProgress.tpl"}
+
  {* Summary Preview (record counts) *}
  <table id="preview-counts" class="report">
     <tr><td class="label crm-grid-cell">{ts}Total Rows{/ts}</td>