Merge pull request #14662 from eileenmcnaughton/activity_pdf_71
authorMatthew Wire <mjw@mjwconsult.co.uk>
Fri, 3 Jan 2020 16:49:37 +0000 (16:49 +0000)
committerGitHub <noreply@github.com>
Fri, 3 Jan 2020 16:49:37 +0000 (16:49 +0000)
Add PDF letter functionality for Activities using new token processor

1  2 
CRM/Activity/Task.php
CRM/Activity/Tokens.php
CRM/Core/Form/Task/PDFLetterCommon.php
tests/phpunit/CiviTest/CiviUnitTestCase.php

Simple merge
Simple merge
index 933c3fca80cae762b1e5378433c8cd802ab10017,c27b73daddb7ed170b855f7573e92499e2c5255a..27808ed1096682da5fbd675efb2a076afd4b3feb
@@@ -1378,15 -1353,13 +1378,14 @@@ class CiviUnitTestCase extends PHPUnit\
     * Create Activity.
     *
     * @param array $params
 +   *
     * @return array|int
     */
 -  public function activityCreate($params = array()) {
 -    $params = array_merge(array(
 +  public function activityCreate($params = []) {
 +    $params = array_merge([
        'subject' => 'Discussion on warm beer',
        'activity_date_time' => date('Ymd'),
-       'duration_hours' => 30,
-       'duration_minutes' => 20,
+       'duration' => 90,
        'location' => 'Baker Street',
        'details' => 'Lets schedule a meeting',
        'status_id' => 1,