X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FAdmin%2FForm%2FPaymentProcessor.php;h=eda41c979c795d152ccdc6f814450da83fac0799;hb=d25dd0ee5e47188c3ea9ad2918f627cfac97ddbd;hp=95fabcbf230e89d6b8eafbcb26c7e83d6a2806d5;hpb=39dfb3109e293c4d596a66e6590a1ed7650bd37e;p=civicrm-core.git diff --git a/CRM/Admin/Form/PaymentProcessor.php b/CRM/Admin/Form/PaymentProcessor.php index 95fabcbf23..eda41c979c 100644 --- a/CRM/Admin/Form/PaymentProcessor.php +++ b/CRM/Admin/Form/PaymentProcessor.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * @@ -181,7 +181,10 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form { $attributes['name'], TRUE ); - $this->addRule('name', ts('Name already exists in Database.'), 'objectExists', array('CRM_Financial_DAO_PaymentProcessor', $this->_id)); + $this->addRule('name', ts('Name already exists in Database.'), 'objectExists', array( + 'CRM_Financial_DAO_PaymentProcessor', + $this->_id, + )); $this->add('text', 'description', ts('Description'), $attributes['description'] @@ -239,8 +242,9 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form { $errors = array(); if (!(self::checkSection($fields, $errors) || - self::checkSection($fields, $errors, 'test') - )) { + self::checkSection($fields, $errors, 'test') + ) + ) { $errors['_qf_default'] = ts('You must have at least the test or live section filled'); } @@ -306,7 +310,7 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form { $domainID = CRM_Core_Config::domainID(); $dao = new CRM_Financial_DAO_PaymentProcessor(); - $dao->id = $this->_id; + $dao->id = $this->_id; $dao->domain_id = $domainID; if (!$dao->find(TRUE)) { return $defaults; @@ -316,8 +320,8 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form { // now get testID $testDAO = new CRM_Financial_DAO_PaymentProcessor(); - $testDAO->name = $dao->name; - $testDAO->is_test = 1; + $testDAO->name = $dao->name; + $testDAO->is_test = 1; $testDAO->domain_id = $domainID; if ($testDAO->find(TRUE)) { $this->_testID = $testDAO->id; @@ -344,7 +348,7 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form { if ($this->_action & CRM_Core_Action::DELETE) { CRM_Financial_BAO_PaymentProcessor::del($this->_id); CRM_Core_Session::setStatus("", ts('Payment Processor Deleted.'), "success"); - return; + return NULL; } $values = $this->controller->exportValues($this->_name); @@ -367,14 +371,14 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form { * @param int $domainID * @param $test * - * @return Void + * @return void */ public function updatePaymentProcessor(&$values, $domainID, $test) { $dao = new CRM_Financial_DAO_PaymentProcessor(); - $dao->id = $test ? $this->_testID : $this->_id; - $dao->domain_id = $domainID; - $dao->is_test = $test; + $dao->id = $test ? $this->_testID : $this->_id; + $dao->domain_id = $domainID; + $dao->is_test = $test; $dao->is_default = CRM_Utils_Array::value('is_default', $values, 0); $dao->is_active = CRM_Utils_Array::value('is_active', $values, 0); @@ -392,9 +396,9 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form { } // also copy meta fields from the info DAO - $dao->is_recur = $this->_ppDAO->is_recur; + $dao->is_recur = $this->_ppDAO->is_recur; $dao->billing_mode = $this->_ppDAO->billing_mode; - $dao->class_name = $this->_ppDAO->class_name; + $dao->class_name = $this->_ppDAO->class_name; $dao->payment_type = $this->_ppDAO->payment_type; $dao->save(); @@ -410,4 +414,5 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form { ); CRM_Financial_BAO_FinancialTypeAccount::add($params); } + }