Remove legacy CiviCRM version support from extension.

eileenmcnaughton · eileenmcnaughton · commit 716768bcd469 · 2017-03-06T18:11:28.000+13:00
Going forwards each release will support the current latest. Older releases will continue to support older versions
diff --git a/CRM/Core/Page/PaymentPage.php b/CRM/Core/Page/PaymentPage.php
@@ -21,12 +21,9 @@ public function run() {
     $formData = $this->getTransparentRedirectFormData(CRM_Utils_Request::retrieve('key', 'String', CRM_Core_DAO::$_nullObject, TRUE));
     $paymentProcessorID = $formData['payment_processor_id'];
     $paymentProcessor = civicrm_api3('payment_processor', 'getsingle', array('id' => $paymentProcessorID));
-    if (omnipaymultiprocessor__versionAtLeast(4.7)) {
-      $processor = Civi\Payment\System::singleton()->getByProcessor($paymentProcessor);
-    }
-    else {
-      $processor = CRM_Core_Payment::singleton('contribute', $paymentProcessor);
-    }
+
+    $processor = Civi\Payment\System::singleton()->getByProcessor($paymentProcessor);
+
     $displayFields = $processor->getTransparentDirectDisplayFields();
     foreach ($displayFields as $fieldName => $displayField) {
       if ($displayField['htmlType'] == 'date') {
diff --git a/CRM/Core/Payment/OmnipayMultiProcessor.php b/CRM/Core/Payment/OmnipayMultiProcessor.php
@@ -265,7 +265,7 @@ private function saveBillingAddressIfRequired($params) {
    * @return bool
    */
   private function hasBillingAddressFields($params) {
-    $billingFields = array_intersect_key($params, array_flip($this->getBillingAddressFieldsPre47()));
+    $billingFields = array_intersect_key($params, array_flip($this->getBillingAddressFields()));
     return !empty($billingFields);
   }
 
@@ -446,38 +446,6 @@ public function getPaymentFormFields() {
     return $this->_paymentProcessor['payment_type'] == 1 ? $this->getCreditCardFormFields() : $this->getDirectDebitFormFields();
   }
 
-  /**
-   * Get name for the payment information type.
-   * @todo - use option group + name field (like Omnipay does)
-   * @return string
-   */
-  public function getPaymentTypeName() {
-    return $this->_paymentProcessor['payment_type'] == 1 ? 'credit_card' : 'direct_debit';
-  }
-
-  /**
-   * Get label for the payment information type.
-   *
-   * We are overriding this for the transparent redirect use case.
-   * Cybersource (our current example) adds billing details which is what we
-   * are calling this here.
-   *
-   * @return string
-   */
-  public function getPaymentTypeLabel() {
-    switch ($this->_paymentProcessor['payment_type']) {
-      case 1:
-        return 'Credit Card';
-
-      case 2:
-        return 'Direct Debit';
-
-      default:
-        return 'Billing';
-    }
-    return $this->_paymentProcessor['payment_type'] == 1 ? 'Credit Card' : 'Direct Debit';
-  }
-
   /**
    * Get billing fields required for this block.
    *
@@ -632,147 +600,6 @@ public function getBillingAddressFields($billingLocationID = NULL) {
     return $billingFields;
   }
 
-  /**
-   * Get core CiviCRM address fields.
-   *
-   * @return array
-   */
-  private function getBillingAddressFieldsPre47() {
-    $billingFields = array();
-    foreach (array(
-      'street_address',
-      'city',
-      'state_province_id',
-      'postal_code',
-      'country_id',
-      ) as $addressField) {
-      $billingFields[$addressField]  = 'billing_' . $addressField . '-' . CRM_Core_BAO_LocationType::getBilling();
-    }
-    return $billingFields;
-  }
-
-  /**
-   * Get metadata for payment form fields.
-   *
-   * @return array
-   */
-  public function getPaymentFormFieldsMetadata() {
-    // @todo - handle redirect for 4.7
-    return parent::getPaymentFormFieldsMetadata();
-    return self::getBillingAddressFieldsMetadataPre47();
-  }
-
-  /**
-   * Get form metadata for address fields.
-   *
-   * At the moment this is being called from getPaymentFormFields when we are
-   * dealing with a transparent redirect. It is a bit Cybersource use-casey.
-   *
-   * @return array
-   *   Array of metadata for address fields.
-   */
-  public function getBillingAddressFieldsMetadataPre47() {
-    $metadata = array();
-    $billingID = CRM_Core_BAO_LocationType::getBilling();
-    $metadata['billing_first_name'] = array(
-      'htmlType' => 'text',
-      'name' => 'billing_first_name',
-      'title' => ts('Billing First Name'),
-      'cc_field' => TRUE,
-      'attributes' => array(
-        'size' => 30,
-        'maxlength' => 60,
-        'autocomplete' => 'off',
-      ),
-      'is_required' => TRUE,
-    );
-
-    $metadata['billing_middle_name'] = array(
-      'htmlType' => 'text',
-      'name' => 'billing_middle_name',
-      'title' => ts('Billing Middle Name'),
-      'cc_field' => TRUE,
-      'attributes' => array(
-        'size' => 30,
-        'maxlength' => 60,
-        'autocomplete' => 'off',
-      ),
-      'is_required' => FALSE,
-    );
-
-    $metadata['billing_last_name'] = array(
-      'htmlType' => 'text',
-      'name' => 'billing_last_name',
-      'title' => ts('Billing Last Name'),
-      'cc_field' => TRUE,
-      'attributes' => array(
-        'size' => 30,
-        'maxlength' => 60,
-        'autocomplete' => 'off',
-      ),
-      'is_required' => TRUE,
-    );
-
-    $metadata["billing_street_address-{$billingID}"] = array(
-      'htmlType' => 'text',
-      'name' => "billing_street_address-{$billingID}",
-      'title' => ts('Street Address'),
-      'cc_field' => TRUE,
-      'attributes' => array(
-        'size' => 30,
-        'maxlength' => 60,
-        'autocomplete' => 'off',
-      ),
-      'is_required' => TRUE,
-    );
-
-    $metadata["billing_city-{$billingID}"] = array(
-      'htmlType' => 'text',
-      'name' => "billing_city-{$billingID}",
-      'title' => ts('City'),
-      'cc_field' => TRUE,
-      'attributes' => array(
-        'size' => 30,
-        'maxlength' => 60,
-        'autocomplete' => 'off',
-      ),
-      'is_required' => TRUE,
-    );
-
-    $metadata["billing_state_province_id-{$billingID}"] = array(
-      'htmlType' => 'chainSelect',
-      'title' => ts('State/Province'),
-      'name' => "billing_state_province_id-{$billingID}",
-      'cc_field' => TRUE,
-      'is_required' => TRUE,
-    );
-
-    $metadata["billing_postal_code-{$billingID}"] = array(
-      'htmlType' => 'text',
-      'name' => "billing_postal_code-{$billingID}",
-      'title' => ts('Postal Code'),
-      'cc_field' => TRUE,
-      'attributes' => array(
-        'size' => 30,
-        'maxlength' => 60,
-        'autocomplete' => 'off',
-      ),
-      'is_required' => TRUE,
-    );
-
-    $metadata["billing_country_id-{$billingID}"] = array(
-      'htmlType' => 'select',
-      'name' => "billing_country_id-{$billingID}",
-      'title' => ts('Country'),
-      'cc_field' => TRUE,
-      'attributes' => array(
-        '' => ts('- select -'),
-      ) + CRM_Core_PseudoConstant::country(),
-      'is_required' => TRUE,
-    );
-    return $metadata;
-  }
-
   /**
    * Handle response from processor.
    *
@@ -933,9 +760,6 @@ protected function redirectOrExit($outcome) {
    * @throws \CiviCRM_API3_Exception
    */
   protected function storePaymentToken($params, $contribution, $tokenReference) {
-    if (!omnipaymultiprocessor__versionAtLeast(4.6)) {
-      return;
-    }
     $contributionRecurID = $contribution['contribution_recur_id'];
     $token = civicrm_api3('payment_token', 'create', array(
       'contact_id' => $contribution['contact_id'],
diff --git a/CRM/Core/Payment/PaymentExtended.php b/CRM/Core/Payment/PaymentExtended.php
@@ -182,26 +182,13 @@ protected function getGoBackUrl($qfKey) {
    *    URL to notify outcome of transaction.
    */
   protected function getNotifyUrl($allowLocalHost = FALSE) {
-    if (omnipaymultiprocessor__versionAtLeast(4.6)) {
-      $url = CRM_Utils_System::url(
-        'civicrm/payment/ipn/' . $this->transaction_id . '/' . $this->_paymentProcessor['id'],
-        array(),
-        TRUE,
-        NULL,
-        FALSE
-      );
-    }
-    else {
-      $url = CRM_Utils_System::url(
-        'civicrm/payment/ipn',
-        array(
-          'processor_id' => $this->_paymentProcessor['id'],
-        ),
-        TRUE,
-        NULL,
-        FALSE
-      );
-    }
+    $url = CRM_Utils_System::url(
+      'civicrm/payment/ipn/' . $this->transaction_id . '/' . $this->_paymentProcessor['id'],
+      array(),
+      TRUE,
+      NULL,
+      FALSE
+    );
     return $allowLocalHost ? $url : ((stristr($url, '.')) ? $url : '');
   }
 
@@ -288,20 +275,12 @@ protected function handleError($level, $message, $context, $errorCode = 9001, $u
     // Reset gateway to NULL so don't cache it. The size of the object or closures within it could
     // cause problems when serializing & saving.
     $this->gateway = NULL;
-    if (omnipaymultiprocessor__versionAtLeast(4.5)) {
-      $log = new CRM_Utils_SystemLogger();
-      $log->log($level, $message, (array) $context);
-    }
-    else {
-      CRM_Core_Error::debug($errorCode . ': ' . $message . print_r($context, TRUE));
-    }
+    $log = new CRM_Utils_SystemLogger();
+    $log->log($level, $message, (array) $context);
+
     $userMessage = $userMessage ? $userMessage : $message;
     CRM_Core_Session::setStatus($userMessage);
-    if (omnipaymultiprocessor__versionAtLeast(4.7)) {
-      throw new \Civi\Payment\Exception\PaymentProcessorException($userMessage);
-    }
-
-    return new CRM_Core_Error();
+    throw new \Civi\Payment\Exception\PaymentProcessorException($userMessage);
   }
 
   /**
diff --git a/info.xml b/info.xml
@@ -18,9 +18,6 @@
   <version>1.9</version>
   <develStage>stable</develStage>
   <compatibility>
-    <ver>4.4</ver>
-    <ver>4.5</ver>
-    <ver>4.6</ver>
     <ver>4.7</ver>
   </compatibility>
   <comments>This module integrates the omnipay library with CiviCRM</comments>
diff --git a/omnipaymultiprocessor.php b/omnipaymultiprocessor.php
diff --git a/templates/SubstituteBillingBlock.tpl b/templates/SubstituteBillingBlock.tpl
