Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ready for review] CRM-20952 Refresh membership tab if contribution is membership payment #10741

Merged
merged 3 commits into from
Jul 28, 2017
Merged

[ready for review] CRM-20952 Refresh membership tab if contribution is membership payment #10741

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94c8aed
CRM-20952 Refresh membership tab if contribution is membership payment
Edzelopez Jul 24, 2017
1c06685
CRM-20952 Bug fixes
Edzelopez Jul 26, 2017
5a53dd1
CRM-20952 Refreshed event tab on payment made to contribution
Edzelopez Jul 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CRM/Contribute/Form/AdditionalPayment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,12 @@ public function submit($submittedValues) {
$params = array('id' => $this->_contributionId);
$contribution = CRM_Contribute_BAO_Contribution::retrieve($params, $defaults, $params);
CRM_Contribute_BAO_Contribution::addPayments(array($contribution), $contributionStatusId);
if ($this->_contributionId && CRM_Core_Permission::access('CiviMember')) {
$membershipPayments = civicrm_api3('MembershipPayment', 'Get', array('contribution_id' => $this->_contributionId));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about using getcount?

if ($membershipPayments['count'] > 1) {
$this->ajaxResponse['updateTabs']['#tab_member'] = CRM_Contact_BAO_Contact::getCountComponent('membership', $this->_contactID);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as below.

}
}

$statusMsg = ts('The payment record has been processed.');
// send email
Expand Down
6 changes: 6 additions & 0 deletions CRM/Contribute/Form/Contribution.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,6 +1073,12 @@ public function postProcess() {
if (empty($this->_id) && !empty($contribution->id)) {
$this->_id = $contribution->id;
}
if (!empty($this->_id) && CRM_Core_Permission::access('CiviMember')) {
$membershipPayments = civicrm_api3('MembershipPayment', 'Get', array('contribution_id' => $this->_id));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above.

if ($membershipPayments['count'] > 1) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be > 0 or >=1?

$this->ajaxResponse['updateTabs']['#tab_member'] = CRM_Contact_BAO_Contact::getCountComponent('membership', $this->_contactID);
}
}
}

/**
Expand Down