<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.4 |
+ | CiviCRM version 4.5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013 |
+ | Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
* $Id$
*
*/
$defaults['num_terms'] = 1;
$defaults['send_receipt'] = 0;
+ //set Soft Credit Type to Gift by default
+ $scTypes = CRM_Core_OptionGroup::values("soft_credit_type");
+ $defaults['soft_credit_type_id'] = CRM_Utils_Array::value(ts('Gift'), array_flip($scTypes));
+
$renewalDate = CRM_Utils_Date::processDate(CRM_Utils_Array::value('renewal_date', $defaults),
NULL, NULL, 'Y-m-d'
);
//CRM-10223 - allow contribution to be recorded against different contact
// causes a conflict in standalone mode so skip in standalone for now
$this->addElement('checkbox', 'contribution_contact', ts('Record Payment from a Different Contact?'));
- $this->add('select', 'soft_credit_type_id', ts('Membership payment is : '),
- array('' => ts('- Select - ')) + CRM_Core_OptionGroup::values("soft_credit_type", FALSE));
- require_once 'CRM/Contact/Form/NewContact.php';
- CRM_Contact_Form_NewContact::buildQuickForm($this,1, null, false,'contribution_');
+ $this->addSelect('soft_credit_type_id', array('entity' => 'contribution_soft'));
+ $this->addEntityRef('soft_credit_contact_id', ts('Payment From'), array('create' => TRUE));
}
}
}
$paymentParams['contactID'] = $this->_contributorContactID;
- //CRM-10377 if payment is by an alternate contact then we need to set that person
- // as the contact in the payment params
- if ($this->_contributorContactID != $this->_contactID) {
- if (!empty($this->_params['honor_type_id'])) {
- $paymentParams['honor_contact_id'] = $this->_contactID;
- $paymentParams['honor_type_id'] = $this->_params['honor_type_id'];
- }
- }
CRM_Core_Payment_Form::mapParams($this->_bltID, $this->_params, $paymentParams, TRUE);
if ($formValues['contribution_status_id'] == array_search('Pending', CRM_Contribute_PseudoConstant::contributionStatus())) {
$this->_params['is_pay_later'] = 1;
}
- $renewMembership = CRM_Member_BAO_Membership::renewMembership($this->_contactID,
+ $renewMembership = CRM_Member_BAO_Membership::renewMembershipFormWrapper($this->_contactID,
$formValues['membership_type_id'][1],
$isTestMembership, $this, NULL, NULL,
- $customFieldsFormatted, $numRenewTerms
+ $customFieldsFormatted, $numRenewTerms,
+ $this->_membershipId
);
$endDate = CRM_Utils_Date::processDate($renewMembership->end_date);
if($this->_contributorContactID != $this->_contactID){
$formValues['contribution_contact_id'] = $this->_contributorContactID;
if (!empty($this->_params['soft_credit_type_id'])){
- $formValues['soft_credit'][] = array(
+ $formValues['soft_credit'] = array(
'soft_credit_type_id' => $this->_params['soft_credit_type_id'],
'contact_id' => $this->_contactID,
- 'amount' => $formValues['total_amount'],
);
}
}