X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContribute%2FForm%2FContribution%2FMain.php;h=1485677afc4bb502a141f5e658bb56c4ecf23ebb;hb=31ed28061f95c8cd6c0dd2687ad8f511ccc66847;hp=dec622915326e565cbc4b84a963cea9d3080580e;hpb=a5aef36c6a720bad7636afa8e5564ecb224defde;p=civicrm-core.git
diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php
index dec6229153..1485677afc 100644
--- a/CRM/Contribute/Form/Contribution/Main.php
+++ b/CRM/Contribute/Form/Contribution/Main.php
@@ -1,7 +1,7 @@
_bltID}", "city-{$this->_bltID}",
- "postal_code-{$this->_bltID}", "country_id-{$this->_bltID}", "state_province_id-{$this->_bltID}",
- );
- foreach ($names as $name) {
- $fields[$name] = 1;
- }
- $fields["state_province-{$this->_bltID}"] = 1;
- $fields["country-{$this->_bltID}"] = 1;
- $fields["email-{$this->_bltID}"] = 1;
- $fields['email-Primary'] = 1;
-
- CRM_Core_BAO_UFGroup::setProfileDefaults($contactID, $fields, $this->_defaults);
-
- // use primary email address if billing email address is empty
- if (empty($this->_defaults["email-{$this->_bltID}"]) &&
- !empty($this->_defaults['email-Primary'])
- ) {
- $this->_defaults["email-{$this->_bltID}"] = $this->_defaults['email-Primary'];
+ if (!empty($fields)) {
+ CRM_Core_BAO_UFGroup::setProfileDefaults($contactID, $fields, $this->_defaults);
}
- foreach ($names as $name) {
- if (!empty($this->_defaults[$name])) {
- $this->_defaults['billing_' . $name] = $this->_defaults[$name];
- }
- }
+ $billingDefaults = $this->getProfileDefaults('Billing', $contactID);
+ $this->_defaults = array_merge($this->_defaults, $billingDefaults);
}
//set custom field defaults set by admin if value is not set
@@ -236,11 +216,6 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
}
}
- //set default membership for membershipship block
- if ($this->_membershipBlock) {
- $this->_defaults['selectMembership'] = $defaultMemType = $this->_defaultMemTypeId ? $this->_defaultMemTypeId : CRM_Utils_Array::value('membership_type_default', $this->_membershipBlock);
- }
-
// // hack to simplify credit card entry for testing
// $this->_defaults['credit_card_type'] = 'Visa';
// $this->_defaults['amount'] = 168;
@@ -301,7 +276,7 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
CRM_Core_BAO_Address::fixAllStateSelects($this, $this->_defaults);
if ($this->_priceSetId) {
- if ($this->_useForMember && !empty($this->_currentMemberships)) {
+ if (($this->_useForMember && !empty($this->_currentMemberships)) || $this->_defaultMemTypeId) {
$selectedCurrentMemTypes = array();
foreach ($this->_priceSet['fields'] as $key => $val) {
foreach ($val['options'] as $keys => $values) {
@@ -393,9 +368,12 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
);
$this->addRule("email-{$this->_bltID}", ts('Email is not valid.'), 'email');
$pps = array();
+ $onlinePaymentProcessorEnabled = FALSE;
if (!empty($this->_paymentProcessors)) {
- $pps = $this->_paymentProcessors;
- foreach ($pps as $key => & $name) {
+ foreach ($this->_paymentProcessors as $key => $name) {
+ if($name['billing_mode'] == 1) {
+ $onlinePaymentProcessorEnabled = TRUE;
+ }
$pps[$key] = $name['name'];
}
}
@@ -417,6 +395,11 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
$this->assign('pay_later_text', $this->_values['pay_later_text']);
}
}
+
+ $contactID = $this->getContactID();
+ if($this->getContactID() === '0') {
+ $this->addCidZeroOptions($onlinePaymentProcessorEnabled);
+ }
//build pledge block.
$this->_useForMember = 0;
//don't build membership block when pledge_id is passed
@@ -525,21 +508,31 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
}
if ($this->_pcpId) {
if ($pcpSupporter = CRM_PCP_BAO_PCP::displayName($this->_pcpId)) {
- $this->assign('pcpSupporterText', ts('This contribution is being made thanks to effort of %1, who supports our campaign. You can support it as well - once you complete the donation, you will be able to create your own Personal Campaign Page!', array(1 => $pcpSupporter)));
+ $pcp_supporter_text = ts('This contribution is being made thanks to effort of %1, who supports our campaign. ', array(1 => $pcpSupporter));
+ // Only tell people that can also create a PCP if the contribution page has a non-empty value in the "Create Personal Campaign Page link" field.
+ $text = CRM_PCP_BAO_PCP::getPcpBlockStatus($this->_id, 'contribute');
+ if(!empty($text)) {
+ $pcp_supporter_text .= "You can support it as well - once you complete the donation, you will be able to create your own Personal Campaign Page!";
+ }
+ $this->assign('pcpSupporterText', $pcp_supporter_text);
}
$this->assign('pcp', TRUE);
- $this->add('checkbox', 'pcp_display_in_roll', ts('Show my contribution in the public honor roll'), NULL, NULL,
- array('onclick' => "showHideByValue('pcp_display_in_roll','','nameID|nickID|personalNoteID','block','radio',false); pcpAnonymous( );")
- );
- $extraOption = array('onclick' => "return pcpAnonymous( );");
- $elements = array();
- $elements[] = &$this->createElement('radio', NULL, '', ts('Include my name and message'), 0, $extraOption);
- $elements[] = &$this->createElement('radio', NULL, '', ts('List my contribution anonymously'), 1, $extraOption);
- $this->addGroup($elements, 'pcp_is_anonymous', NULL, ' ');
- $this->_defaults['pcp_is_anonymous'] = 0;
+ $prms = array('id' => $this->_pcpId);
+ CRM_Core_DAO::commonRetrieve('CRM_PCP_DAO_PCP', $prms, $pcpInfo);
+ if ($pcpInfo['is_honor_roll']) {
+ $this->add('checkbox', 'pcp_display_in_roll', ts('Show my contribution in the public honor roll'), NULL, NULL,
+ array('onclick' => "showHideByValue('pcp_display_in_roll','','nameID|nickID|personalNoteID','block','radio',false); pcpAnonymous( );")
+ );
+ $extraOption = array('onclick' => "return pcpAnonymous( );");
+ $elements = array();
+ $elements[] = &$this->createElement('radio', NULL, '', ts('Include my name and message'), 0, $extraOption);
+ $elements[] = &$this->createElement('radio', NULL, '', ts('List my contribution anonymously'), 1, $extraOption);
+ $this->addGroup($elements, 'pcp_is_anonymous', NULL, ' ');
+ $this->_defaults['pcp_is_anonymous'] = 0;
- $this->add('text', 'pcp_roll_nickname', ts('Name'), array('maxlength' => 30));
- $this->add('textarea', 'pcp_personal_note', ts('Personal Note'), array('style' => 'height: 3em; width: 40em;'));
+ $this->add('text', 'pcp_roll_nickname', ts('Name'), array('maxlength' => 30));
+ $this->add('textarea', 'pcp_personal_note', ts('Personal Note'), array('style' => 'height: 3em; width: 40em;'));
+ }
}
//we have to load confirm contribution button in template
@@ -561,15 +554,17 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
}
if (!($allAreBillingModeProcessors && !$this->_values['is_pay_later'])) {
- $this->addButtons(array(
- array(
- 'type' => 'upload',
- 'name' => ts('Contribute'),
- 'spacing' => ' ',
- 'isDefault' => TRUE,
- ),
- )
+ $submitButton = array(
+ 'type' => 'upload',
+ 'name' => ts('Contribute'),
+ 'spacing' => ' ',
+ 'isDefault' => TRUE,
);
+ // Add submit-once behavior when confirm page disabled
+ if (empty($this->_values['is_confirm_enabled'])) {
+ $submitButton['js'] = array('onclick' => "return submitOnce(this,'" . $this->_name . "','" . ts('Processing') . "');");
+ }
+ $this->addButtons(array($submitButton));
}
$this->addFormRule(array('CRM_Contribute_Form_Contribution_Main', 'formRule'), $this);
@@ -1373,8 +1368,10 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
// Add JS to show icons for the accepted credit cards
$creditCardTypes = CRM_Core_Payment_Form::getCreditCardCSSNames();
CRM_Core_Resources::singleton()
- ->addSetting(array('config' => array('creditCardTypes' => $creditCardTypes)))
- ->addScriptFile('civicrm', 'templates/CRM/Core/BillingBlock.js');
+ ->addScriptFile('civicrm', 'templates/CRM/Core/BillingBlock.js', 10)
+ // workaround for CRM-13634
+ // ->addSetting(array('config' => array('creditCardTypes' => $creditCardTypes)));
+ ->addScript('CRM.config.creditCardTypes = ' . json_encode($creditCardTypes) . ';');
}
}
$form->assign('ppType', $form->_ppType);