Merge pull request #18714 from MegaphoneJon/financial-111

Financial#111: Contribution tokens always display amount with default…
civicrm · Oct 9, 2020 · 0d193d5 · 0d193d5
2 parents 8e49992 + 2aa6450
commit 0d193d5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php
@@ -1801,7 +1801,10 @@ public static function getContributionTokenReplacement($token, &$contribution, $
       case 'net_amount':
       case 'fee_amount':
       case 'non_deductible_amount':
-        $value = CRM_Utils_Money::format(CRM_Utils_Array::retrieveValueRecursive($contribution, $token));
+        // FIXME: Is this ever a multi-dimensional array?  Why use retrieveValueRecursive()?
+        $amount = CRM_Utils_Array::retrieveValueRecursive($contribution, $token);
+        $currency = CRM_Utils_Array::retrieveValueRecursive($contribution, 'currency');
+        $value = CRM_Utils_Money::format($amount, $currency);
         break;
 
       case 'receive_date':