civicrm release-5.50.3

civicrm.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: CiviCRM
  * Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 5.50.2
+ * Version: 5.50.3
  * Requires at least: 4.9
  * Requires PHP:      7.2
  * Author: CiviCRM LLC
@@ -36,7 +36,7 @@ if (!defined('ABSPATH')) {
 }
 
 // Set version here: changing it forces Javascript and CSS to reload.
-define('CIVICRM_PLUGIN_VERSION', '5.50.2');
+define('CIVICRM_PLUGIN_VERSION', '5.50.3');
 
 // Store reference to this file.
 if (!defined('CIVICRM_PLUGIN_FILE')) {

civicrm/CRM/Contribute/Form/ContributionBase.php

@@ -1151,10 +1151,13 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form {
       return;
     }
 
+    // Check if membership the selected membership is automatically opted into auto renew or give user the option.
+    // In the 2nd case we check that the user has in deed opted in (auto renew as at June 22 is the field name for the membership auto renew checkbox)
+    // Also check that the payment Processor used can support recurring contributions.
     $membershipTypes = CRM_Price_BAO_PriceSet::getMembershipTypesFromPriceSet($this->_priceSetId);
     if (in_array($selectedMembershipTypeID, $membershipTypes['autorenew_required'])
       || (in_array($selectedMembershipTypeID, $membershipTypes['autorenew_optional']) &&
-        !empty($this->_params['is_recur']))
+        !empty($this->_params['auto_renew']))
         && !empty($this->_paymentProcessor['is_recur'])
     ) {
       $this->_params['auto_renew'] = TRUE;
@@ -1166,6 +1169,12 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form {
       $this->_params['frequency_interval'] = $this->_params['frequency_interval'] ?? $this->_values['fee'][$priceFieldId]['options'][$priceFieldValue]['membership_num_terms'];
       $this->_params['frequency_unit'] = $this->_params['frequency_unit'] ?? $membershipTypeDetails['duration_unit'];
     }
+    elseif (!$this->_separateMembershipPayment && (in_array($selectedMembershipTypeID, $membershipTypes['autorenew_required'])
+      || in_array($selectedMembershipTypeID, $membershipTypes['autorenew_optional']))) {
+      // otherwise check if we have a separate membership payment setting as that will allow people to independently opt into recurring contributions and memberships
+      // If we don't have that and the membership type is auto recur or opt into recur set is_recur to 0.
+      $this->_params['is_recur'] = $this->_values['is_recur'] = 0;
+    }
   }
 
   /**

civicrm/CRM/Contribute/Form/UpdateSubscription.php

@@ -155,13 +155,17 @@ class CRM_Contribute_Form_UpdateSubscription extends CRM_Contribute_Form_Contrib
       TRUE, 'currency', $this->_subscriptionDetails->currency, TRUE
     );
 
+    // https://lab.civicrm.org/dev/financial/-/issues/197 https://github.com/civicrm/civicrm-core/pull/23796
+    // Revert freezing on total_amount field on recurring form - particularly affects IATs
+    // This will need revisiting in the future as updating amount on recur does not work for multiple lineitems.
+    // Also there are "point of truth" issues ie. is the amount on template contribution or recur the current one?
     // The amount on the recurring contribution should not be updated directly. If we update the amount using a template contribution the recurring contribution
     //   will be updated automatically.
-    $paymentProcessorObj = Civi\Payment\System::singleton()->getById(CRM_Contribute_BAO_ContributionRecur::getPaymentProcessorID($this->contributionRecurID));
-    $templateContribution = CRM_Contribute_BAO_ContributionRecur::getTemplateContribution($this->contributionRecurID);
-    if (!empty($templateContribution['id']) && $paymentProcessorObj->supportsEditRecurringContribution()) {
-      $amountField->freeze();
-    }
+    // $paymentProcessorObj = Civi\Payment\System::singleton()->getById(CRM_Contribute_BAO_ContributionRecur::getPaymentProcessorID($this->contributionRecurID));
+    // $templateContribution = CRM_Contribute_BAO_ContributionRecur::getTemplateContribution($this->contributionRecurID);
+    // if (!empty($templateContribution['id']) && $paymentProcessorObj->supportsEditRecurringContribution()) {
+    //   $amountField->freeze();
+    // }
 
     $this->add('text', 'installments', ts('Number of Installments'), ['size' => 20], FALSE);
 

civicrm/Civi/Token/TokenProcessor.php

@@ -500,6 +500,9 @@ class TokenProcessor {
           require_once 'CRM/Core/Smarty/plugins/modifier.crmDate.php';
           return \smarty_modifier_crmDate($value->format('Y-m-d H:i:s'), $filter[1] ?? NULL);
         }
+        if ($value === '') {
+          return $value;
+        }
 
       default:
         throw new \CRM_Core_Exception("Invalid token filter: $filter");

civicrm/civicrm-version.php

 <?php
 /** @deprecated */
 function civicrmVersion( ) {
-  return array( 'version'  => '5.50.2',
+  return array( 'version'  => '5.50.3',
                 'cms'      => 'Wordpress',
                 'revision' => '' );
 }

civicrm/ext/afform/admin/info.xml

@@ -13,7 +13,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>5.50.2</version>
+  <version>5.50.3</version>
   <develStage>beta</develStage>
   <compatibility>
     <ver>5.50</ver>

civicrm/ext/afform/core/info.xml

@@ -13,7 +13,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>5.50.2</version>
+  <version>5.50.3</version>
   <develStage>beta</develStage>
   <compatibility>
     <ver>5.50</ver>

civicrm/ext/afform/html/info.xml

@@ -13,7 +13,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>5.50.2</version>
+  <version>5.50.3</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.50</ver>

civicrm/ext/afform/mock/info.xml

@@ -12,7 +12,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>5.50.2</version>
+  <version>5.50.3</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

civicrm/ext/authx/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-02-11</releaseDate>
-  <version>5.50.2</version>
+  <version>5.50.3</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.50</ver>

civicrm/ext/civicrm_admin_ui/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2022-01-02</releaseDate>
-  <version>5.50.2</version>
+  <version>5.50.3</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.50</ver>

civicrm/ext/civigrant/info.xml

@@ -13,7 +13,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-11-11</releaseDate>
-  <version>5.50.2</version>
+  <version>5.50.3</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.50</ver>

civicrm/ext/ckeditor4/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">https://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-05-23</releaseDate>
-  <version>5.50.2</version>
+  <version>5.50.3</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.50</ver>

civicrm/ext/contributioncancelactions/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-10-12</releaseDate>
-  <version>5.50.2</version>
+  <version>5.50.3</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.50</ver>

civicrm/ext/eventcart/info.xml

@@ -13,7 +13,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-08-03</releaseDate>
-  <version>5.50.2</version>
+  <version>5.50.3</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

civicrm/ext/ewaysingle/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-10-07</releaseDate>
-  <version>5.50.2</version>
+  <version>5.50.3</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

civicrm/ext/financialacls/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-08-27</releaseDate>
-  <version>5.50.2</version>
+  <version>5.50.3</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.50</ver>

civicrm/ext/flexmailer/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-08-05</releaseDate>
-  <version>5.50.2</version>
+  <version>5.50.3</version>
   <develStage>stable</develStage>
   <comments>
     FlexMailer is an email delivery engine which replaces the internal guts

civicrm/ext/greenwich/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-07-21</releaseDate>
-  <version>5.50.2</version>
+  <version>5.50.3</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

civicrm/ext/legacycustomsearches/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-07-25</releaseDate>
-  <version>5.50.2</version>
+  <version>5.50.3</version>
   <develStage>stable</develStage>
   <tags>
     <tag>mgmt:hidden</tag>