projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://github.com/civicrm/civicrm-core into codingstandards-12
[civicrm-core.git]
/
CRM
/
Member
/
Form
/
Membership.php
diff --git
a/CRM/Member/Form/Membership.php
b/CRM/Member/Form/Membership.php
index 88706734c78e8d93e517e0f37dd4cf06fceb3dbc..4af96fa0febb60d00824f99bfe5e196624b298a4 100644
(file)
--- a/
CRM/Member/Form/Membership.php
+++ b/
CRM/Member/Form/Membership.php
@@
-51,44
+51,56
@@
class CRM_Member_Form_Membership extends CRM_Member_Form {
protected $_memTypeSelected;
protected $_memTypeSelected;
- /*
+ /*
*
* Display name of the member
* Display name of the member
+ *
+ * @var string
*/
protected $_memberDisplayName = NULL;
*/
protected $_memberDisplayName = NULL;
- /*
- * email of the person paying for the membership (used for receipts)
- */
+ /*
*
+
* email of the person paying for the membership (used for receipts)
+
*/
protected $_memberEmail = NULL;
protected $_memberEmail = NULL;
- /*l43
- * Contact ID of the member
- */
+ /**
+ * Contact ID of the member
+ *
+ * @var int
+ */
public $_contactID = NULL;
public $_contactID = NULL;
- /*
- * Display name of the person paying for the membership (used for receipts)
- */
+ /**
+ * Display name of the person paying for the membership (used for receipts)
+ *
+ * @var string
+ */
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)
- */
+ /**
+ * email of the person paying for the membership (used for receipts)
+ *
+ * @var int
+ */
protected $_contributorContactID = NULL;
protected $_contributorContactID = NULL;
- /*
+ /*
*
* ID of the person the receipt is to go to
* ID of the person the receipt is to go to
+ *
+ * @var int
*/
protected $_receiptContactId = NULL;
*/
protected $_receiptContactId = NULL;
- /*
+ /*
*
* Keep a class variable for ALL membeshipID's so
* postProcess hook function can do something with it
* Keep a class variable for ALL membeshipID's so
* postProcess hook function can do something with it
+ *
+ * @var array
*/
protected $_membershipIDs = array();
*/
protected $_membershipIDs = array();
@@
-459,7
+471,7
@@
class CRM_Member_Form_Membership extends CRM_Member_Form {
if ($this->_context == 'standalone') {
$this->addEntityRef('contact_id', ts('Contact'), array(
'create' => TRUE,
if ($this->_context == 'standalone') {
$this->addEntityRef('contact_id', ts('Contact'), array(
'create' => TRUE,
- 'api' => array('extra' => array('email'))
+ 'api' => array('extra' => array('email'))
,
), TRUE);
}
), TRUE);
}
@@
-564,7
+576,7
@@
WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
}
$memTypeJs = array(
'onChange' =>
}
$memTypeJs = array(
'onChange' =>
-
"CRM.buildCustomData( 'Membership', this.value ); buildAutoRenew(this.value, null );",
+ "CRM.buildCustomData( 'Membership', this.value ); buildAutoRenew(this.value, null );",
);
}
}
);
}
}
@@
-747,8
+759,8
@@
WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
* @param $self
*
* @throws CiviCRM_API3_Exception
* @param $self
*
* @throws CiviCRM_API3_Exception
- * @return
mixed true or array of errors
- *
@static
+ * @return
bool|array
+ *
mixed true or array of errors
*/
public static function formRule($params, $files, $self) {
$errors = array();
*/
public static function formRule($params, $files, $self) {
$errors = array();
@@
-1208,7
+1220,7
@@
WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
if (empty($formValues['source'])) {
$params['contribution_source'] = ts('%1 Membership: Offline signup (by %2)', array(
1 => $membershipType,
if (empty($formValues['source'])) {
$params['contribution_source'] = ts('%1 Membership: Offline signup (by %2)', array(
1 => $membershipType,
- 2 => $userName
+ 2 => $userName
,
));
}
else {
));
}
else {
@@
-1710,9
+1722,8
@@
WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
* @param object $membership
* Object.
*
* @param object $membership
* Object.
*
- * @return bool
ean
+ * @return bool
* true if mail was sent successfully
* true if mail was sent successfully
- * @static
*/
public static function emailReceipt(&$form, &$formValues, &$membership) {
// retrieve 'from email id' for acknowledgement
*/
public static function emailReceipt(&$form, &$formValues, &$membership) {
// retrieve 'from email id' for acknowledgement