Merge pull request #20690 from civicrm/5.39

5.39

CRM/Api4/Services.php

@@ -58,7 +58,9 @@ class CRM_Api4_Services {
       );
     }
 
-    if (defined('CIVICRM_UF') && CIVICRM_UF === 'UnitTests') {
+    if (defined('CIVICRM_UF') && CIVICRM_UF === 'UnitTests'
+      && file_exists('tests/phpunit/api/v4/services.xml')
+    ) {
       $loader->load('tests/phpunit/api/v4/services.xml');
     }
   }

CRM/Member/Form/MembershipRenewal.php

@@ -553,6 +553,8 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form {
         $paymentParams = array_merge($paymentParams, $contributionRecurParams);
       }
 
+      $paymentParams['invoiceID'] = $paymentParams['invoice_id'];
+
       $payment = $this->_paymentProcessor['object'];
       $result = $payment->doPayment($paymentParams);
       $this->_params = array_merge($this->_params, $result);