X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FMember%2FForm.php;h=ec8fd490b1aff1f2767dd23eecbdbd29b662b531;hb=3a7773be13e943a5dacb028fcb3edbcf0e8b97b7;hp=ca06acb5c566bc2d9bf5e191e56a872e83635f94;hpb=6617ddeb915cd1f4a00ec498ff43be6e058bbfce;p=civicrm-core.git

diff --git a/CRM/Member/Form.php b/CRM/Member/Form.php
index ca06acb5c5..ec8fd490b1 100644
--- a/CRM/Member/Form.php
+++ b/CRM/Member/Form.php
@@ -160,7 +160,7 @@ class CRM_Member_Form extends CRM_Contribute_Form_AbstractEditPayment {
       $this->add('select', 'payment_processor_id',
         ts('Payment Processor'),
         $this->_processors, TRUE,
-        array('onChange' => "buildAutoRenew( null, this.value );")
+        array('onChange' => "buildAutoRenew( null, this.value, '{$this->_mode}');")
       );
       CRM_Core_Payment_Form::buildPaymentForm($this, $this->_paymentProcessor, FALSE, TRUE);
     }
@@ -181,9 +181,7 @@ class CRM_Member_Form extends CRM_Contribute_Form_AbstractEditPayment {
       $this->assign('recurProcessor', json_encode($this->_recurPaymentProcessors));
       $this->addElement('checkbox',
         'auto_renew',
-        ts('Membership renewed automatically'),
-        NULL,
-        array('onclick' => "buildReceiptANDNotice( );")
+        ts('Membership renewed automatically')
       );
 
       $this->assignPaymentRelatedVariables();
@@ -330,13 +328,13 @@ class CRM_Member_Form extends CRM_Contribute_Form_AbstractEditPayment {
     $contributionRecurParams = array(
       'contact_id' => $paymentParams['contactID'],
       'amount' => $paymentParams['total_amount'],
+      'contribution_status_id' => 'Pending',
       'payment_processor_id' => $paymentParams['payment_processor_id'],
-      'campaign_id' => CRM_Utils_Array::value('campaign_id', $paymentParams),
+      'campaign_id' => $paymentParams['campaign_id'],
       'financial_type_id' => $paymentParams['financial_type_id'],
-      'is_email_receipt' => CRM_Utils_Array::value('is_email_receipt', $paymentParams),
-      // This is not great as it could also be direct debit - but is consistent with elsewhere & all need fixing.
-      'payment_instrument_id' => 1,
-      'invoice_id' => CRM_Utils_Array::value('invoiceID ', $paymentParams),
+      'is_email_receipt' => $paymentParams['is_email_receipt'],
+      'payment_instrument_id' => $paymentParams['payment_instrument_id'],
+      'invoice_id' => $paymentParams['invoice_id'],
     );
 
     $mapping = array(