Switch pledge_acknowledgement to parse through the processor only

civicrm · Oct 12, 2021 · d244152 · d244152
1 parent 02da8f5
commit d244152
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 24 deletions.
diff --git a/CRM/Pledge/BAO/Pledge.php b/CRM/Pledge/BAO/Pledge.php
@@ -569,33 +569,12 @@ public static function sendAcknowledgment(&$form, $params) {
       $form->assign('payments', $payments);
     }
 
-    // handle domain token values
-    $domain = CRM_Core_BAO_Domain::getDomain();
-    $tokens = [
-      'domain' => ['name', 'phone', 'address', 'email'],
-      'contact' => CRM_Core_SelectValues::contactTokens(),
-    ];
     $domainValues = [];
-    foreach ($tokens['domain'] as $token) {
-      $domainValues[$token] = CRM_Utils_Token::getDomainTokenReplacement($token, $domain);
+    foreach (['name', 'phone', 'address', 'email'] as $token) {
+      $domainValues[$token] = CRM_Core_DomainTokens::getDomainTokenValues()[$token];
     }
-    $form->assign('domain', $domainValues);
 
-    // handle contact token values.
-    $ids = [$params['contact_id']];
-    $fields = array_merge(array_keys(CRM_Contact_BAO_Contact::importableFields()),
-      ['display_name', 'checksum', 'contact_id']
-    );
-    foreach ($fields as $key => $val) {
-      $returnProperties[$val] = TRUE;
-    }
-    [$details] = CRM_Utils_Token::getTokenDetails($ids,
-      $returnProperties,
-      TRUE, TRUE, NULL,
-      $tokens,
-      get_class($form)
-    );
-    $form->assign('contact', $details[$params['contact_id']]);
+    $form->assign('domain', $domainValues);
 
     // handle custom data.
     if (!empty($params['hidden_custom'])) {

diff --git a/tests/phpunit/CRM/Pledge/Form/PledgeTest.php b/tests/phpunit/CRM/Pledge/Form/PledgeTest.php
@@ -24,6 +24,8 @@ public function testPostProcess(): void {
       'installments' => 1,
       'contact_id' => $this->individualCreate(),
       'is_acknowledge' => 1,
+      'start_date' => '2021-01-04',
+      'create_date' => '2021-01-04',
       'from_email_address' => Email::get()
         ->addWhere('contact_id', '=', $loggedInUser)
         ->addSelect('id')->execute()->first()['id'],