}
}
$membershipSource = CRM_Utils_Array::value('source', $value);
- list($membership) = CRM_Member_BAO_Membership::renewMembership(
+ list($membership) = CRM_Member_BAO_Membership::processMembership(
$value['contact_id'], $value['membership_type_id'], FALSE,
//$numTerms should be default to 1.
NULL, NULL, $value['custom'], 1, NULL, FALSE,
}
if (array_key_exists($fromRange, $formValues) && array_key_exists($toRange, $formValues)) {
+ // relative dates are not processed correctly as lower date value were ignored,
+ // to ensure both high and low date value got added IF there is relative date,
+ // we need to reset $formValues by unset and then adding again via CRM_Contact_BAO_Query::fixDateValues(...)
+ if (!empty($formValues[$id])) {
+ unset($formValues[$fromRange]);
+ unset($formValues[$toRange]);
+ }
CRM_Contact_BAO_Query::fixDateValues($formValues[$id], $formValues[$fromRange], $formValues[$toRange]);
continue;
}
FROM civicrm_membership_payment
WHERE contribution_id = %1 ";
$params = array(1 => array($this->id, 'Integer'));
+ $ids['membership'] = (array) CRM_Utils_Array::value('membership', $ids, array());
$dao = CRM_Core_DAO::executeQuery($query, $params);
while ($dao->fetch()) {
- if ($dao->membership_id) {
- if (!is_array($ids['membership'])) {
- $ids['membership'] = array();
- }
- $ids['membership'][] = $dao->membership_id;
+ if ($dao->membership_id && !in_array($dao->membership_id, $ids['membership'])) {
+ $ids['membership'][$dao->membership_id] = $dao->membership_id;
}
}
'contribution_page_id' => $form->_id,
'source' => CRM_Utils_Array::value('source', $paymentParams, CRM_Utils_Array::value('description', $paymentParams)),
);
- $isMonetary = !empty($form->_values['is_monetary']);
- if ($isMonetary) {
- if (empty($paymentParams['is_pay_later'])) {
- // @todo look up payment_instrument_id on payment processor table.
- $contributionParams['payment_instrument_id'] = 1;
- }
+ if (!empty($form->_paymentProcessor)) {
+ $contributionParams['payment_instrument_id'] = $paymentParams['payment_instrument_id'] = $form->_paymentProcessor['payment_instrument_id'];
}
+
$contribution = CRM_Contribute_Form_Contribution_Confirm::processFormContribution(
$form,
$paymentParams,
'source' => CRM_Utils_Array::value('source', $paymentParams, CRM_Utils_Array::value('description', $paymentParams)),
'thankyou_date' => CRM_Utils_Array::value('thankyou_date', $this->_params),
);
-
- if (empty($paymentParams['is_pay_later'])) {
- // @todo look up payment_instrument_id on payment processor table.
- $contributionParams['payment_instrument_id'] = 1;
- }
+ $contributionParams['payment_instrument_id'] = $this->_paymentProcessor['payment_instrument_id'];
$contribution = CRM_Contribute_Form_Contribution_Confirm::processFormContribution($this,
$this->_params,
* @throws \Exception
*/
protected function submit($submittedValues, $action, $pledgePaymentID) {
- $softParams = $softIDs = array();
+ $softIDs = array();
$pId = $contribution = $isRelatedId = FALSE;
$this->_params = $submittedValues;
$this->beginPostProcess();
*/
public $_contributionID;
+ /**
+ * @param $form
+ * @param $params
+ * @param $contributionParams
+ * @param $pledgeID
+ * @param $contribution
+ * @param $isEmailReceipt
+ * @return mixed
+ */
+ public static function handlePledge(&$form, $params, $contributionParams, $pledgeID, $contribution, $isEmailReceipt) {
+ if ($pledgeID) {
+ //when user doing pledge payments.
+ //update the schedule when payment(s) are made
+ $amount = $params['amount'];
+ $pledgePaymentParams = array();
+ foreach ($params['pledge_amount'] as $paymentId => $dontCare) {
+ $scheduledAmount = CRM_Core_DAO::getFieldValue(
+ 'CRM_Pledge_DAO_PledgePayment',
+ $paymentId,
+ 'scheduled_amount',
+ 'id'
+ );
+
+ $pledgePayment = ($amount >= $scheduledAmount) ? $scheduledAmount : $amount;
+ if ($pledgePayment > 0) {
+ $pledgePaymentParams[] = array(
+ 'id' => $paymentId,
+ 'contribution_id' => $contribution->id,
+ 'status_id' => $contribution->contribution_status_id,
+ 'actual_amount' => $pledgePayment,
+ );
+ $amount -= $pledgePayment;
+ }
+ }
+ if ($amount > 0 && count($pledgePaymentParams)) {
+ $pledgePaymentParams[count($pledgePaymentParams) - 1]['actual_amount'] += $amount;
+ }
+ foreach ($pledgePaymentParams as $p) {
+ CRM_Pledge_BAO_PledgePayment::add($p);
+ }
+
+ //update pledge status according to the new payment statuses
+ CRM_Pledge_BAO_PledgePayment::updatePledgePaymentStatus($pledgeID);
+ return $form;
+ }
+ else {
+ //when user creating pledge record.
+ $pledgeParams = array();
+ $pledgeParams['contact_id'] = $contribution->contact_id;
+ $pledgeParams['installment_amount'] = $pledgeParams['actual_amount'] = $contribution->total_amount;
+ $pledgeParams['contribution_id'] = $contribution->id;
+ $pledgeParams['contribution_page_id'] = $contribution->contribution_page_id;
+ $pledgeParams['financial_type_id'] = $contribution->financial_type_id;
+ $pledgeParams['frequency_interval'] = $params['pledge_frequency_interval'];
+ $pledgeParams['installments'] = $params['pledge_installments'];
+ $pledgeParams['frequency_unit'] = $params['pledge_frequency_unit'];
+ if ($pledgeParams['frequency_unit'] == 'month') {
+ $pledgeParams['frequency_day'] = intval(date("d"));
+ }
+ else {
+ $pledgeParams['frequency_day'] = 1;
+ }
+ $pledgeParams['create_date'] = $pledgeParams['start_date'] = $pledgeParams['scheduled_date'] = date("Ymd");
+ if (CRM_Utils_Array::value('start_date', $params)) {
+ $pledgeParams['frequency_day'] = intval(date("d", strtotime(CRM_Utils_Array::value('start_date', $params))));
+ $pledgeParams['start_date'] = $pledgeParams['scheduled_date'] = date('Ymd', strtotime(CRM_Utils_Array::value('start_date', $params)));
+ }
+ $pledgeParams['status_id'] = $contribution->contribution_status_id;
+ $pledgeParams['max_reminders'] = $form->_values['max_reminders'];
+ $pledgeParams['initial_reminder_day'] = $form->_values['initial_reminder_day'];
+ $pledgeParams['additional_reminder_day'] = $form->_values['additional_reminder_day'];
+ $pledgeParams['is_test'] = $contribution->is_test;
+ $pledgeParams['acknowledge_date'] = date('Ymd');
+ $pledgeParams['original_installment_amount'] = $pledgeParams['installment_amount'];
+
+ //inherit campaign from contirb page.
+ $pledgeParams['campaign_id'] = CRM_Utils_Array::value('campaign_id', $contributionParams);
+
+ $pledge = CRM_Pledge_BAO_Pledge::create($pledgeParams);
+
+ $form->_params['pledge_id'] = $pledge->id;
+
+ //send acknowledgment email. only when pledge is created
+ if ($pledge->id && $isEmailReceipt) {
+ //build params to send acknowledgment.
+ $pledgeParams['id'] = $pledge->id;
+ $pledgeParams['receipt_from_name'] = $form->_values['receipt_from_name'];
+ $pledgeParams['receipt_from_email'] = $form->_values['receipt_from_email'];
+
+ //scheduled amount will be same as installment_amount.
+ $pledgeParams['scheduled_amount'] = $pledgeParams['installment_amount'];
+
+ //get total pledge amount.
+ $pledgeParams['total_pledge_amount'] = $pledge->amount;
+
+ CRM_Pledge_BAO_Pledge::sendAcknowledgment($form, $pledgeParams);
+ return $form;
+ }
+ return $form;
+ }
+ }
+
/**
* Set the parameters to be passed to contribution create function.
*
//CRM-13981, processing honor contact into soft-credit contribution
CRM_Contribute_BAO_ContributionSoft::processSoftContribution($params, $contribution);
- //handle pledge stuff.
if ($isPledge) {
- if ($pledgeID) {
- //when user doing pledge payments.
- //update the schedule when payment(s) are made
- $amount = $params['amount'];
- $pledgePaymentParams = array();
- foreach ($params['pledge_amount'] as $paymentId => $dontCare) {
- $scheduledAmount = CRM_Core_DAO::getFieldValue(
- 'CRM_Pledge_DAO_PledgePayment',
- $paymentId,
- 'scheduled_amount',
- 'id'
- );
-
- $pledgePayment = ($amount >= $scheduledAmount) ? $scheduledAmount : $amount;
- if ($pledgePayment > 0) {
- $pledgePaymentParams[] = array(
- 'id' => $paymentId,
- 'contribution_id' => $contribution->id,
- 'status_id' => $contribution->contribution_status_id,
- 'actual_amount' => $pledgePayment,
- );
- $amount -= $pledgePayment;
- }
- }
- if ($amount > 0 && count($pledgePaymentParams)) {
- $pledgePaymentParams[count($pledgePaymentParams) - 1]['actual_amount'] += $amount;
- }
- foreach ($pledgePaymentParams as $p) {
- CRM_Pledge_BAO_PledgePayment::add($p);
- }
-
- //update pledge status according to the new payment statuses
- CRM_Pledge_BAO_PledgePayment::updatePledgePaymentStatus($pledgeID);
- }
- else {
- //when user creating pledge record.
- $pledgeParams = array();
- $pledgeParams['contact_id'] = $contribution->contact_id;
- $pledgeParams['installment_amount'] = $pledgeParams['actual_amount'] = $contribution->total_amount;
- $pledgeParams['contribution_id'] = $contribution->id;
- $pledgeParams['contribution_page_id'] = $contribution->contribution_page_id;
- $pledgeParams['financial_type_id'] = $contribution->financial_type_id;
- $pledgeParams['frequency_interval'] = $params['pledge_frequency_interval'];
- $pledgeParams['installments'] = $params['pledge_installments'];
- $pledgeParams['frequency_unit'] = $params['pledge_frequency_unit'];
- if ($pledgeParams['frequency_unit'] == 'month') {
- $pledgeParams['frequency_day'] = intval(date("d"));
- }
- else {
- $pledgeParams['frequency_day'] = 1;
- }
- $pledgeParams['create_date'] = $pledgeParams['start_date'] = $pledgeParams['scheduled_date'] = date("Ymd");
- if (CRM_Utils_Array::value('start_date', $params)) {
- $pledgeParams['frequency_day'] = intval(date("d", strtotime(CRM_Utils_Array::value('start_date', $params))));
- $pledgeParams['start_date'] = $pledgeParams['scheduled_date'] = date('Ymd', strtotime(CRM_Utils_Array::value('start_date', $params)));
- }
- $pledgeParams['status_id'] = $contribution->contribution_status_id;
- $pledgeParams['max_reminders'] = $form->_values['max_reminders'];
- $pledgeParams['initial_reminder_day'] = $form->_values['initial_reminder_day'];
- $pledgeParams['additional_reminder_day'] = $form->_values['additional_reminder_day'];
- $pledgeParams['is_test'] = $contribution->is_test;
- $pledgeParams['acknowledge_date'] = date('Ymd');
- $pledgeParams['original_installment_amount'] = $pledgeParams['installment_amount'];
-
- //inherit campaign from contirb page.
- $pledgeParams['campaign_id'] = CRM_Utils_Array::value('campaign_id', $contributionParams);
-
- $pledge = CRM_Pledge_BAO_Pledge::create($pledgeParams);
-
- $form->_params['pledge_id'] = $pledge->id;
-
- //send acknowledgment email. only when pledge is created
- if ($pledge->id && $isEmailReceipt) {
- //build params to send acknowledgment.
- $pledgeParams['id'] = $pledge->id;
- $pledgeParams['receipt_from_name'] = $form->_values['receipt_from_name'];
- $pledgeParams['receipt_from_email'] = $form->_values['receipt_from_email'];
-
- //scheduled amount will be same as installment_amount.
- $pledgeParams['scheduled_amount'] = $pledgeParams['installment_amount'];
-
- //get total pledge amount.
- $pledgeParams['total_pledge_amount'] = $pledge->amount;
-
- CRM_Pledge_BAO_Pledge::sendAcknowledgment($form, $pledgeParams);
- }
- }
+ $form = self::handlePledge($form, $params, $contributionParams, $pledgeID, $contribution, $isEmailReceipt);
}
if ($online && $contribution) {
$recurParams['installments'] = CRM_Utils_Array::value('installments', $params);
$recurParams['financial_type_id'] = CRM_Utils_Array::value('financial_type_id', $params);
$recurParams['currency'] = CRM_Utils_Array::value('currency', $params);
+ $recurParams['payment_instrument_id'] = $params['payment_instrument_id'];
// CRM-14354: For an auto-renewing membership with an additional contribution,
// if separate payments is not enabled, make sure only the membership fee recurs
$recurParams['trxn_id'] = CRM_Utils_Array::value('trxn_id', $params, $params['invoiceID']);
$recurParams['financial_type_id'] = $contributionType->id;
- if (!empty($form->_values['is_monetary'])) {
- $recurParams['payment_instrument_id'] = 1;
- }
-
$campaignId = CRM_Utils_Array::value('campaign_id', $params, CRM_Utils_Array::value('campaign_id', $form->_values));
$recurParams['campaign_id'] = $campaignId;
$recurring = CRM_Contribute_BAO_ContributionRecur::add($recurParams);
}
}
+ if (!$isProcessSeparateMembershipTransaction) {
+ $membershipParams['skipLineItem'] = 1;
+ }
$paymentResult = CRM_Contribute_BAO_Contribution_Utils::processConfirm($form, $membershipParams,
$contactID,
$financialTypeID,
}
}
- list($membership, $renewalMode, $dates) = CRM_Member_BAO_Membership::renewMembership(
+ list($membership, $renewalMode, $dates) = CRM_Member_BAO_Membership::processMembership(
$contactID, $memType, $isTest,
date('YmdHis'), CRM_Utils_Array::value('cms_contactID', $membershipParams),
$customFieldsFormatted,
$numTerms, $membershipID, $pending,
- $contributionRecurID, $membershipSource, $isPayLater, $campaignId
+ $contributionRecurID, $membershipSource, $isPayLater, $campaignId, array(), $membershipContribution
);
$form->set('renewal_mode', $renewalMode);
}
//passing contribution id is already registered.
- $contribution = self::processContribution($this, $value, $result, $contactID, $pending, $isAdditionalAmount);
+ $contribution = self::processContribution($this, $value, $result, $contactID, $pending, $isAdditionalAmount, $this->_paymentProcessor);
$value['contributionID'] = $contribution->id;
$value['contributionTypeID'] = $contribution->financial_type_id;
$value['receive_date'] = $contribution->receive_date;
*/
public static function processContribution(
&$form, $params, $result, $contactID,
- $pending = FALSE, $isAdditionalAmount = FALSE
+ $pending = FALSE, $isAdditionalAmount = FALSE,
+ $paymentProcessor = NULL
) {
$transaction = new CRM_Core_Transaction();
'campaign_id' => CRM_Utils_Array::value('campaign_id', $params),
);
- if (empty($params['is_pay_later'])) {
- $contribParams['payment_instrument_id'] = 1;
+ if ($paymentProcessor) {
+ $contribParams['payment_instrument_id'] = $paymentProcessor['payment_instrument_id'];
}
if (!$pending && $result) {
}
}
+ /**
+ * Submit in test mode.
+ *
+ * @param $params
+ */
+ public static function testSubmit($params) {
+ $form = new CRM_Event_Form_Registration_Confirm();
+ // This way the mocked up controller ignores the session stuff.
+ $_SERVER['REQUEST_METHOD'] = 'GET';
+ $_REQUEST['id'] = $form->_eventId = $params['id'];
+ $form->controller = new CRM_Event_Controller_Registration();
+ $form->_params = $params['params'];
+ $form->set('params', $params['params']);
+ $form->_values['custom_pre_id'] = array();
+ $form->_values['custom_post_id'] = array();
+ $form->_contributeMode = $params['contributeMode'];
+ $eventParams = array('id' => $params['id']);
+ CRM_Event_BAO_Event::retrieve($eventParams, $form->_values['event']);
+ $form->set('registerByID', $params['registerByID']);
+ $form->postProcess();
+ }
+
}
);
}
+ if (empty($params['line_item']) && !empty($params['membership_type_id']) && empty($params['skipLineItem'])) {
+ CRM_Price_BAO_LineItem::getLineItemArray($params, NULL, 'membership', $params['membership_type_id']);
+ }
$params['skipLineItem'] = TRUE;
//record contribution for this membership
}
if (!empty($params['line_item']) && empty($ids['contribution'])) {
- CRM_Price_BAO_LineItem::processPriceSet($membership->id, $params['line_item'], CRM_Utils_Array::value('contribution', $params));
+ CRM_Price_BAO_LineItem::processPriceSet(
+ $membership->id,
+ $params['line_item'],
+ CRM_Utils_Array::value('contribution', $params)
+ );
}
//insert payment record for this membership
* @throws CRM_Core_Exception
* @return array
*/
- public static function renewMembership($contactID, $membershipTypeID, $is_test, $changeToday, $modifiedID, $customFieldsFormatted, $numRenewTerms, $membershipID, $pending, $contributionRecurID, $membershipSource, $isPayLater, $campaignId, $formDates = array()) {
+ public static function processMembership($contactID, $membershipTypeID, $is_test, $changeToday, $modifiedID, $customFieldsFormatted, $numRenewTerms, $membershipID, $pending, $contributionRecurID, $membershipSource, $isPayLater, $campaignId, $formDates = array(), $contribution = NULL) {
$renewalMode = $updateStatusId = FALSE;
$allStatus = CRM_Member_PseudoConstant::membershipStatus();
$format = '%Y%m%d';
$statusFormat = '%Y-%m-%d';
$membershipTypeDetails = CRM_Member_BAO_MembershipType::getMembershipTypeDetails($membershipTypeID);
$dates = array();
+ $ids = array();
// CRM-7297 - allow membership type to be be changed during renewal so long as the parent org of new membershipType
// is the same as the parent org of an existing membership of the contact
$currentMembership = CRM_Member_BAO_Membership::getContactMembership($contactID, $membershipTypeID,
// CRM-15475
array_search('Cancelled', CRM_Member_PseudoConstant::membershipStatus(NULL, " name = 'Cancelled' ", 'name', FALSE, TRUE)),
))) {
- $membership = new CRM_Member_DAO_Membership();
- $membership->id = $currentMembership['id'];
- $membership->find(TRUE);
- // CRM-8141 create a membership_log entry so that we will know the membership_type_id to change to when payment completed
- $format = '%Y%m%d';
- // note that we are logging the requested new membership_type_id that may be different than current membership_type_id
- // it will be used when payment is received to update the membership_type_id to what was paid for
- $logParams = array(
- 'membership_id' => $membership->id,
- 'status_id' => $membership->status_id,
- 'start_date' => CRM_Utils_Date::customFormat(
- $membership->start_date,
- $format
- ),
- 'end_date' => CRM_Utils_Date::customFormat(
- $membership->end_date,
- $format
- ),
- 'modified_date' => CRM_Utils_Date::customFormat(
- date('Ymd'),
- $format
- ),
+ $memParams = array(
+ 'id' => $currentMembership['id'],
+ 'contribution' => $contribution,
+ 'status_id' => $currentMembership['status_id'],
+ 'start_date' => $currentMembership['start_date'],
+ 'end_date' => $currentMembership['end_date'],
+ 'join_date' => $currentMembership['join_date'],
'membership_type_id' => $membershipTypeID,
'max_related' => !empty($membershipTypeDetails['max_related']) ? $membershipTypeDetails['max_related'] : NULL,
);
- $session = CRM_Core_Session::singleton();
- // If we have an authenticated session, set modified_id to that user's contact_id, else set to membership.contact_id
- if ($session->get('userID')) {
- $logParams['modified_id'] = $session->get('userID');
- }
- else {
- $logParams['modified_id'] = $membership->contact_id;
- }
- CRM_Member_BAO_MembershipLog::add($logParams);
-
if ($contributionRecurID) {
- CRM_Core_DAO::setFieldValue('CRM_Member_DAO_Membership', $membership->id,
- 'contribution_recur_id', $contributionRecurID
- );
+ $memParams['contribution_recur_id'] = $contributionRecurID;
}
-
+ $membership = self::create($memParams, $ids, FALSE, $activityType);
return array($membership, $renewalMode, $dates);
}
$memParams['campaign_id'] = $campaignId;
}
+ $memParams['contribution'] = $contribution;
$memParams['custom'] = $customFieldsFormatted;
$membership = self::create($memParams, $ids, FALSE, $activityType);
$financialType->id = $params['financial_type_id'];
$financialType->find(TRUE);
$this->_params = $formValues;
+ $paymentParams['payment_instrument_id'] = $this->_paymentProcessor['payment_instrument_id'];
$contribution = CRM_Contribute_Form_Contribution_Confirm::processFormContribution($this,
$paymentParams,
NULL,
);
$params['source'] = $formValues['source'] ? $formValues['source'] : $params['contribution_source'];
$params['trxn_id'] = CRM_Utils_Array::value('trxn_id', $result);
- $params['payment_instrument_id'] = 1;
$params['is_test'] = ($this->_mode == 'live') ? 0 : 1;
if (!empty($formValues['send_receipt'])) {
$params['receipt_date'] = $now;
$this->_params['contribution_status_id'] = $result['payment_status_id'];
$this->_params['trxn_id'] = $result['trxn_id'];
- $this->_params['payment_instrument_id'] = 1;
$this->_params['is_test'] = ($this->_mode == 'live') ? 0 : 1;
$this->set('params', $this->_params);
$this->assign('trxn_id', $result['trxn_id']);
$isPending = ($this->_params['contribution_status_id'] == 2) ? TRUE : FALSE;
- list($renewMembership) = CRM_Member_BAO_Membership::renewMembership(
+ list($renewMembership) = CRM_Member_BAO_Membership::processMembership(
$this->_contactID, $this->_params['membership_type_id'][1], $isTestMembership,
$renewalDate, NULL, $customFieldsFormatted, $numRenewTerms, $this->_membershipId,
$isPending,
--- /dev/null
+{* file to handle db changes in 4.7.15 during upgrade *}
}
//Check if files path exists...
- if ($this->checkFilesExists($basepath, $folder)) {
+ if ($this->checkFilesExists($basepath, $folder) && $folder == $_SERVER['HTTP_HOST']) {
$correct = $folder;
break;
}
$metadata = array();
}
- // Normalize this for the sake of spec funcions
- $apiRequest['params']['options']['get_options'] = $optionsToResolve;
+ // Hack for product api to pass tests.
+ if (!is_string($apiRequest['params']['options'])) {
+ // Normalize this for the sake of spec funcions
+ $apiRequest['params']['options']['get_options'] = $optionsToResolve;
+ }
// find any supplemental information
$hypApiRequest = array('entity' => $apiRequest['entity'], 'action' => $action, 'version' => $apiRequest['version']);
//need to pass action to handle related memberships.
$params['action'] = $action;
- if (empty($params['line_item']) && !empty($params['membership_type_id']) && empty($params['skipLineItem'])) {
- CRM_Price_BAO_LineItem::getLineItemArray($params, NULL, 'membership', $params['membership_type_id']);
- }
-
$membershipBAO = CRM_Member_BAO_Membership::create($params, $ids, TRUE);
if (array_key_exists('is_error', $membershipBAO)) {
LOCK TABLES `civicrm_domain` WRITE;
/*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
-INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.7.14',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.7.15',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
* Test the submit function on the contribution page.
*/
public function testSubmitCreditCardPayPal() {
- $this->markTestIncomplete('Paypal is creating a complete contribution but we are testing pending
- we are unsure at this point if this is correct behaviour or not');
- return;
$form = new CRM_Contribute_Form_Contribution();
$paymentProcessorID = $this->paymentProcessorCreate(array('is_test' => 0));
$form->_mode = 'Live';
+ $error = FALSE;
try {
$form->testSubmit(array(
'total_amount' => 50,
'receive_date' => '04/21/2015',
'receive_date_time' => '11:27PM',
'contact_id' => $this->_individualId,
- 'payment_instrument_id' => array_search('Credit Card', $this->paymentInstruments),
'contribution_status_id' => 1,
'credit_card_number' => 4444333322221111,
'cvv2' => 123,
), CRM_Core_Action::ADD);
}
catch (Civi\Payment\Exception\PaymentProcessorException $e) {
- $this->assertEquals('Transaction cannot be processed. Please use a different payment card.',
- $e->getMessage());
+ $error = TRUE;
}
+
$this->callAPISuccessGetCount('Contribution', array(
'contact_id' => $this->_individualId,
- 'contribution_status_id' => 'Pending',
+ 'contribution_status_id' => $error ? 'Pending' : 'Completed',
+ 'payment_instrument_id' => $this->callAPISuccessGetValue('PaymentProcessor', array(
+ 'return' => 'payment_instrument_id',
+ 'id' => $paymentProcessorID,
+ )),
), 1);
$contact = $this->callAPISuccessGetSingle('Contact', array('id' => $this->_individualId));
$this->assertTrue(empty($contact['source']));
--- /dev/null
+<?php
+
+/**
+ * Test CRM_Event_Form_Registration functions.
+ *
+ * @package CiviCRM
+ * @group headless
+ */
+class CRM_Event_Form_Registration_ConfirmTest extends CiviUnitTestCase {
+
+ public function setUp() {
+ $this->useTransaction(TRUE);
+ parent::setUp();
+ }
+
+ /**
+ * Initial test of submit function.
+ *
+ * @throws \Exception
+ */
+ public function testSubmit() {
+ $event = $this->eventCreate();
+ CRM_Event_Form_Registration_Confirm::testSubmit(array(
+ 'id' => $event['id'],
+ 'contributeMode' => 'direct',
+ 'registerByID' => $this->createLoggedInUser(),
+ 'params' => array(
+ array(
+ 'qfKey' => 'e6eb2903eae63d4c5c6cc70bfdda8741_2801',
+ 'entryURL' => 'http://dmaster.local/civicrm/event/register?reset=1&id=3',
+ 'first_name' => 'k',
+ 'last_name' => 'p',
+ 'email-Primary' => 'demo@example.com',
+ 'hidden_processor' => '1',
+ 'credit_card_number' => '4111111111111111',
+ 'cvv2' => '123',
+ 'credit_card_exp_date' => array(
+ 'M' => '1',
+ 'Y' => '2019',
+ ),
+ 'credit_card_type' => 'Visa',
+ 'billing_first_name' => 'p',
+ 'billing_middle_name' => '',
+ 'billing_last_name' => 'p',
+ 'billing_street_address-5' => 'p',
+ 'billing_city-5' => 'p',
+ 'billing_state_province_id-5' => '1061',
+ 'billing_postal_code-5' => '7',
+ 'billing_country_id-5' => '1228',
+ 'scriptFee' => '',
+ 'scriptArray' => '',
+ 'priceSetId' => '6',
+ 'price_7' => array(
+ 13 => 1,
+ ),
+ 'payment_processor_id' => '1',
+ 'bypass_payment' => '',
+ 'MAX_FILE_SIZE' => '33554432',
+ 'is_primary' => 1,
+ 'is_pay_later' => 0,
+ 'campaign_id' => NULL,
+ 'defaultRole' => 1,
+ 'participant_role_id' => '1',
+ 'currencyID' => 'USD',
+ 'amount_level' => '\ 1Tiny-tots (ages 5-8) - 1\ 1',
+ 'amount' => '800.00',
+ 'tax_amount' => NULL,
+ 'year' => '2019',
+ 'month' => '1',
+ 'ip_address' => '127.0.0.1',
+ 'invoiceID' => '57adc34957a29171948e8643ce906332',
+ 'button' => '_qf_Register_upload',
+ 'billing_state_province-5' => 'AP',
+ 'billing_country-5' => 'US',
+ ),
+ ),
+ ));
+ $this->callAPISuccessGetSingle('Participant', array());
+ }
+
+}
$config->keyDisable = TRUE;
$isTestMembership = 0;
- list($MembershipRenew) = CRM_Member_BAO_Membership::renewMembership(
+ list($MembershipRenew) = CRM_Member_BAO_Membership::processMembership(
$contactId,
$this->_membershipTypeID,
$isTestMembership,
$membershipRenewal = new CRM_Core_Form();
$membershipRenewal->controller = new CRM_Core_Controller();
- list($MembershipRenew) = CRM_Member_BAO_Membership::renewMembership(
+ list($MembershipRenew) = CRM_Member_BAO_Membership::processMembership(
$contactId,
$this->_membershipTypeID,
FALSE,
'entity_table' => 'civicrm_membership',
'contribution_id' => $contribution['id'],
), 1);
- $this->_checkFinancialRecords(array('id' => $contribution['id'], 'total_amount' => 50, 'financial_account_id' => 2), 'online');
+ $this->_checkFinancialRecords(array(
+ 'id' => $contribution['id'],
+ 'total_amount' => 50,
+ 'financial_account_id' => 2,
+ 'payment_instrument_id' => $this->callAPISuccessGetValue('PaymentProcessor', array(
+ 'id' => $this->_paymentProcessorID,
+ 'return' => 'payment_instrument_id',
+ )),
+ ), 'online');
}
/**
$this->assertNotEmpty($contributionRecur['invoice_id']);
$this->assertEquals(CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id',
'Pending'), $contributionRecur['contribution_status_id']);
- $this->assertEquals(CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'payment_instrument_id',
- 'Credit Card'), $contributionRecur['payment_instrument_id']);
+ $this->assertEquals($this->callAPISuccessGetValue('PaymentProcessor', array(
+ 'id' => $this->_paymentProcessorID,
+ 'return' => 'payment_instrument_id',
+ )), $contributionRecur['payment_instrument_id']);
$contribution = $this->callAPISuccess('Contribution', 'getsingle', array(
'contact_id' => $this->_individualId,
'is_test' => TRUE,
));
- $this->assertEquals(CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'payment_instrument_id',
- 'Credit Card'), $contribution['payment_instrument_id']);
+ $this->assertEquals($this->callAPISuccessGetValue('PaymentProcessor', array(
+ 'id' => $this->_paymentProcessorID,
+ 'return' => 'payment_instrument_id',
+ )), $contribution['payment_instrument_id']);
$this->assertEquals($contributionRecur['id'], $contribution['contribution_recur_id']);
$this->callAPISuccessGetCount('LineItem', array(
'In Progress'), $contributionRecur['contribution_status_id']);
$this->assertNotEmpty($contributionRecur['next_sched_contribution_date']);
*/
- $this->assertEquals(CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'payment_instrument_id',
- 'Credit Card'), $contributionRecur['payment_instrument_id']);
+ $paymentInstrumentID = $this->callAPISuccessGetValue('PaymentProcessor', array(
+ 'id' => $this->_paymentProcessorID,
+ 'return' => 'payment_instrument_id',
+ ));
+ $this->assertEquals($paymentInstrumentID, $contributionRecur['payment_instrument_id']);
$contribution = $this->callAPISuccess('Contribution', 'getsingle', array(
'contact_id' => $this->_individualId,
'is_test' => TRUE,
));
- $this->assertEquals(CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'payment_instrument_id',
- 'Credit Card'), $contribution['payment_instrument_id']);
+ $this->assertEquals($paymentInstrumentID, $contribution['payment_instrument_id']);
$this->assertEquals('kettles boil water', $contribution['trxn_id']);
$this->assertEquals(.29, $contribution['fee_amount']);
'contribution_id' => $contribution['id'],
), 1);
- $this->_checkFinancialRecords(array('id' => $contribution['id'], 'total_amount' => 50, 'financial_account_id' => 2), 'online');
+ $this->_checkFinancialRecords(array(
+ 'id' => $contribution['id'],
+ 'total_amount' => 50,
+ 'financial_account_id' => 2,
+ 'payment_instrument_id' => $this->callAPISuccessGetValue('PaymentProcessor', array(
+ 'id' => $this->_paymentProcessorID,
+ 'return' => 'payment_instrument_id',
+ )),
+ ), 'online');
$this->mut->checkMailLog(array(
'50',
'Receipt text',
'trxn_id' => 'kettles boil water',
'fee_amount' => .14,
));
+ $processorDetail = $processor->getPaymentProcessor();
$this->callAPISuccess('MembershipType', 'create', array(
'id' => $this->membershipTypeAnnualFixedID,
'duration_unit' => 'month',
$this->assertEquals(.14, $contribution['fee_amount']);
$this->assertEquals('kettles boil water', $contribution['trxn_id']);
+ $this->assertEquals($processorDetail['payment_instrument_id'], $contribution['payment_instrument_id']);
$this->callAPISuccessGetCount('LineItem', array(
'entity_id' => $membership['id'],
'url_recur' => 'http://dummy.com',
'billing_mode' => 1,
'sequential' => 1,
+ 'payment_instrument_id' => 'Debit Card',
);
$processor = $this->callAPISuccess('PaymentProcessor', 'create', $processorParams);
return $processor['id'];
'billing_mode' => 3,
'financial_type_id' => 1,
'financial_account_id' => 12,
+ // Credit card = 1 so can pass 'by accident'.
+ 'payment_instrument_id' => 'Debit Card',
),
$params);
if (!is_numeric($params['payment_processor_type_id'])) {
'participant_id' => $participant['id'],
'contribution_id' => $contribution['id'],
);
- $ids = array();
$this->callAPISuccess('ParticipantPayment', 'create', $paymentParticipant);
return array($lineItems, $contribution);
}
'to_financial_account_id' => 12,
'total_amount' => CRM_Utils_Array::value('total_amount', $params, 100),
'status_id' => 1,
- 'payment_instrument_id' => 1,
+ 'payment_instrument_id' => CRM_Utils_Array::value('payment_instrument_id', $params, 1),
);
}
elseif ($context == 'payLater') {
'trxn_id' => 'create_first_success',
'fee_amount' => .85,
));
+ $processor = $dummyPP->getPaymentProcessor();
$this->callAPISuccess('ContributionPage', 'create', array(
'id' => $this->_ids['contribution_page'],
'payment_processor' => array($paymentProcessor2ID, $this->_ids['payment_processor']),
$this->_checkFinancialRecords(array(
'id' => $contribution['id'],
'total_amount' => $contribution['total_amount'],
+ 'payment_instrument_id' => $processor['payment_instrument_id'],
), 'online');
}
$this->callAPIAndDocument('contribution_page', 'submit', $submitParams, __FUNCTION__, __FILE__, 'submit contribution page', NULL);
$contributions = $this->callAPISuccess('contribution', 'get', array('contribution_page_id' => $this->_ids['contribution_page']));
$this->assertCount(2, $contributions['values']);
+ $this->callAPISuccessGetCount('LineItem', array(), 2);
$membershipPayment = $this->callAPISuccess('membership_payment', 'getsingle', array());
$this->assertTrue(in_array($membershipPayment['contribution_id'], array_keys($contributions['values'])));
$membership = $this->callAPISuccessGetSingle('membership', array('id' => $membershipPayment['membership_id']));
$this->setUpMembershipContributionPage();
$dummyPP = Civi\Payment\System::singleton()->getByProcessor($this->_paymentProcessor);
$dummyPP->setDoDirectPaymentResult(array('payment_status_id' => 1, 'trxn_id' => 'create_first_success'));
+ $processor = $dummyPP->getPaymentProcessor();
$submitParams = array(
'price_' . $this->_ids['price_field'][0] => reset($this->_ids['price_field_value']),
'contribution_page_id' => $this->_ids['contribution_page'],
'contribution_status_id' => 1,
));
+ $this->assertEquals($processor['payment_instrument_id'], $contribution['payment_instrument_id']);
$this->assertEquals('create_first_success', $contribution['trxn_id']);
$membershipPayment = $this->callAPISuccess('membership_payment', 'getsingle', array());
$this->assertEquals($membership['contact_id'], $contribution['contact_id']);
$this->assertEquals(1, $membership['status_id']);
$this->callAPISuccess('contribution_recur', 'getsingle', array('id' => $contribution['contribution_recur_id']));
- //@todo - check with Joe about these not existing
- //$this->callAPISuccess('line_item', 'getsingle', array('contribution_id' => $contribution['id'], 'entity_id' => $membership['id']));
+
+ $this->callAPISuccess('line_item', 'getsingle', array('contribution_id' => $contribution['id'], 'entity_id' => $membership['id']));
//renew it with processor setting completed - should extend membership
$submitParams['contact_id'] = $contribution['contact_id'];
$dummyPP->setDoDirectPaymentResult(array('payment_status_id' => 1, 'trxn_id' => 'create_second_success'));
$renewedMembership = $this->callAPISuccessGetSingle('membership', array('id' => $membershipPayment['membership_id']));
$this->assertEquals(date('Y-m-d', strtotime('+ 1 year', strtotime($membership['end_date']))), $renewedMembership['end_date']);
$recurringContribution = $this->callAPISuccess('contribution_recur', 'getsingle', array('id' => $contribution['contribution_recur_id']));
+ $this->assertEquals($processor['payment_instrument_id'], $recurringContribution['payment_instrument_id']);
$this->assertEquals(5, $recurringContribution['contribution_status_id']);
}
$this->setUpMembershipContributionPage();
$dummyPP = Civi\Payment\System::singleton()->getByProcessor($this->_paymentProcessor);
$dummyPP->setDoDirectPaymentResult(array('payment_status_id' => 2));
+ $this->membershipTypeCreate(array('name' => 'Student'));
+
+ // Add a contribution & a couple of memberships so the id will not be 1 & will differ from membership id.
+ // This saves us from 'accidental success'.
+ $this->contributionCreate(array('contact_id' => $this->contactIds[0]));
+ $this->contactMembershipCreate(array('contact_id' => $this->contactIds[0]));
+ $this->contactMembershipCreate(array('contact_id' => $this->contactIds[0], 'membership_type_id' => 'Student'));
$submitParams = array(
'price_' . $this->_ids['price_field'][0] => reset($this->_ids['price_field_value']),
'contribution_page_id' => $this->_ids['contribution_page'],
'contribution_status_id' => 2,
));
+
$membershipPayment = $this->callAPISuccess('membership_payment', 'getsingle', array());
$this->assertEquals($membershipPayment['contribution_id'], $contribution['id']);
$membership = $this->callAPISuccessGetSingle('membership', array('id' => $membershipPayment['membership_id']));
$this->assertEquals($membership['contact_id'], $contribution['contact_id']);
$this->assertEquals(5, $membership['status_id']);
- //@todo - check with Joe about these not existing
- //$this->callAPISuccess('line_item', 'getsingle', array('contribution_id' => $contribution['id'], 'entity_id' => $membership['id']));
+
+ $line = $this->callAPISuccess('line_item', 'getsingle', array('contribution_id' => $contribution['id']));
+ $this->assertEquals('civicrm_membership', $line['entity_table']);
+ $this->assertEquals($membership['id'], $line['entity_id']);
+
$this->callAPISuccess('contribution', 'completetransaction', array(
'id' => $contribution['id'],
'trxn_id' => 'ipn_called',
'payment_processor_id' => $this->_paymentProcessor['id'],
));
+ $line = $this->callAPISuccess('line_item', 'getsingle', array('contribution_id' => $contribution['id']));
+ $this->assertEquals('civicrm_membership', $line['entity_table']);
+ $this->assertEquals($membership['id'], $line['entity_id']);
+
$membership = $this->callAPISuccessGetSingle('membership', array('id' => $membershipPayment['membership_id']));
//renew it with processor setting completed - should extend membership
$submitParams = array_merge($submitParams, array(
'frequency_unit' => 'month',
)
);
+
$dummyPP->setDoDirectPaymentResult(array('payment_status_id' => 2));
$this->callAPISuccess('contribution_page', 'submit', $submitParams);
$newContribution = $this->callAPISuccess('contribution', 'getsingle', array(
'contribution_status_id' => 2,
)
);
+ $line = $this->callAPISuccess('line_item', 'getsingle', array('contribution_id' => $newContribution['id']));
+ $this->assertEquals('civicrm_membership', $line['entity_table']);
+ $this->assertEquals($membership['id'], $line['entity_id']);
$renewedMembership = $this->callAPISuccessGetSingle('membership', array('id' => $membershipPayment['membership_id']));
//no renewal as the date hasn't changed
'total_amount' => 100.00,
'financial_type_id' => 1,
'contribution_page_id' => $contributionPage['id'],
- 'payment_processor' => 1,
+ 'payment_processor' => $this->paymentProcessorID,
'trxn_id' => 12345,
'invoice_id' => 67890,
'source' => 'SSF',
$this->assertEquals($contribution['values'][$contribution['id']]['invoice_id'], 67890);
$this->assertEquals($contribution['values'][$contribution['id']]['source'], 'SSF');
$this->assertEquals($contribution['values'][$contribution['id']]['contribution_status_id'], 1);
+ $contribution['payment_instrument_id'] = $this->callAPISuccessGetValue('PaymentProcessor', array(
+ 'id' => $this->paymentProcessorID,
+ 'return' => 'payment_instrument_id',
+ ));
$this->_checkFinancialRecords($contribution, 'online');
}
unset($lineItem1['values'][0]['id'], $lineItem1['values'][0]['entity_id']);
unset($lineItem2['values'][0]['id'], $lineItem2['values'][0]['entity_id']);
$this->assertEquals($lineItem1['values'][0], $lineItem2['values'][0]);
- $this->_checkFinancialRecords(array('id' => $originalContribution['id'] + 1), 'online');
+ $this->_checkFinancialRecords(array(
+ 'id' => $originalContribution['id'] + 1,
+ 'payment_instrument_id' => $this->callAPISuccessGetValue('PaymentProcessor', array(
+ 'id' => $originalContribution['payment_processor_id'],
+ 'return' => 'payment_instrument_id',
+ )),
+ ), 'online');
$this->quickCleanUpFinancialEntities();
}
array('contribution_recur_id' => $contributionRecur['id']))
);
}
-
+ $originalContribution['payment_processor_id'] = $paymentProcessorID;
return $originalContribution;
}
<?xml version="1.0" encoding="iso-8859-1" ?>
<version>
- <version_no>4.7.14</version_no>
+ <version_no>4.7.15</version_no>
</version>
projects / civicrm-core.git / commitdiff