X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContribute%2FForm%2FAdditionalPayment.php;h=07dd076ff4c1175146295d1c9828a20b81989dfc;hb=9eca95bbfe3d60dcd9688ad2948c6be226a9302d;hp=70dd2ef47c756b54fab4e38e3c5f14e03094c1f1;hpb=af028bfa606d5d8db62150656fe8241722521bb5;p=civicrm-core.git diff --git a/CRM/Contribute/Form/AdditionalPayment.php b/CRM/Contribute/Form/AdditionalPayment.php index 70dd2ef47c..07dd076ff4 100644 --- a/CRM/Contribute/Form/AdditionalPayment.php +++ b/CRM/Contribute/Form/AdditionalPayment.php @@ -76,18 +76,15 @@ class CRM_Contribute_Form_AdditionalPayment extends CRM_Contribute_Form_Abstract CRM_Utils_System::setTitle($title); return; } - $entityType = 'contribution'; if ($this->_component == 'event') { - $entityType = 'participant'; $this->_contributionId = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_ParticipantPayment', $this->_id, 'contribution_id', 'participant_id'); - $eventId = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Participant', $this->_id, 'event_id', 'id'); } else { $this->_contributionId = $this->_id; } $paymentDetails = CRM_Contribute_BAO_Contribution::getPaymentInfo($this->_id, $this->_component, FALSE, TRUE); - $paymentAmt = CRM_Contribute_BAO_Contribution::getContributionBalance($this->_id); + $paymentAmt = CRM_Contribute_BAO_Contribution::getContributionBalance($this->_contributionId); $this->_amtPaid = $paymentDetails['paid']; $this->_amtTotal = $paymentDetails['total']; @@ -272,7 +269,7 @@ class CRM_Contribute_Form_AdditionalPayment extends CRM_Contribute_Form_Abstract */ public static function formRule($fields, $files, $self) { $errors = []; - if ($self->_paymentType == 'owed' && $fields['total_amount'] > $self->_owed) { + if ($self->_paymentType == 'owed' && (int) $fields['total_amount'] > (int) $self->_owed) { $errors['total_amount'] = ts('Payment amount cannot be greater than owed amount'); } if ($self->_paymentType == 'refund' && $fields['total_amount'] != abs($self->_refund)) {