diff --git a/CRM/Batch/BAO/Batch.php b/CRM/Batch/BAO/Batch.php
index 884bb7ea46b4d16c3bbe805821768ec01214b7a1..6f71084976a8be0b16198c36fc15af0abd2c4cb2 100644
--- a/CRM/Batch/BAO/Batch.php
+++ b/CRM/Batch/BAO/Batch.php
@@ -353,7 +353,7 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
* @param array $params associated array for params
* @access public
*/
- static function getBatchCount(&$params) {
+ public static function getBatchCount(&$params) {
$args = array();
$whereClause = self::whereClause($params, $args);
$query = " SELECT COUNT(*) FROM civicrm_batch batch
@@ -368,7 +368,7 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
* @param array $params associated array for params
* @access public
*/
- function whereClause($params) {
+ public static function whereClause($params) {
$clauses = array();
// Exclude data-entry batches
if (empty($params['status_id'])) {
diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php
index 8f395f78fbeaa818459a272a90c02ab95fc40fbf..a1e4e091c3a85ac2784fc3d16c7fa772d5d60c34 100644
--- a/CRM/Batch/Form/Entry.php
+++ b/CRM/Batch/Form/Entry.php
@@ -192,6 +192,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
);
$contactTypes = array('Contact', 'Individual', 'Household', 'Organization');
+ $contactReturnProperties = array();
for ($rowNumber = 1; $rowNumber <= $this->_batchInfo['item_count']; $rowNumber++) {
CRM_Contact_Form_NewContact::buildQuickForm($this, $rowNumber, NULL, TRUE, 'primary_', ts('Contact'));
@@ -258,7 +259,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
if (CRM_Utils_Array::value($key, $params['soft_credit_contact_select_id']) && !CRM_Utils_Array::value($key, $params['soft_credit_amount'])) {
$errors["soft_credit_amount[$key]"] = ts('Please enter the soft credit amount');
}
- if (CRM_Utils_Array::value($key, $params['soft_credit_amount'])
+ if (!empty($params['soft_credit_amount']) && CRM_Utils_Array::value($key, $params['soft_credit_amount'])
&& CRM_Utils_Rule::cleanMoney(CRM_Utils_Array::value($key, $params['soft_credit_amount'])) > CRM_Utils_Rule::cleanMoney($value['total_amount'])) {
$errors["soft_credit_amount[$key]"] = ts('Soft credit amount should not be greater than the total amount');
}
diff --git a/CRM/Mailing/Event/BAO/Subscribe.php b/CRM/Mailing/Event/BAO/Subscribe.php
index ad7d1e5fcca38083cd20e4abb1a47e7002f03a52..ed7f23734e0849ac6f8b8f5241d225f3b6444eb8 100644
--- a/CRM/Mailing/Event/BAO/Subscribe.php
+++ b/CRM/Mailing/Event/BAO/Subscribe.php
@@ -315,7 +315,7 @@ SELECT civicrm_email.id as email_id
* @return array $groups array of group ids
* @access public
*/
- function getContactGroups($email, $contactID = NULL) {
+ public static function getContactGroups($email, $contactID = NULL) {
if ($contactID) {
$query = "
SELECT DISTINCT group_a.group_id, group_a.status, civicrm_group.title
diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index 6400f55640d773eadd8054bbd4a994d8a3f43894..36b01eb03914ff9b357ebd658e1a11df65514a5e 100644
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -54,43 +54,43 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
/*
* Display name of the member
*/
- protected $_memberDisplayName = null;
+ protected $_memberDisplayName = NULL;
/*
* email of the person paying for the membership (used for receipts)
*/
- protected $_memberEmail = null;
+ protected $_memberEmail = NULL;
/*
* Contact ID of the member
*/
- protected $_contactID = null;
+ protected $_contactID = NULL;
/*
* Display name of the person paying for the membership (used for receipts)
*/
- protected $_contributorDisplayName = null;
+ protected $_contributorDisplayName = NULL;
- /*
- * email of the person paying for the membership (used for receipts)
- */
- protected $_contributorEmail = null;
+ /*
+ * email of the person paying for the membership (used for receipts)
+ */
+ protected $_contributorEmail = NULL;
/*
* email of the person paying for the membership (used for receipts)
*/
- protected $_contributorContactID = null;
+ protected $_contributorContactID = NULL;
- /*
- * ID of the person the receipt is to go to
- */
- protected $_receiptContactId = null;
+ /*
+ * ID of the person the receipt is to go to
+ */
+ protected $_receiptContactId = NULL;
/*
* Keep a class variable for ALL membeshipID's so
* postProcess hook function can do something with it
*/
- protected $_membershipIDs = array( );
+ protected $_membershipIDs = array();
/**
* An array to hold a list of datefields on the form
@@ -262,7 +262,7 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
$membershipStatus->free();
$passthru = array(
'typeorgs' => CRM_Member_BAO_MembershipType::getMembershipTypeOrganization(),
- 'memtypes' => CRM_Member_BAO_MembershipType::getMembershipTypes(false),
+ 'memtypes' => CRM_Member_BAO_MembershipType::getMembershipTypes(FALSE),
'statuses' => $statuses,
);
$resources->addSetting(array('existingMems' => $passthru));
@@ -296,7 +296,7 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
}
// omitting contactImage from title for now since the summary overlay css doesn't work outside of our crm-container
- CRM_Utils_System::setTitle(ts('Membership for') . ' ' . $displayName);
+ CRM_Utils_System::setTitle(ts('Membership for') . ' ' . $displayName);
}
parent::preProcess();
}
@@ -414,8 +414,13 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
$fields[$name] = 1;
}
$names = array(
- 'first_name', 'middle_name', 'last_name', "street_address-{$this->_bltID}",
- "city-{$this->_bltID}", "postal_code-{$this->_bltID}", "country_id-{$this->_bltID}",
+ 'first_name',
+ 'middle_name',
+ 'last_name',
+ "street_address-{$this->_bltID}",
+ "city-{$this->_bltID}",
+ "postal_code-{$this->_bltID}",
+ "country_id-{$this->_bltID}",
"state_province_id-{$this->_bltID}",
);
foreach ($names as $name) {
@@ -529,7 +534,8 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
if ($buildPriceSet) {
$this->add('select', 'price_set_id', ts('Choose price set'),
array(
- '' => ts('Choose price set')) + $priceSets,
+ '' => ts('Choose price set')
+ ) + $priceSets,
NULL, array('onchange' => "buildAmount( this.value );")
);
}
@@ -572,8 +578,8 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
$allMemberships = CRM_Member_BAO_Membership::buildMembershipTypeValues($this);
$allMembershipInfo = $membershipType = array();
- foreach( $allMemberships as $key => $values ) {
- if (CRM_Utils_Array::value('is_active', $values) ) {
+ foreach ($allMemberships as $key => $values) {
+ if (CRM_Utils_Array::value('is_active', $values)) {
$membershipType[$key] = CRM_Utils_Array::value('name', $values);
if ($this->_mode && !CRM_Utils_Array::value('minimum_fee', $values)) {
continue;
@@ -599,11 +605,11 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
// - set the max related block
$allMembershipInfo[$key] = array(
'financial_type_id' => CRM_Utils_Array::value('financial_type_id', $values),
- 'total_amount' => CRM_Utils_Money::format($values['minimum_fee'], NULL, '%a'),
+ 'total_amount' => CRM_Utils_Money::format($values['minimum_fee'], NULL, '%a'),
'total_amount_numeric' => CRM_Utils_Array::value('minimum_fee', $values),
- 'auto_renew' => CRM_Utils_Array::value('auto_renew', $values),
- 'has_related' => isset($values['relationship_type_id']),
- 'max_related' => CRM_Utils_Array::value('max_related', $values),
+ 'auto_renew' => CRM_Utils_Array::value('auto_renew', $values),
+ 'has_related' => isset($values['relationship_type_id']),
+ 'max_related' => CRM_Utils_Array::value('max_related', $values),
);
}
}
@@ -636,9 +642,9 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
if ($this->_mode) {
//get the valid recurring processors.
- $recurring = CRM_Core_PseudoConstant::paymentProcessor(FALSE, FALSE, 'is_recur = 1');
+ $recurring = CRM_Core_PseudoConstant::paymentProcessor(FALSE, FALSE, 'is_recur = 1');
$recurProcessor = array_intersect_assoc($this->_processors, $recurring);
- $autoRenew = array();
+ $autoRenew = array();
if (!empty($recurProcessor)) {
if (!empty($membershipType)) {
$sql = '
@@ -652,7 +658,11 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
while ($recurMembershipTypes->fetch()) {
$autoRenew[$recurMembershipTypes->id] = $recurMembershipTypes->auto_renew;
foreach (array(
- 'id', 'auto_renew', 'duration_unit', 'duration_interval') as $fld) {
+ 'id',
+ 'auto_renew',
+ 'duration_unit',
+ 'duration_interval'
+ ) as $fld) {
$this->_recurMembershipTypes[$recurMembershipTypes->id][$fld] = $recurMembershipTypes->$fld;
}
}
@@ -678,7 +688,7 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
CRM_Core_DAO::getAttribute('CRM_Member_DAO_Membership', 'max_related')
);
- $sel = &$this->addElement('hierselect',
+ $sel = & $this->addElement('hierselect',
'membership_type_id',
ts('Membership Organization and Type'),
$memTypeJs
@@ -749,7 +759,10 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
$statusNames = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
foreach ($statusNames as $val => $name) {
if (in_array($name, array(
- 'In Progress', 'Overdue'))) {
+ 'In Progress',
+ 'Overdue'
+ ))
+ ) {
continue;
}
$allowStatuses[$val] = $statuses[$val];
@@ -777,9 +790,9 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
//CRM-10223 - allow contribution to be recorded against different contact
// causes a conflict in standalone mode so skip in standalone for now
$this->addElement('checkbox', 'is_different_contribution_contact', ts('Record Payment from a Different Contact?'));
- $this->add( 'select', 'honor_type_id', ts('Membership payment is : '),
- array( '' => ts( '-') ) + CRM_Core_PseudoConstant::get('CRM_Contribute_DAO_Contribution', 'honor_type_id') );
- CRM_Contact_Form_NewContact::buildQuickForm($this,1, null, false,'contribution_');
+ $this->add('select', 'honor_type_id', ts('Membership payment is : '),
+ array('' => ts('-')) + CRM_Core_PseudoConstant::get('CRM_Contribute_DAO_Contribution', 'honor_type_id'));
+ CRM_Contact_Form_NewContact::buildQuickForm($this, 1, NULL, FALSE, 'contribution_');
}
$this->addElement('checkbox',
@@ -805,7 +818,7 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
if ($this->_contactID) {
list($this->_memberDisplayName,
$this->_memberEmail
- ) = CRM_Contact_BAO_Contact_Location::getEmailDetails($this->_contactID);
+ ) = CRM_Contact_BAO_Contact_Location::getEmailDetails($this->_contactID);
$this->assign('emailExists', $this->_memberEmail);
$this->assign('displayName', $this->_memberDisplayName);
@@ -1249,17 +1262,24 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
list($userName, $userEmail) = CRM_Contact_BAO_Contact_Location::getEmailDetails($ids['userId']);
//CRM-10223 - allow contribution to be recorded against different contact
- if($this->_contributorContactID != $this->_contactID){
+ if ($this->_contributorContactID != $this->_contactID) {
$params['contribution_contact_id'] = $this->_contributorContactID;
- if(CRM_Utils_Array::value('honor_type_id', $this->_params)){
+ if (CRM_Utils_Array::value('honor_type_id', $this->_params)) {
$params['honor_type_id'] = $this->_params['honor_type_id'];
$params['honor_contact_id'] = $params['contact_id'];
}
}
if (CRM_Utils_Array::value('record_contribution', $formValues)) {
$recordContribution = array(
- 'total_amount', 'honor_type_id','financial_type_id', 'payment_instrument_id',
- 'trxn_id', 'contribution_status_id', 'check_number', 'campaign_id', 'receive_date',
+ 'total_amount',
+ 'honor_type_id',
+ 'financial_type_id',
+ 'payment_instrument_id',
+ 'trxn_id',
+ 'contribution_status_id',
+ 'check_number',
+ 'campaign_id',
+ 'receive_date',
);
foreach ($recordContribution as $f) {
@@ -1310,7 +1330,7 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
}
if ($priceSetId && !$isQuickConfig) {
- $params['financial_type_id'] = CRM_Core_DAO::getFieldValue( 'CRM_Price_DAO_PriceSet',
+ $params['financial_type_id'] = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceSet',
$priceSetId,
'financial_type_id'
);
@@ -1347,7 +1367,7 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
$fields["address_name-{$this->_bltID}"] = 1;
//ensure we don't over-write the payer's email with the member's email
- if($this->_contributorContactID == $this->_contactID) {
+ if ($this->_contributorContactID == $this->_contactID) {
$fields["email-{$this->_bltID}"] = 1;
}
@@ -1389,8 +1409,8 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
$paymentParams['contactID'] = $this->_contributorContactID;
//CRM-10377 if payment is by an alternate contact then we need to set that person
// as the contact in the payment params
- if($this->_contributorContactID != $this->_contactID){
- if(CRM_Utils_Array::value('honor_type_id', $this->_params)){
+ if ($this->_contributorContactID != $this->_contactID) {
+ if (CRM_Utils_Array::value('honor_type_id', $this->_params)) {
$paymentParams['honor_contact_id'] = $this->_contactID;
$paymentParams['honor_type_id'] = $this->_params['honor_type_id'];
}
@@ -1422,9 +1442,9 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
TRUE,
FALSE
);
- $paymentParams['contactID'] = $contactID;
+ $paymentParams['contactID'] = $contactID;
$paymentParams['contributionID'] = $contribution->id;
- $paymentParams['contributionTypeID'] = $contribution->financial_type_id;
+ $paymentParams['contributionTypeID'] = $contribution->financial_type_id;
$paymentParams['contributionPageID'] = $contribution->contribution_page_id;
$paymentParams['contributionRecurID'] = $contribution->contribution_recur_id;
$ids['contribution'] = $contribution->id;
@@ -1449,7 +1469,7 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
if ($params['total_amount'] > 0.0) {
$payment = CRM_Core_Payment::singleton($this->_mode, $this->_paymentProcessor, $this);
- $result = &$payment->doDirectPayment($paymentParams);
+ $result = & $payment->doDirectPayment($paymentParams);
}
if (is_a($result, 'CRM_Core_Error')) {
@@ -1463,8 +1483,8 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
CRM_Core_Error::displaySessionError($result);
CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/contact/view/membership',
- "reset=1&action=add&cid={$this->_contactID}&context=&mode={$this->_mode}"
- ));
+ "reset=1&action=add&cid={$this->_contactID}&context=&mode={$this->_mode}"
+ ));
}
if ($result) {
@@ -1530,10 +1550,10 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
$result = CRM_Contribute_BAO_Contribution::transitionComponents($params, TRUE);
if (!empty($result) && CRM_Utils_Array::value('contribution_id', $params)) {
$lineItem = array();
- $lineItems = CRM_Price_BAO_LineItem::getLineItems($params['contribution_id'], 'contribution');
- $itemId = key($lineItems);
- $priceSetId = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceField', $lineItems[$itemId]['price_field_id'], 'price_set_id');
- $fieldType = NULL;
+ $lineItems = CRM_Price_BAO_LineItem::getLineItems($params['contribution_id'], 'contribution');
+ $itemId = key($lineItems);
+ $priceSetId = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceField', $lineItems[$itemId]['price_field_id'], 'price_set_id');
+ $fieldType = NULL;
if ($itemId && CRM_Utils_Array::value('price_field_id', $lineItems[$itemId])) {
$fieldType = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceField', $lineItems[$itemId]['price_field_id'], 'html_type');
}
@@ -1555,9 +1575,11 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
$endDate = $membership->end_date;
$membershipStatues = CRM_Member_PseudoConstant::membershipStatus();
- if (!in_array($membership->status_id, array(array_search('Cancelled', $membershipStatues),
- array_search('Expired', $membershipStatues),
- ))) {
+ if (!in_array($membership->status_id, array(
+ array_search('Cancelled', $membershipStatues),
+ array_search('Expired', $membershipStatues),
+ ))
+ ) {
$cancelled = FALSE;
}
}
@@ -1587,8 +1609,8 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
$membershipParams = array_merge($params, $membershipTypeValues[$memType]);
if (CRM_Utils_Array::value('int_amount', $formValues)) {
$init_amount = array();
- foreach($formValues as $key => $value){
- if (strstr($key,'txt-price')){
+ foreach ($formValues as $key => $value) {
+ if (strstr($key, 'txt-price')) {
$init_amount[$key] = $value;
}
}
@@ -1621,10 +1643,10 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
if (CRM_Utils_Array::value('send_receipt', $formValues)) {
$receiptSend = TRUE;
- $formValues['contact_id'] = $this->_contactID;
+ $formValues['contact_id'] = $this->_contactID;
// send email receipt
- $mailSend = self::emailReceipt( $this, $formValues, $membership );
+ $mailSend = self::emailReceipt($this, $formValues, $membership);
}
if (($this->_action & CRM_Core_Action::UPDATE)) {
@@ -1645,7 +1667,10 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
$statusMsg = array();
foreach ($membershipTypes as $memType => $membershipType) {
- $statusMsg[$memType] = ts('%1 membership for %2 has been added.', array(1 => $membershipType, 2 => $this->_memberDisplayName));
+ $statusMsg[$memType] = ts('%1 membership for %2 has been added.', array(
+ 1 => $membershipType,
+ 2 => $this->_memberDisplayName
+ ));
$membership = $createdMemberships[$memType];
$memEndDate = ($membership->end_date) ? $membership->end_date : $endDate;
@@ -1677,19 +1702,19 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
if ($this->_context == 'standalone') {
if ($buttonName == $this->getButtonName('upload', 'new')) {
$session->replaceUserContext(CRM_Utils_System::url('civicrm/member/add',
- 'reset=1&action=add&context=standalone'
- ));
+ 'reset=1&action=add&context=standalone'
+ ));
}
else {
$session->replaceUserContext(CRM_Utils_System::url('civicrm/contact/view',
- "reset=1&cid={$this->_contactID}&selectedChild=member"
- ));
+ "reset=1&cid={$this->_contactID}&selectedChild=member"
+ ));
}
}
elseif ($buttonName == $this->getButtonName('upload', 'new')) {
$session->replaceUserContext(CRM_Utils_System::url('civicrm/contact/view/membership',
- "reset=1&action=add&context=membership&cid={$this->_contactID}"
- ));
+ "reset=1&action=add&context=membership&cid={$this->_contactID}"
+ ));
}
}
@@ -1697,13 +1722,13 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
* Function to send email receipt
*
* @param object $form form object
- * @param array $values submitted values
+ * @param array $values submitted values
* @param object $membership object
*
* @return boolean true if mail was sent successfully
* @static
*/
- static function emailReceipt( &$form, &$formValues, &$membership ) {
+ static function emailReceipt(&$form, &$formValues, &$membership) {
// retrieve 'from email id' for acknowledgement
$receiptFrom = $formValues['from_email_address'];
@@ -1714,8 +1739,9 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
// retrieve custom data
$customFields = $customValues = array();
- if ( property_exists( $form, '_groupTree' )
- && !empty( $form->_groupTree ) ) {
+ if (property_exists($form, '_groupTree')
+ && !empty($form->_groupTree)
+ ) {
foreach ($form->_groupTree as $groupID => $group) {
if ($groupID == 'info') {
continue;
@@ -1781,23 +1807,23 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
}
$form->assign('module', 'Membership');
- $form->assign('contactID', $formValues['contact_id'] );
+ $form->assign('contactID', $formValues['contact_id']);
$form->assign('membershipID', CRM_Utils_Array::value('membership_id', $form->_params, CRM_Utils_Array::value('membership_id', $form->_defaultValues)));
- if ( CRM_Utils_Array::value('contribution_id', $formValues ) ) {
- $form->assign( 'contributionID', $formValues['contribution_id'] );
+ if (CRM_Utils_Array::value('contribution_id', $formValues)) {
+ $form->assign('contributionID', $formValues['contribution_id']);
}
- else {
- $form->assign( 'contributionID', $form->_onlinePendingContributionId );
+ elseif (isset($form->_onlinePendingContributionId)) {
+ $form->assign('contributionID', $form->_onlinePendingContributionId);
}
- if (CRM_Utils_Array::value('contribution_status_id', $formValues )) {
+ if (CRM_Utils_Array::value('contribution_status_id', $formValues)) {
$form->assign('contributionStatusID', $formValues['contribution_status_id']);
$form->assign('contributionStatus', CRM_Contribute_PseudoConstant::contributionStatus($formValues['contribution_status_id'], 'name'));
}
- if ( CRM_Utils_Array::value( 'is_renew', $formValues ) ) {
+ if (CRM_Utils_Array::value('is_renew', $formValues)) {
$form->assign('receiptType', 'membership renewal');
}
else {
@@ -1807,28 +1833,28 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
$form->assign('formValues', $formValues);
if (empty($lineItem)) {
- $form->assign('mem_start_date', CRM_Utils_Date::customFormat($membership->start_date, '%B %E%f, %Y' ) );
- $form->assign('mem_end_date', CRM_Utils_Date::customFormat($membership->end_date, '%B %E%f, %Y' ) );
- $form->assign('membership_name', CRM_Member_PseudoConstant::membershipType( $membership->membership_type_id ) );
+ $form->assign('mem_start_date', CRM_Utils_Date::customFormat($membership->start_date, '%B %E%f, %Y'));
+ $form->assign('mem_end_date', CRM_Utils_Date::customFormat($membership->end_date, '%B %E%f, %Y'));
+ $form->assign('membership_name', CRM_Member_PseudoConstant::membershipType($membership->membership_type_id));
}
$form->assign('customValues', $customValues);
$isBatchProcess = is_a($form, 'CRM_Batch_Form_Entry');
- if((empty($form->_contributorDisplayName) || empty($form->_contributorEmail)) || $isBatchProcess){
+ if ((empty($form->_contributorDisplayName) || empty($form->_contributorEmail)) || $isBatchProcess) {
// in this case the form is being called statically from the batch editing screen
// having one class in the form layer call another statically is not greate
// & we should aim to move this function to the BAO layer in future.
// however, we can assume that the contact_id passed in by the batch
// function will be the recipient
- list(
+ list(
$form->_contributorDisplayName,
$form->_contributorEmail
- ) = CRM_Contact_BAO_Contact_Location::getEmailDetails(
- $formValues['contact_id']
- );
- if(empty($form->_receiptContactId) || $isBatchProcess){
- $form->_receiptContactId = $formValues['contact_id'];
- }
+ ) = CRM_Contact_BAO_Contact_Location::getEmailDetails(
+ $formValues['contact_id']
+ );
+ if (empty($form->_receiptContactId) || $isBatchProcess) {
+ $form->_receiptContactId = $formValues['contact_id'];
+ }
}
list($mailSend, $subject, $message, $html) = CRM_Core_BAO_MessageTemplates::sendTemplate(
@@ -1839,11 +1865,11 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
'from' => $receiptFrom,
'toName' => $form->_contributorDisplayName,
'toEmail' => $form->_contributorEmail,
- 'isTest' => (bool)($form->_action & CRM_Core_Action::PREVIEW)
+ 'isTest' => (bool) ($form->_action & CRM_Core_Action::PREVIEW)
)
);
- return true;
+ return TRUE;
}
}
diff --git a/tests/phpunit/WebTest/Campaign/OnlineEventRegistrationTest.php b/tests/phpunit/WebTest/Campaign/OnlineEventRegistrationTest.php
index 2f7ec65ad20851d7c4b5de2ad04ea772604d05ce..08187da4f144e1512e6d2df4bfe9b2000a6d6602 100644
--- a/tests/phpunit/WebTest/Campaign/OnlineEventRegistrationTest.php
+++ b/tests/phpunit/WebTest/Campaign/OnlineEventRegistrationTest.php
@@ -270,8 +270,11 @@ class WebTest_Campaign_OnlineEventRegistrationTest extends CiviSeleniumTestCase
$this->open($registerUrl);
$this->select("additional_participants", "value=" . $numberRegistrations);
- $email = "smith" . substr(sha1(rand()), 0, 7) . "@example.org";
+ $this->type("first_name", 'Jane');
+ $lastName = "Smith" . substr(sha1(rand()), 0, 7);
+ $this->type("last_name", $lastName);
+ $email = "smith" . substr(sha1(rand()), 0, 7) . "@example.org";
$this->type("email-Primary", $email);
$this->select("credit_card_type", "value=Visa");
@@ -280,7 +283,7 @@ class WebTest_Campaign_OnlineEventRegistrationTest extends CiviSeleniumTestCase
$this->select("credit_card_exp_date[M]", "value=1");
$this->select("credit_card_exp_date[Y]", "value=2020");
$this->type("billing_first_name", "Jane");
- $this->type("billing_last_name", "Smith" . substr(sha1(rand()), 0, 7));
+ $this->type("billing_last_name", $lastName);
$this->type("billing_street_address-5", "15 Main St.");
$this->type(" billing_city-5", "San Jose");
$this->select("billing_country_id-5", "value=1228");
@@ -294,6 +297,8 @@ class WebTest_Campaign_OnlineEventRegistrationTest extends CiviSeleniumTestCase
$this->waitForPageToLoad($this->getTimeoutMsec());
// Look for Skip button
$this->waitForElementPresent("_qf_Participant_{$i}_next_skip-Array");
+ $this->type("first_name", "Jane Add $i");
+ $this->type("last_name", "Smith" . substr(sha1(rand()), 0, 7));
$this->type("email-Primary", "smith" . substr(sha1(rand()), 0, 7) . "@example.org");
$this->click("_qf_Participant_{$i}_next");
}
diff --git a/tests/phpunit/WebTest/Contribute/AddBatchesTest.php b/tests/phpunit/WebTest/Contribute/AddBatchesTest.php
index c40830f57c6857029447518cfecd5bb687691d1d..9d64c6d2df6fca5b8c5f49f94135d1e7f336bf61 100644
--- a/tests/phpunit/WebTest/Contribute/AddBatchesTest.php
+++ b/tests/phpunit/WebTest/Contribute/AddBatchesTest.php
@@ -118,6 +118,7 @@ class WebTest_Contribute_AddBatchesTest extends CiviSeleniumTestCase {
}
elseif ($type == "Membership") {
+ $this->select("field[{$row}][membership_type][0]", "value=1");
$this->select("field[{$row}][membership_type][1]", $data['membership_type']);
$this->webtestFillDate("field_{$row}_join_date", "now");
$this->webtestFillDate("field_{$row}_membership_start_date", "now");
diff --git a/tests/phpunit/WebTest/Contribute/ContributionPageAddTest.php b/tests/phpunit/WebTest/Contribute/ContributionPageAddTest.php
index 3f44a049a2d03fc8349397f9ff5a9167713f88a5..e2c4fb8d8c9a375acda679770821d436a4dc8271 100644
--- a/tests/phpunit/WebTest/Contribute/ContributionPageAddTest.php
+++ b/tests/phpunit/WebTest/Contribute/ContributionPageAddTest.php
@@ -241,8 +241,9 @@ class WebTest_Contribute_ContributionPageAddTest extends CiviSeleniumTestCase {
//View Contribution for separate contribution
$this->waitForElementPresent("xpath=//div[@id='contributionSearch']//table//tbody/tr[1]/td[11]/span/a[text()='View']");
// Open search criteria again
- $this->click("xpath=id('Search')/x:div[2]/x:div/x:div[1]");
+ $this->click("xpath=id('Search')/div[2]/div/div[1]");
$this->waitForElementPresent("financial_type_id");
+ $this->type("sort_name", $firstName);
$this->select('financial_type_id',"label=Donation");
$this->clickLink('_qf_Search_refresh', "xpath=//div[@id='contributionSearch']//table//tbody/tr[1]/td[11]/span/a[text()='View']");
diff --git a/tests/phpunit/WebTest/Generic/GeneralClickAroundTest.php b/tests/phpunit/WebTest/Generic/GeneralClickAroundTest.php
index bc3aecdebc90375a6a5e686e4738026a98a41ee2..2f2870fe0313d529059c7f766dfd8a1af3c520ad 100644
--- a/tests/phpunit/WebTest/Generic/GeneralClickAroundTest.php
+++ b/tests/phpunit/WebTest/Generic/GeneralClickAroundTest.php
@@ -130,7 +130,6 @@ class WebTest_Generic_GeneralClickAroundTest extends CiviSeleniumTestCase {
$this->waitForPageToLoad($this->getTimeoutMsec());
$this->assertTextPresent("Event Summary");
- $this->assertTextPresent("Fall Fundraiser Dinner");
$this->assertTextPresent("Counted:");
$this->assertTextPresent("Not Counted:");
$this->assertTextPresent("Not Counted Due To Status:");
@@ -141,6 +140,7 @@ class WebTest_Generic_GeneralClickAroundTest extends CiviSeleniumTestCase {
$this->assertTextPresent("Cancelled:");
$this->assertTextPresent("Recent Registrations");
$this->assertTextPresent("Find more event participants...");
+ $this->assertTextPresent("Configure");
}
function testMembershipsDashboard() {
diff --git a/tests/phpunit/WebTest/Profile/BatchUpdateTest.php b/tests/phpunit/WebTest/Profile/BatchUpdateTest.php
index d2ad4b530da300565962c3c57c8ab126a9d03ecb..d2461ba7c4b6bfd1f4dd6cc0b503b9f30ac7ff87 100644
--- a/tests/phpunit/WebTest/Profile/BatchUpdateTest.php
+++ b/tests/phpunit/WebTest/Profile/BatchUpdateTest.php
@@ -37,18 +37,18 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
// Add new individual using Quick Add block on the main page
$firstName1 = "John_" . substr(sha1(rand()), 0, 7);
- $lastName1 = "Smiths_x" . substr(sha1(rand()), 0, 7);
- $Name1 = $lastName1 . ', ' . $firstName1;
+ $lastName1 = "Smiths_x" . substr(sha1(rand()), 0, 7);
+ $Name1 = $lastName1 . ', ' . $firstName1;
$this->webtestAddContact($firstName1, $lastName1, "$firstName1.$lastName1@example.com");
$this->waitForPageToLoad($this->getTimeoutMsec());
// Add new individual using Quick Add block on the main page
$firstName2 = "James_" . substr(sha1(rand()), 0, 7);
- $lastName2 = "Smiths_x" . substr(sha1(rand()), 0, 7);
+ $lastName2 = "Smiths_x" . substr(sha1(rand()), 0, 7);
$Name2 = $lastName2 . ', ' . $firstName2;
$firstName3 = "James_" . substr(sha1(rand()), 0, 7);
- $lastName3 = "Smiths_x" . substr(sha1(rand()), 0, 7);
+ $lastName3 = "Smiths_x" . substr(sha1(rand()), 0, 7);
$Name3 = $lastName3 . ', ' . $firstName3;
$this->webtestAddContact($firstName2, $lastName2, "$firstName2.$lastName2@example.com", "Student");
@@ -56,7 +56,7 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
$this->webtestAddContact($firstName3, $lastName3, "$firstName3.$lastName3@example.com", "Staff");
$this->waitForPageToLoad($this->getTimeoutMsec());
- $profileTitle = 'Batch Profile test_' . substr(sha1(rand()), 0, 7);
+ $profileTitle = 'Batch Profile test_' . substr(sha1(rand()), 0, 7);
$profileFields = array(
array(
'type' => 'Individual',
@@ -103,7 +103,7 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
// Find contact and assert for contact sub type
$this->openCiviPage('contact/search', 'reset=1', '_qf_Basic_refresh');
- $this->type('sort_name', $firstName2);
+ $this->type('sort_name', $firstName2);
$this->click('_qf_Basic_refresh');
$this->waitForElementPresent("xpath=//div[@class='crm-search-results']/table/tbody//td/span/a[text()='View']");
$this->click("xpath=//div[@class='crm-search-results']/table/tbody//td/span/a[text()='View']");
@@ -113,7 +113,7 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
$this->verifyText($xpath, preg_quote("Student"));
$this->openCiviPage('contact/search', 'reset=1', '_qf_Basic_refresh');
- $this->type('sort_name', $firstName3);
+ $this->type('sort_name', $firstName3);
$this->click('_qf_Basic_refresh');
$this->waitForElementPresent("xpath=//div[@class='crm-search-results']/table/tbody//td/span/a[text()='View']");
$this->click("xpath=//div[@class='crm-search-results']/table/tbody//td/span/a[text()='View']");
@@ -129,8 +129,8 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
// Add new individual using Quick Add block on the main page
$firstName1 = "John_" . substr(sha1(rand()), 0, 7);
- $lastName = "Smith_" . substr(sha1(rand()), 0, 7);
- $Name1 = $lastName . ', ' . $firstName1;
+ $lastName = "Smith_" . substr(sha1(rand()), 0, 7);
+ $Name1 = $lastName . ', ' . $firstName1;
$this->webtestAddContact($firstName1, $lastName, "$firstName1.$lastName@example.com");
$this->waitForPageToLoad($this->getTimeoutMsec());
@@ -139,8 +139,8 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
$Name2 = $lastName . ', ' . $firstName1;
$this->webtestAddContact($firstName1, $lastName, "$firstName1.$lastName@example.com");
$this->waitForPageToLoad($this->getTimeoutMsec());
- $profileTitle = 'Batch Profile test for contacts ' . substr(sha1(rand()), 0, 7);
- $profileFor = 'Contacts';
+ $profileTitle = 'Batch Profile test for contacts ' . substr(sha1(rand()), 0, 7);
+ $profileFor = 'Contacts';
$customDataArr = $this->_addCustomData($profileFor);
$this->_addProfile($profileTitle, $customDataArr, $profileFor);
@@ -199,7 +199,9 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
) {
$assertCheck = TRUE;
}
- else $assertCheck = FALSE;
+ else {
+ $assertCheck = FALSE;
+ }
$this->assertTrue($assertCheck, 'copy rows for field one failed');
@@ -222,7 +224,9 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
) {
$assertCheck = TRUE;
}
- else $assertCheck = FALSE;
+ else {
+ $assertCheck = FALSE;
+ }
$this->assertTrue($assertCheck, 'copy rows for field two failed');
@@ -239,7 +243,9 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
if ($this->getValue("{$dateElementIdFirstRow}_time") == $this->getValue("{$dateElementIdSecondRow}_time") && $this->getValue("{$dateElementIdFirstRow}_display") == $this->getValue("{$dateElementIdSecondRow}_display")) {
$assertCheck = TRUE;
}
- else $assertCheck = FALSE;
+ else {
+ $assertCheck = FALSE;
+ }
$this->assertTrue($assertCheck, 'date / time coping failed');
@@ -256,7 +262,9 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
if ($this->getValue($richTextAreaIdOne) == $this->getValue($richTextAreaIdTwo)) {
$assertCheck = TRUE;
}
- else $assertCheck = FALSE;
+ else {
+ $assertCheck = FALSE;
+ }
$this->assertTrue($assertCheck, 'Rich Text Area coping failed');
@@ -286,7 +294,9 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
) {
$assertCheck = TRUE;
}
- else $assertCheck = FALSE;
+ else {
+ $assertCheck = FALSE;
+ }
$this->assertTrue($assertCheck, 'copy rows for field one failed[radio button]');
@@ -309,7 +319,9 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
) {
$assertCheck = TRUE;
}
- else $assertCheck = FALSE;
+ else {
+ $assertCheck = FALSE;
+ }
$this->assertTrue($assertCheck, 'copy rows for field two failed[radio button]');
@@ -357,7 +369,9 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
if ($this->getValue($richTextAreaIdOne) == $this->getValue($richTextAreaIdTwo)) {
$assertCheck = TRUE;
}
- else $assertCheck = FALSE;
+ else {
+ $assertCheck = FALSE;
+ }
$this->assertTrue($assertCheck, 'Rich Text Area coping failed [TinyMCE]');
@@ -383,7 +397,7 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
$this->click('_qf_Results_upload_done-bottom');
$this->waitForPageToLoad($this->getTimeoutMsec());
- //Reserve and interview responsedents
+ //Reserve and interview respondents
$this->openCiviPage('campaign', 'reset=1&subPage=survey');
$this->waitForElementPresent("xpath=//table[@id='surveys']/tbody//tr/td[2]/a[text()='{$surveyTitle}']/../following-sibling::td[@class='crm-campaign-voterLinks']/span/ul/li/a");
$this->click("xpath=//table[@id='surveys']/tbody//tr/td[2]/a[text()='{$surveyTitle}']/../following-sibling::td[@class='crm-campaign-voterLinks']/span/ul/li/a");
@@ -393,7 +407,7 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
$this->type('sort_name', $lastName);
$this->waitForElementPresent('_qf_Search_refresh');
$this->clickLink('_qf_Search_refresh', 'Go');
- $this->click('CIVICRM_QFID_ts_all_4');
+ $this->click('toggleSelect');
$this->click('Go');
$this->waitForElementPresent('_qf_Reserve_next_reserveToInterview-top');
$this->clickLink('_qf_Reserve_next_reserveToInterview-top', '_qf_Interview_cancel_interview');
@@ -428,7 +442,9 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
) {
$assertCheck = TRUE;
}
- else $assertCheck = FALSE;
+ else {
+ $assertCheck = FALSE;
+ }
$this->assertTrue($assertCheck, 'copy rows for field one failed for inteview (campaign)');
@@ -451,7 +467,9 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
) {
$assertCheck = TRUE;
}
- else $assertCheck = FALSE;
+ else {
+ $assertCheck = FALSE;
+ }
$this->assertTrue($assertCheck, 'copy rows for field two failed for inteview (campaign)');
@@ -468,7 +486,9 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
if ($this->getValue("{$dateElementIdFirstRow}_time") == $this->getValue("{$dateElementIdSecondRow}_time") && $this->getValue("{$dateElementIdFirstRow}_display") == $this->getValue("{$dateElementIdSecondRow}_display")) {
$assertCheck = TRUE;
}
- else $assertCheck = FALSE;
+ else {
+ $assertCheck = FALSE;
+ }
$this->assertTrue($assertCheck, 'date / time coping failed for inteview (campaign)');
@@ -482,7 +502,9 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
if ($this->getValue("xpath=//table[@id='voterRecords']/tbody/tr/td[@class='note']/input") == $this->getValue("xpath=//table[@id='voterRecords']/tbody/tr[2]/td[@class='note']/input")) {
$assertCheck = TRUE;
}
- else $assertCheck = FALSE;
+ else {
+ $assertCheck = FALSE;
+ }
$this->assertTrue($assertCheck, 'Note Custom field coping failed');
@@ -511,7 +533,9 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
) {
$assertCheck = TRUE;
}
- else $assertCheck = FALSE;
+ else {
+ $assertCheck = FALSE;
+ }
$this->assertTrue($assertCheck, 'copy rows for field one failed for inteview (campaign)[radio button]');
@@ -534,7 +558,9 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
) {
$assertCheck = TRUE;
}
- else $assertCheck = FALSE;
+ else {
+ $assertCheck = FALSE;
+ }
$this->assertTrue($assertCheck, 'copy rows for field two failed for inteview (campaign)[radio button]');
diff --git a/tests/phpunit/WebTest/Profile/ProfileAddTest.php b/tests/phpunit/WebTest/Profile/ProfileAddTest.php
index 6cc4d283f89e82806ab8982f437a9ef733485c88..f56419b07138137e462afaa371a253ca515fed0f 100644
--- a/tests/phpunit/WebTest/Profile/ProfileAddTest.php
+++ b/tests/phpunit/WebTest/Profile/ProfileAddTest.php
@@ -304,23 +304,15 @@ class WebTest_Profile_ProfileAddTest extends CiviSeleniumTestCase {
$this->waitForElementPresent("xpath=//div[@id='user-profiles']/div/div/table/tbody/tr[@id='UFGroup-$id']/td[3]");
// check description is displayed on profile listing page
- $this->assertEquals($this->getText("xpath=//div[@id='user-profiles']/div/div/table/tbody/tr[@id='UFGroup-$id']/td[3]"), $profileDescription);
+ $this->assertEquals(
+ $this->getText("xpath=//div[@id='user-profiles']/div/div/table/tbody/tr[@id='UFGroup-$id']/td[3]"),
+ $profileDescription);
+
// fetch created by
$createdBy = $this->getText("xpath=//div[@id='user-profiles']/div/div/table/tbody/tr[@id='UFGroup-$id']/td[2]/a");
- // check if created by contact exists
- $this->openCiviPage("dashboard", "reset=1");
-
- // type sortname in autocomplete
- $this->click("css=input#sort_name_navigation");
- $this->type("css=input#sort_name_navigation", $createdBy);
- $this->typeKeys("css=input#sort_name_navigation", $createdBy);
-
- // wait for result list
- $this->waitForElementPresent("css=div.ac_results-inner li");
-
- // visit contact summary page
- $this->clickLink("css=div.ac_results-inner li");
+ // click on created by
+ $this->click("xpath=id('UFGroup-$id')/td[2]/a");
// Is contact present?
$this->assertTrue($this->isTextPresent("$createdBy"), "Contact did not find!");
diff --git a/tests/phpunit/WebTest/Profile/ProfileGroupSubscriptionTest.php b/tests/phpunit/WebTest/Profile/ProfileGroupSubscriptionTest.php
index 6b10ca9f66c9b4b08c533ad4289b7f0e7b71dd3d..94fec4f6d52335156877a1f7addac881f7fc2ef5 100644
--- a/tests/phpunit/WebTest/Profile/ProfileGroupSubscriptionTest.php
+++ b/tests/phpunit/WebTest/Profile/ProfileGroupSubscriptionTest.php
@@ -116,7 +116,8 @@ class WebTest_Profile_ProfileGroupSubscriptionTest extends CiviSeleniumTestCase
$this->waitForPageToLoad($this->getTimeoutMsec());
// assert for subscription message
- $this->assertElementContainsText('css=div.messages', "Your subscription request has been submitted for group ", "Subscription message is not shown");
+ $this->waitForText('messages', "Your subscription request has been submitted for group ",
+ "Subscription message is not shown");
//check if profile is saved
$this->assertElementContainsText('css=span.msg-text', 'Your information has been saved.', 'Profile is not saved');