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

5.16 to master #14738

Merged
merged 5 commits into from
Jul 4, 2019
Merged

5.16 to master #14738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce44b39
dev/report#16 Unreleased regression - fee levels incorrectly show sol…
eileenmcnaughton Jul 4, 2019
675f074
Revert participant portion of https://github.com/civicrm/civicrm-core…
eileenmcnaughton Jul 4, 2019
7142a4c
Fix refund payment not recording from additional payment form
eileenmcnaughton Jul 4, 2019
8bb71a4
Merge pull request #14733 from eileenmcnaughton/payment_reg
eileenmcnaughton Jul 4, 2019
31fe2c0
Merge pull request #14732 from eileenmcnaughton/backoffice
eileenmcnaughton Jul 4, 2019
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
2 changes: 2 additions & 0 deletions CRM/Contribute/BAO/Contribution.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3891,6 +3891,7 @@ public static function checkStatusValidation($values, &$fields, &$errors) {
'In Progress' => ['Cancelled', 'Completed', 'Failed'],
'Refunded' => ['Cancelled', 'Completed'],
'Partially paid' => ['Completed'],
'Pending refund' => ['Completed', 'Refunded'],
];

if (!in_array($contributionStatuses[$fields['contribution_status_id']],
Expand Down Expand Up @@ -4013,6 +4014,7 @@ public static function recordAdditionalPayment($contributionId, $trxnsData, $pay
elseif ($paymentType == 'refund') {
$trxnsData['total_amount'] = -$trxnsData['total_amount'];
$trxnsData['participant_id'] = $participantId;
$trxnsData['contribution_id'] = $contributionId;
return civicrm_api3('Payment', 'create', $trxnsData)['id'];
}
}
Expand Down
2 changes: 1 addition & 1 deletion CRM/Contribute/Form/AdditionalPayment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ public static function formRule($fields, $files, $self) {
if ($self->_paymentType == 'refund' && $fields['total_amount'] != abs($self->_refund)) {
$errors['total_amount'] = ts('Refund amount must equal refund due amount.');
}
$netAmt = $fields['total_amount'] - CRM_Utils_Array::value('fee_amount', $fields, 0);
$netAmt = (float) $fields['total_amount'] - (float) CRM_Utils_Array::value('fee_amount', $fields, 0);
if (!empty($fields['net_amount']) && $netAmt != $fields['net_amount']) {
$errors['net_amount'] = ts('Net amount should be equal to the difference between payment amount and fee amount.');
}
Expand Down
2 changes: 1 addition & 1 deletion CRM/Event/Form/EventFees.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ public static function buildQuickForm(&$form) {
$form->_pId, 'contribution_id', 'participant_id'
)
) {
$form->_online = TRUE;
$form->_online = !$form->isBackOffice;
}
}

Expand Down
5 changes: 1 addition & 4 deletions CRM/Event/Form/Participant.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public function preProcess() {
$this->_id = NULL;
}
else {
$this->_id = CRM_Utils_Request::retrieve('id', 'Positive');
$this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this);
}

if ($this->_id) {
Expand Down Expand Up @@ -594,9 +594,6 @@ public function setDefaultValues() {
* @throws \CiviCRM_API3_Exception
*/
public function buildQuickForm() {
if ($this->_id) {
$this->add('hidden', 'id', $this->_id);
}

$participantStatuses = CRM_Event_PseudoConstant::participantStatus();
$partiallyPaidStatusId = array_search('Partially paid', $participantStatuses);
Expand Down
3 changes: 3 additions & 0 deletions templates/CRM/Event/Form/Participant.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,9 @@
{if $urlPathVar}
dataUrl += '&' + '{$urlPathVar}';
{/if}
{if $isBackOffice}
dataUrl += '&' + 'is_backoffice=1';
{/if}

{literal}
var eventId = $('[name=event_id], #event_id', $form).val();
Expand Down