Merge pull request #32064 from eileenmcnaughton/confirm

Ensure modelProps has contributionID

Author: monishdeb

CRM/Contribute/BAO/ContributionPage.php

@@ -396,11 +396,14 @@ public static function sendMail($contactID, $values, $isTest = FALSE, $returnMes
 
       // use either the contribution or membership receipt, based on whether it’s a membership-related contrib or not
       $tokenContext = ['contactId' => (int) $contactID];
-      if (!empty($tplParams['contributionID'])) {
-        $tokenContext['contributionId'] = $tplParams['contributionID'];
+      $modelProps = $values['modelProps'] ?? [];
+      $modelProps['contactID'] = (int) $contactID;
+      if (!empty($values['contribution_id'])) {
+        $modelProps['contributionID'] = $tokenContext['contributionId'] = (int) $values['contribution_id'];
       }
       if (!empty($values['membership_id'])) {
         $tokenContext['membershipId'] = $values['membership_id'];
+        $modelProps['membershipID'] = (int) $values['membership_id'];
       }
       $sendTemplateParams = [
         'workflow' => !empty($values['membership_id']) ? 'membership_online_receipt' : 'contribution_online_receipt',
@@ -409,7 +412,7 @@ public static function sendMail($contactID, $values, $isTest = FALSE, $returnMes
         'tokenContext' => $tokenContext,
         'isTest' => $isTest,
         'PDFFilename' => 'receipt.pdf',
-        'modelProps' => $values['modelProps'] ?? [],
+        'modelProps' => $modelProps,
       ];
 
       if ($returnMessageText) {