* @throws \CRM_Core_Exception
* @throws \CiviCRM_API3_Exception
*/
- public function submit() {
- $isTest = ($this->_mode === 'test') ? 1 : 0;
+ public function submit(): void {
$this->storeContactFields($this->_params);
$this->beginPostProcess();
$endDate = NULL;
$this->assign('is_pay_later', 1);
}
- if (!empty($formValues['send_receipt'])) {
+ if ($this->getSubmittedValue('send_receipt')) {
$params['receipt_date'] = $formValues['receive_date'] ?? NULL;
}
$softParams['soft_credit_type_id'] = $formValues['soft_credit_type_id'];
}
}
- if (!empty($formValues['send_receipt'])) {
+ if ($this->getSubmittedValue('send_receipt')) {
$paymentParams['email'] = $this->_contributorEmail;
}
[
'contact_id' => $this->_contributorContactID,
'line_item' => $lineItem,
- 'is_test' => $isTest,
+ 'is_test' => $this->isTest(),
'campaign_id' => $paymentParams['campaign_id'] ?? NULL,
'source' => CRM_Utils_Array::value('source', $paymentParams, CRM_Utils_Array::value('description', $paymentParams)),
'payment_instrument_id' => $paymentInstrumentID,
if ($paymentStatus !== 'Completed') {
$params['status_id'] = $pendingMembershipStatusId;
$params['skipStatusCal'] = TRUE;
- // unset send-receipt option, since receipt will be sent when ipn is received.
- unset($formValues['send_receipt'], $formValues['send_receipt']);
//as membership is pending set dates to null.
foreach ($this->_memTypeSelected as $memType) {
$membershipTypeValues[$memType]['joinDate'] = NULL;
);
$params['source'] = $formValues['source'] ?: $params['contribution_source'];
$params['trxn_id'] = $result['trxn_id'] ?? NULL;
- $params['is_test'] = ($this->_mode === 'live') ? 0 : 1;
- if (!empty($formValues['send_receipt'])) {
+ $params['is_test'] = $this->isTest();
+ $params['receipt_date'] = NULL;
+ if ($this->getSubmittedValue('send_receipt') && $paymentStatus === 'Completed') {
+ // @todo this should be updated by the send function once sent rather than
+ // set here.
$params['receipt_date'] = $now;
}
- else {
- $params['receipt_date'] = NULL;
- }
$this->set('params', $formValues);
$this->assign('trxn_id', CRM_Utils_Array::value('trxn_id', $result));
}
$receiptSent = FALSE;
- if (!empty($formValues['send_receipt']) && $receiptSend) {
+ if ($this->getSubmittedValue('send_receipt') && $receiptSend) {
$formValues['contact_id'] = $this->_contactID;
$formValues['contribution_id'] = $contributionId;
// We really don't need a distinct receipt_text_signup vs receipt_text_renewal as they are
$transaction = new CRM_Core_Transaction();
$contactID = $contributionParams['contact_id'];
- $isEmailReceipt = !empty($form->_values['is_email_receipt']);
-
// add these values for the recurringContrib function ,CRM-10188
$params['financial_type_id'] = $contributionParams['financial_type_id'];
- //@todo - this is being set from the form to resolve CRM-10188 - an
- // eNotice caused by it not being set @ the front end
- // however, we then get it being over-written with null for backend contributions
- // a better fix would be to set the values in the respective forms rather than require
- // a function being shared by two forms to deal with their respective values
- // moving it to the BAO & not taking the $form as a param would make sense here.
- if (!isset($params['is_email_receipt']) && $isEmailReceipt) {
- $params['is_email_receipt'] = $isEmailReceipt;
- }
+ $params['is_email_receipt'] = (bool) $this->getSubmittedValue('send_receipt');
$params['is_recur'] = TRUE;
$params['payment_instrument_id'] = $contributionParams['payment_instrument_id'] ?? NULL;
$recurringContributionID = $this->legacyProcessRecurringContribution($params, $contactID);
$now = CRM_Utils_Time::date('YmdHis');
$receiptDate = $params['receipt_date'] ?? NULL;
- if ($isEmailReceipt) {
+ if ($params['is_email_receipt']) {
$receiptDate = $now;
}
- if (isset($params['amount'])) {
- $contributionParams = array_merge([
- 'receive_date' => !empty($params['receive_date']) ? CRM_Utils_Date::processDate($params['receive_date']) : CRM_Utils_Time::date('YmdHis'),
- 'tax_amount' => $params['tax_amount'] ?? NULL,
- 'invoice_id' => $params['invoiceID'],
- 'currency' => $params['currencyID'],
- 'is_pay_later' => $params['is_pay_later'] ?? 0,
- //setting to make available to hook - although seems wrong to set on form for BAO hook availability
- 'skipLineItem' => $params['skipLineItem'] ?? 0,
- ], $contributionParams);
-
- if (!empty($params["is_email_receipt"])) {
- $contributionParams += [
- 'receipt_date' => $receiptDate,
- ];
- }
-
- if ($recurringContributionID) {
- $contributionParams['contribution_recur_id'] = $recurringContributionID;
- }
-
- $contributionParams['contribution_status_id'] = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Pending');
- if (isset($contributionParams['invoice_id'])) {
- $contributionParams['id'] = CRM_Core_DAO::getFieldValue(
- 'CRM_Contribute_DAO_Contribution',
- $contributionParams['invoice_id'],
- 'id',
- 'invoice_id'
- );
- }
+ $contributionParams = array_merge([
+ 'receive_date' => !empty($params['receive_date']) ? CRM_Utils_Date::processDate($params['receive_date']) : CRM_Utils_Time::date('YmdHis'),
+ 'tax_amount' => $params['tax_amount'] ?? NULL,
+ 'invoice_id' => $params['invoiceID'],
+ 'currency' => $params['currencyID'],
+ 'is_pay_later' => $params['is_pay_later'] ?? 0,
+ //setting to make available to hook - although seems wrong to set on form for BAO hook availability
+ 'skipLineItem' => $params['skipLineItem'] ?? 0,
+ ], $contributionParams);
- $contributionParams['skipCleanMoney'] = TRUE;
- // @todo this is the wrong place for this - it should be done as close to form submission
- // as possible
- $contributionParams['total_amount'] = $params['amount'];
- $contribution = CRM_Contribute_BAO_Contribution::add($contributionParams);
+ if ($this->getSubmittedValue('send_receipt')) {
+ $contributionParams += [
+ 'receipt_date' => $receiptDate,
+ ];
+ }
- // lets store it in the form variable so postProcess hook can get to this and use it
- $form->_contributionID = $contribution->id;
+ if ($recurringContributionID) {
+ $contributionParams['contribution_recur_id'] = $recurringContributionID;
}
- // process soft credit / pcp params first
- CRM_Contribute_BAO_ContributionSoft::formatSoftCreditParams($params, $form);
+ $contributionParams['contribution_status_id'] = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Pending');
+
+ // @todo this is the wrong place for this - it should be done as close to form submission
+ // as possible
+ $contributionParams['total_amount'] = $params['amount'];
+ $contribution = CRM_Contribute_BAO_Contribution::add($contributionParams);
- //CRM-13981, processing honor contact into soft-credit contribution
- CRM_Contribute_BAO_ContributionSoft::processSoftContribution($params, $contribution);
+ // lets store it in the form variable so postProcess hook can get to this and use it
+ $form->_contributionID = $contribution->id;
$transaction->commit();
return $contribution;
* @return int
*/
protected function legacyProcessRecurringContribution(array $params, $contactID): int {
- $form = $this;
$recurParams = ['contact_id' => $contactID];
$recurParams['amount'] = $params['amount'] ?? NULL;
$recurParams['currency'] = $params['currency'] ?? NULL;
$recurParams['payment_instrument_id'] = $params['payment_instrument_id'];
- $recurParams['is_test'] = 0;
- if (($form->_action & CRM_Core_Action::PREVIEW) ||
- (isset($form->_mode) && ($form->_mode == 'test'))
- ) {
- $recurParams['is_test'] = 1;
- }
+ $recurParams['is_test'] = $this->isTest();
$recurParams['start_date'] = $recurParams['create_date'] = $recurParams['modified_date'] = CRM_Utils_Time::date('YmdHis');
if (!empty($params['receive_date'])) {
$recurParams['invoice_id'] = $params['invoiceID'] ?? NULL;
$recurParams['contribution_status_id'] = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Pending');
$recurParams['payment_processor_id'] = $params['payment_processor_id'] ?? NULL;
- $recurParams['is_email_receipt'] = (bool) ($params['is_email_receipt'] ?? FALSE);
+ $recurParams['is_email_receipt'] = (bool) $this->getSubmittedValue('send_receipt');
// we need to add a unique trxn_id to avoid a unique key error
// in paypal IPN we reset this when paypal sends us the real trxn id, CRM-2991
$recurParams['trxn_id'] = $params['trxn_id'] ?? $params['invoiceID'];
- $campaignId = $params['campaign_id'] ?? $form->_values['campaign_id'] ?? NULL;
+ $campaignId = $params['campaign_id'] ?? $this->_values['campaign_id'] ?? NULL;
$recurParams['campaign_id'] = $campaignId;
return CRM_Contribute_BAO_ContributionRecur::add($recurParams)->id;
}
+ /**
+ * Is the form being submitted in test mode.
+ *
+ * @return bool
+ */
+ protected function isTest(): int {
+ return ($this->_mode === 'test') ? TRUE : FALSE;
+ }
+
}
projects / civicrm-core.git / blobdiff