CRM-16788 formatting fixes
authorEileen McNaughton <eileen@fuzion.co.nz>
Sun, 5 Jul 2015 11:21:10 +0000 (23:21 +1200)
committerEileen McNaughton <eileen@fuzion.co.nz>
Sun, 5 Jul 2015 11:21:10 +0000 (23:21 +1200)
CRM/Member/Form/Membership.php
tests/phpunit/CRM/Member/Form/MembershipTest.php

index 17833e6f068398bebe1284ea8d171231350cceaf..fe5af580408a1c61b6a05cd0bf05e2c4b5a34945 100644 (file)
@@ -1463,8 +1463,8 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
       }
 
       // add all the additional payment params we need
-      $this->_params["state_province-{$this->_bltID}"] = $this->_params["billing_state_province-{$this->_bltID}"] =
-        CRM_Core_PseudoConstant::stateProvinceAbbreviation($formValues["billing_state_province_id-{$this->_bltID}"]);
+      $this->_params["state_province-{$this->_bltID}"] = $this->_params["billing_state_province-{$this->_bltID}"]
+        CRM_Core_PseudoConstant::stateProvinceAbbreviation($formValues["billing_state_province_id-{$this->_bltID}"]);
       $this->_params["country-{$this->_bltID}"] = $this->_params["billing_country-{$this->_bltID}"] = CRM_Core_PseudoConstant::countryIsoCode($formValues["billing_country_id-{$this->_bltID}"]);
 
       $this->_params['year'] = CRM_Core_Payment_Form::getCreditCardExpirationYear($formValues);
index 3d89a74e474f338c59ba88d70468c18cdf13d08d..1228521c029f6dc10dd81f453bc265c2b3bc2da7 100644 (file)
@@ -519,13 +519,13 @@ class CRM_Member_Form_MembershipTest extends CiviUnitTestCase {
       'contact_id' => $this->_individualId,
       'is_test' => TRUE,
     ));
-/* Not currently passing.
-    $this->callAPISuccessGetCount('LineItem', array(
+    /* Not currently passing.
+      $this->callAPISuccessGetCount('LineItem', array(
       'entity_id' => $membership['id'],
       'entity_table' => 'civicrm_membership',
       'contribution_id' => $contribution['id'],
     ), 1);
-*/
+    */
   }
 
   /**
@@ -542,4 +542,5 @@ class CRM_Member_Form_MembershipTest extends CiviUnitTestCase {
     $form->_bltID = 5;
     return $form;
   }
+
 }