<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
static $_now = NULL;
+ /**
+ * Input parameters from payment processor. Store these so that
+ * the code does not need to keep retrieving from the http request
+ * @var array
+ */
+ protected $_inputParameters = array();
+
/**
* Constructor
*/
self::$_now = date('YmdHis');
}
+ /**
+ * Store input array on the class
+ * @param array $parameters
+ * @throws CRM_Core_Exceptions
+ */
+ function setInputParameters($parameters) {
+ if(!is_array($parameters)) {
+ throw new CRM_Core_Exception('Invalid input parameters');
+ }
+ $this->_inputParameters = $parameters;
+ }
/**
* Validate incoming data. This function is intended to ensure that incoming data matches
* It provides a form of pseudo-authentication - by checking the calling fn already knows
function validateData(&$input, &$ids, &$objects, $required = TRUE, $paymentProcessorID = NULL) {
// make sure contact exists and is valid
- $contact = new CRM_Contact_DAO_Contact();
+ $contact = new CRM_Contact_BAO_Contact();
$contact->id = $ids['contact'];
if (!$contact->find(TRUE)) {
CRM_Core_Error::debug_log_message("Could not find contact record: {$ids['contact']} in IPN request: ".print_r($input, TRUE));
}
// make sure contribution exists and is valid
- $contribution = new CRM_Contribute_DAO_Contribution();
+ $contribution = new CRM_Contribute_BAO_Contribution();
$contribution->id = $ids['contribution'];
if (!$contribution->find(TRUE)) {
CRM_Core_Error::debug_log_message("Could not find contribution record: {$contribution->id} in IPN request: ".print_r($input, TRUE));
try {
$success = $contribution->loadRelatedObjects($input, $ids, $required);
}
- catch(Exception$e) {
+ catch(Exception $e) {
+ $success = FALSE;
if (CRM_Utils_Array::value('log_error', $error_handling)) {
CRM_Core_Error::debug_log_message($e->getMessage());
}
$participant = &$objects['participant'];
$contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
+ $contribution->receive_date = CRM_Utils_Date::isoToMysql($contribution->receive_date);
+ $contribution->receipt_date = CRM_Utils_Date::isoToMysql($contribution->receipt_date);
+ $contribution->thankyou_date = CRM_Utils_Date::isoToMysql($contribution->thankyou_date);
$contribution->contribution_status_id = array_search('Failed', $contributionStatus);
$contribution->save();
//add lineitems for recurring payments
if (CRM_Utils_Array::value('contributionRecur', $objects) && $objects['contributionRecur']->id && $addLineItems) {
- $this->addrecurLineItems($objects['contributionRecur']->id, $contribution->id);
+ $this->addrecurLineItems($objects['contributionRecur']->id, $contribution->id, CRM_Core_DAO::$_nullArray);
}
//copy initial contribution custom fields for recurring contributions
//add lineitems for recurring payments
if (CRM_Utils_Array::value('contributionRecur', $objects) && $objects['contributionRecur']->id && $addLineItems) {
- $this->addrecurLineItems($objects['contributionRecur']->id, $contribution->id);
+ $this->addrecurLineItems($objects['contributionRecur']->id, $contribution->id, CRM_Core_DAO::$_nullArray);
}
//copy initial contribution custom fields for recurring contributions
$values['amount'] = $recurContrib->amount;
$values['financial_type_id'] = $objects['contributionType']->id;
$values['title'] = $source = ts('Offline Recurring Contribution');
- $values['is_email_receipt'] = $recurContrib->is_email_receipt;
$domainValues = CRM_Core_BAO_Domain::getNameAndEmail();
$values['receipt_from_name'] = $domainValues[0];
$values['receipt_from_email'] = $domainValues[1];
}
+ if($recurContrib && $recurContrib->id){
+ //CRM-13273 - is_email_receipt setting on recurring contribution should take precedence over contribution page setting
+ $values['is_email_receipt'] = $recurContrib->is_email_receipt;
+ }
$contribution->source = $source;
if (CRM_Utils_Array::value('is_email_receipt', $values)) {
$values['custom_pre_id'] = $custom_pre_id;
$values['custom_post_id'] = $custom_post_ids;
+ //for tasks 'Change Participant Status' and 'Batch Update Participants Via Profile' case
+ //and cases involving status updation through ipn
+ $values['totalAmount'] = $input['amount'];
$contribution->source = ts('Online Event Registration') . ': ' . $values['event']['title'];
$contribution->trxn_id = $input['trxn_id'];
$contribution->receive_date = CRM_Utils_Date::isoToMysql($contribution->receive_date);
$contribution->thankyou_date = CRM_Utils_Date::isoToMysql($contribution->thankyou_date);
+ $contribution->receipt_date = CRM_Utils_Date::isoToMysql($contribution->receipt_date);
$contribution->cancel_date = 'null';
if (CRM_Utils_Array::value('check_number', $input)) {
//add lineitems for recurring payments
if (CRM_Utils_Array::value('contributionRecur', $objects) && $objects['contributionRecur']->id && $addLineItems) {
- $this->addrecurLineItems($objects['contributionRecur']->id, $contribution->id);
+ $this->addrecurLineItems($objects['contributionRecur']->id, $contribution->id, $input);
}
//copy initial contribution custom fields for recurring contributions
$paymentProcessorId = $objects['paymentProcessor']->id;
}
}
-
+ //it's hard to see how it could reach this point without a contributon id as it is saved in line 511 above
+ // which raised the question as to whether this check preceded line 511 & if so whether something could be broken
+ // From a lot of code reading /debugging I'm still not sure the intent WRT first & subsequent payments in this code
+ // it would be good if someone added some comments or refactored this
if ($contribution->id) {
$contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
- if (!$input['prevContribution']->is_pay_later &&
- $input['prevContribution']->contribution_status_id == array_search('Pending', $contributionStatuses)) {
- $input['payment_processor'] = $paymentProcessorId;
+ if ((empty($input['prevContribution']) && $paymentProcessorId) || (!$input['prevContribution']->is_pay_later &&
+- $input['prevContribution']->contribution_status_id == array_search('Pending', $contributionStatuses))) {
+ $input['payment_processor'] = $paymentProcessorId;
}
$input['contribution_status_id'] = array_search('Completed', $contributionStatuses);
$input['total_amount'] = $input['amount'];
$input['participant_id'] = $contribution->_relatedObjects['participant']->id;
$input['skipLineItem'] = 1;
}
-
+ //@todo writing a unit test I was unable to create a scenario where this line did not fatal on second
+ // and subsequent payments. In this case the line items are created at $this->addrecurLineItems
+ // and since the contribution is saved prior to this line there is always a contribution-id,
+ // however there is never a prevContribution (which appears to mean original contribution not previous
+ // contribution - or preUpdateContributionObject most accurately)
+ // so, this is always called & only appears to succeed when prevContribution exists - which appears
+ // to mean "are we updating an exisitng pending contribution"
+ //I was able to make the unit test complete as fataling here doesn't prevent
+ // the contribution being created - but activities would not be created or emails sent
CRM_Contribute_BAO_Contribution::recordFinancialAccounts($input, NULL);
}
function getBillingID(&$ids) {
// get the billing location type
- $locationTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id');
+ $locationTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id', array(), 'validate');
// CRM-8108 remove the ts around the Billing locationtype
//$ids['billing'] = array_search( ts('Billing'), $locationTypes );
$ids['billing'] = array_search('Billing', $locationTypes);
);
}
- function addrecurLineItems($recurId, $contributionId) {
+ function addrecurLineItems($recurId, $contributionId, &$input) {
$lineSets = $lineItems = array();
//Get the first contribution id with recur id
$lineSets[$pricesetID->price_set_id][] = $value;
}
}
-
- CRM_Price_BAO_LineItem::processPriceSet($contributionId, $lineSets);
+ if (!empty($input)) {
+ $input['line_item'] = $lineSets;
+ }
+ else {
+ CRM_Price_BAO_LineItem::processPriceSet($contributionId, $lineSets);
+ }
}
}
projects / civicrm-core.git / blobdiff