From 691df66ddc901665535b1acb1d270648c26985d2 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 6 Jan 2015 13:09:19 -0800 Subject: [PATCH] INFRA-132 - CRM/Batch - phpcbf --- CRM/Batch/BAO/Batch.php | 28 ++++++++++---------- CRM/Batch/Form/Batch.php | 2 +- CRM/Batch/Form/Entry.php | 55 ++++++++++++++++++++-------------------- CRM/Batch/Page/AJAX.php | 6 ++--- CRM/Batch/Page/Batch.php | 6 ++--- 5 files changed, 49 insertions(+), 48 deletions(-) diff --git a/CRM/Batch/BAO/Batch.php b/CRM/Batch/BAO/Batch.php index 863db0b3eb..bd9840fcdb 100755 --- a/CRM/Batch/BAO/Batch.php +++ b/CRM/Batch/BAO/Batch.php @@ -176,7 +176,7 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch { $batch = new CRM_Batch_DAO_Batch(); $batch->id = $batchId; $batch->delete(); - return true; + return TRUE; } /** @@ -198,7 +198,7 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch { // get batch totals for open batches $fetchTotals = array(); - $batchStatus = CRM_Core_PseudoConstant::get('CRM_Batch_DAO_Batch', 'status_id', array('labelColumn' => 'name')); + $batchStatus = CRM_Core_PseudoConstant::get('CRM_Batch_DAO_Batch', 'status_id', array('labelColumn' => 'name')); $batchStatus = array( array_search('Open', $batchStatus), array_search('Reopened', $batchStatus), @@ -311,9 +311,11 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch { case 'Open': CRM_Utils_Array::remove($newLinks, 'reopen', 'download'); break; + case 'Closed': CRM_Utils_Array::remove($newLinks, 'close', 'edit', 'download'); break; + case 'Exported': CRM_Utils_Array::remove($newLinks, 'close', 'edit', 'reopen', 'export'); } @@ -329,7 +331,7 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch { } $tokens = array('id' => $object->id, 'status' => $values['status_id']); if ($values['status_id'] == array_search('Exported', $batchStatusByName)) { - $aid = CRM_Core_OptionGroup::getValue('activity_type','Export Accounting Batch'); + $aid = CRM_Core_OptionGroup::getValue('activity_type', 'Export Accounting Batch'); $activityParams = array('source_record_id' => $object->id, 'activity_type_id' => $aid); $exportActivity = CRM_Activity_BAO_Activity::retrieve($activityParams, $val); $fid = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_EntityFile', $exportActivity->id, 'file_id', 'entity_id'); @@ -426,37 +428,37 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch { public function links($context = NULL) { if ($context == 'financialBatch') { $links = array( - 'transaction' => array( + 'transaction' => array( 'name' => ts('Transactions'), 'url' => 'civicrm/batchtransaction', 'qs' => 'reset=1&bid=%%id%%', 'title' => ts('View/Add Transactions to Batch'), ), - 'edit' => array( + 'edit' => array( 'name' => ts('Edit'), 'url' => 'civicrm/financial/batch', 'qs' => 'reset=1&action=update&id=%%id%%&context=1', 'title' => ts('Edit Batch'), ), - 'close' => array( + 'close' => array( 'name' => ts('Close'), 'title' => ts('Close Batch'), 'url' => '#', 'extra' => 'rel="close"', ), - 'export' => array( + 'export' => array( 'name' => ts('Export'), 'title' => ts('Export Batch'), 'url' => '#', 'extra' => 'rel="export"', ), - 'reopen' => array( + 'reopen' => array( 'name' => ts('Re-open'), 'title' => ts('Re-open Batch'), 'url' => '#', 'extra' => 'rel="reopen"', ), - 'delete' => array( + 'delete' => array( 'name' => ts('Delete'), 'title' => ts('Delete Batch'), 'url' => '#', @@ -502,7 +504,7 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch { * excluding batches with data entry in progress */ public static function getBatches() { - $dataEntryStatusId = CRM_Core_OptionGroup::getValue('batch_status','Data Entry', 'name'); + $dataEntryStatusId = CRM_Core_OptionGroup::getValue('batch_status', 'Data Entry', 'name'); $query = "SELECT id, title FROM civicrm_batch WHERE item_count >= 1 @@ -627,7 +629,7 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch { $params['id'] = $ids['batchID'] = $value; self::create($params, $ids); } - $url = CRM_Utils_System::url('civicrm/financial/financialbatches',"reset=1&batchStatus={$params['status_id']}"); + $url = CRM_Utils_System::url('civicrm/financial/financialbatches', "reset=1&batchStatus={$params['status_id']}"); CRM_Utils_System::redirect($url); } @@ -725,7 +727,7 @@ LEFT JOIN civicrm_contribution_soft ON civicrm_contribution_soft.contribution_id $query = new CRM_Contact_BAO_Query($searchParams, CRM_Contribute_BAO_Query::defaultReturnProperties(CRM_Contact_BAO_Query::MODE_CONTRIBUTE, FALSE - ),NULL, FALSE, FALSE,CRM_Contact_BAO_Query::MODE_CONTRIBUTE + ), NULL, FALSE, FALSE, CRM_Contact_BAO_Query::MODE_CONTRIBUTE ); if ($field == 'contribution_date_high' || $field == 'contribution_date_low') { $query->dateQueryBuilder($params[$field], 'civicrm_contribution', 'contribution_date', 'receive_date', 'Contribution Date'); @@ -744,7 +746,7 @@ LEFT JOIN civicrm_contribution_soft ON civicrm_contribution_soft.contribution_id if (!$searchValue) { if (!$notPresent) { - $where = " ( civicrm_entity_batch.batch_id = {$entityID} + $where = " ( civicrm_entity_batch.batch_id = {$entityID} AND civicrm_entity_batch.entity_table = 'civicrm_financial_trxn' AND civicrm_entity_financial_trxn.entity_table = 'civicrm_contribution') "; } diff --git a/CRM/Batch/Form/Batch.php b/CRM/Batch/Form/Batch.php index ffe7bffdb0..498bef783a 100755 --- a/CRM/Batch/Form/Batch.php +++ b/CRM/Batch/Form/Batch.php @@ -118,7 +118,7 @@ class CRM_Batch_Form_Batch extends CRM_Admin_Form { } // always create with data entry status - $params['status_id'] = CRM_Core_OptionGroup::getValue('batch_status','Data Entry', 'name'); + $params['status_id'] = CRM_Core_OptionGroup::getValue('batch_status', 'Data Entry', 'name'); $batch = CRM_Batch_BAO_Batch::create($params); // redirect to batch entry page. diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php index 395185feca..34b3110d2d 100755 --- a/CRM/Batch/Form/Entry.php +++ b/CRM/Batch/Form/Entry.php @@ -65,7 +65,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form { public $_params; - public $_membershipId = null; + public $_membershipId = NULL; /** * When not to reset sort_name */ @@ -126,20 +126,20 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form { $this->addElement('hidden', 'batch_id', $this->_batchId); - $batchTypes = CRM_Core_Pseudoconstant::get('CRM_Batch_DAO_Batch', 'type_id',array('flip' => 1), 'validate'); + $batchTypes = CRM_Core_Pseudoconstant::get('CRM_Batch_DAO_Batch', 'type_id', array('flip' => 1), 'validate'); // get the profile information if ($this->_batchInfo['type_id'] == $batchTypes['Contribution']) { CRM_Utils_System::setTitle(ts('Batch Data Entry for Contributions')); $customFields = CRM_Core_BAO_CustomField::getFields('Contribution'); } - elseif ($this->_batchInfo['type_id'] == $batchTypes['Membership']) { + elseif ($this->_batchInfo['type_id'] == $batchTypes['Membership']) { CRM_Utils_System::setTitle(ts('Batch Data Entry for Memberships')); $customFields = CRM_Core_BAO_CustomField::getFields('Membership'); } - elseif ($this->_batchInfo['type_id'] == $batchTypes['Pledge Payment']) { - CRM_Utils_System::setTitle(ts('Batch Data Entry for Pledge Payments')); - $customFields = CRM_Core_BAO_CustomField::getFields('Contribution'); - } + elseif ($this->_batchInfo['type_id'] == $batchTypes['Pledge Payment']) { + CRM_Utils_System::setTitle(ts('Batch Data Entry for Pledge Payments')); + $customFields = CRM_Core_BAO_CustomField::getFields('Contribution'); + } $this->_fields = array(); $this->_fields = CRM_Core_BAO_UFGroup::getFields($this->_profileId, FALSE, CRM_Core_Action::VIEW); @@ -209,7 +209,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form { $this->add('select', "member_option[$rowNumber]", '', $options); } if ($this->_batchInfo['type_id'] == $batchTypes['Pledge Payment']) { - $options = array('' => '-select-'); + $options = array('' => '-select-'); $optionTypes = array( '1' => ts('Adjust Pledge Payment Schedule?'), '2' => ts('Adjust Total Pledge Amount?'), @@ -227,7 +227,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form { } $this->add('select', "open_pledges[$rowNumber]", '', $options); - } + } foreach ($this->_fields as $name => $field) { if (in_array($field['field_type'], $contactTypes)) { @@ -244,7 +244,8 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form { $this->assign('fields', $this->_fields); CRM_Core_Resources::singleton() - ->addSetting(array('contact' => array( + ->addSetting(array( + 'contact' => array( 'return' => implode(',', $contactReturnProperties), 'fieldmap' => array_flip($contactReturnProperties), ))); @@ -490,7 +491,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form { $value['skipRecentView'] = TRUE; // build line item params - $this->_priceSet['fields'][$priceFieldID]['options'][$priceFieldValueID ]['amount'] = $value['total_amount']; + $this->_priceSet['fields'][$priceFieldID]['options'][$priceFieldValueID]['amount'] = $value['total_amount']; $value['price_'. $priceFieldID] = 1; $lineItem = array(); @@ -563,12 +564,12 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form { //send receipt mail. if ($contribution->id && !empty($value['send_receipt'])) { - // add the domain email id - $domainEmail = CRM_Core_BAO_Domain::getNameAndEmail(); - $domainEmail = "$domainEmail[0] <$domainEmail[1]>"; - $value['from_email_address'] = $domainEmail; - $value['contribution_id'] = $contribution->id; - CRM_Contribute_Form_AdditionalInfo::emailReceipt( $this, $value ); + // add the domain email id + $domainEmail = CRM_Core_BAO_Domain::getNameAndEmail(); + $domainEmail = "$domainEmail[0] <$domainEmail[1]>"; + $value['from_email_address'] = $domainEmail; + $value['contribution_id'] = $contribution->id; + CRM_Contribute_Form_AdditionalInfo::emailReceipt( $this, $value ); } } } @@ -697,7 +698,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form { } if (!empty($value['receive_date'])) { - $value['receive_date'] = CRM_Utils_Date::processDate( $value['receive_date'], $value['receive_date_time'] , TRUE ); + $value['receive_date'] = CRM_Utils_Date::processDate( $value['receive_date'], $value['receive_date_time'], TRUE ); } $params['actualBatchTotal'] += $value['total_amount']; @@ -761,10 +762,10 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form { unset($value['membership_start_date']); unset($value['membership_end_date']); - $value['is_renew'] = false; + $value['is_renew'] = FALSE; if (!empty($params['member_option']) && CRM_Utils_Array::value( $key, $params['member_option'] ) == 2 ) { $this->_params = $params; - $value['is_renew'] = true; + $value['is_renew'] = TRUE; $membership = CRM_Member_BAO_Membership::renewMembershipFormWrapper( $value['contact_id'], $value['membership_type_id'], @@ -804,14 +805,14 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form { //send receipt mail. if ( $membership->id && !empty($value['send_receipt'])) { - // add the domain email id - $domainEmail = CRM_Core_BAO_Domain::getNameAndEmail(); - $domainEmail = "$domainEmail[0] <$domainEmail[1]>"; + // add the domain email id + $domainEmail = CRM_Core_BAO_Domain::getNameAndEmail(); + $domainEmail = "$domainEmail[0] <$domainEmail[1]>"; - $value['from_email_address'] = $domainEmail; - $value['membership_id'] = $membership->id; - $value['contribution_id'] = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipPayment', $membership->id, 'contribution_id', 'membership_id'); - CRM_Member_Form_Membership::emailReceipt( $this, $value, $membership ); + $value['from_email_address'] = $domainEmail; + $value['membership_id'] = $membership->id; + $value['contribution_id'] = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipPayment', $membership->id, 'contribution_id', 'membership_id'); + CRM_Member_Form_Membership::emailReceipt( $this, $value, $membership ); } } } diff --git a/CRM/Batch/Page/AJAX.php b/CRM/Batch/Page/AJAX.php index 7003a7148c..57d01df038 100644 --- a/CRM/Batch/Page/AJAX.php +++ b/CRM/Batch/Page/AJAX.php @@ -70,9 +70,7 @@ class CRM_Batch_Page_AJAX { $rowCount = isset($_REQUEST['iDisplayLength']) ? CRM_Utils_Type::escape($_REQUEST['iDisplayLength'], 'Integer') : 25; $sort = - isset($_REQUEST['iSortCol_0']) ? - CRM_Utils_Array::value(CRM_Utils_Type::escape($_REQUEST['iSortCol_0'], 'Integer'), $sortMapper) : - NULL; + isset($_REQUEST['iSortCol_0']) ? CRM_Utils_Array::value(CRM_Utils_Type::escape($_REQUEST['iSortCol_0'], 'Integer'), $sortMapper) : NULL; $sortOrder = isset($_REQUEST['sSortDir_0']) ? CRM_Utils_Type::escape($_REQUEST['sSortDir_0'], 'String') : 'asc'; $context = @@ -88,7 +86,7 @@ class CRM_Batch_Page_AJAX { if ($context != 'financialBatch') { // data entry status batches - $params['status_id'] = CRM_Core_OptionGroup::getValue('batch_status','Data Entry', 'name'); + $params['status_id'] = CRM_Core_OptionGroup::getValue('batch_status', 'Data Entry', 'name'); } $params['context'] = $context; diff --git a/CRM/Batch/Page/Batch.php b/CRM/Batch/Page/Batch.php index a4ff19fa38..4684cd5e23 100644 --- a/CRM/Batch/Page/Batch.php +++ b/CRM/Batch/Page/Batch.php @@ -60,7 +60,8 @@ class CRM_Batch_Page_Batch extends CRM_Core_Page_Basic { * * @return array (reference) of action links */ - public function &links() {} + public function &links() { + } /** * Get name of edit form @@ -103,8 +104,7 @@ class CRM_Batch_Page_Batch extends CRM_Core_Page_Basic { } public function search() { - if ($this->_action & - (CRM_Core_Action::ADD | + if ($this->_action & (CRM_Core_Action::ADD | CRM_Core_Action::UPDATE | CRM_Core_Action::DELETE ) -- 2.25.1