From 290cc8eb4a1ba2932b1a23cf3d0928015984db46 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Sun, 19 Sep 2021 08:58:47 +1200 Subject: [PATCH] dev/core#2843 push new link to the end As discussed in https://lab.civicrm.org/dev/core/-/issues/2843 this makes the UI change less for users & reduces confusion --- CRM/Contribute/Page/Tab.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CRM/Contribute/Page/Tab.php b/CRM/Contribute/Page/Tab.php index 695ebfc6e7..ebbf05e714 100644 --- a/CRM/Contribute/Page/Tab.php +++ b/CRM/Contribute/Page/Tab.php @@ -59,16 +59,6 @@ class CRM_Contribute_Page_Tab extends CRM_Core_Page { ]; $templateContribution = CRM_Contribute_BAO_ContributionRecur::getTemplateContribution($recurID); - if (!empty($templateContribution['id']) && $paymentProcessorObj->supportsEditRecurringContribution()) { - // Use constant CRM_Core_Action::PREVIEW as there is no such thing as view template. - // And reusing view will mangle the actions. - $links[CRM_Core_Action::PREVIEW] = [ - 'name' => ts('View Template'), - 'title' => ts('View Template Contribution'), - 'url' => 'civicrm/contact/view/contribution', - 'qs' => "reset=1&id={$templateContribution['id']}&cid=%%cid%%&action=view&context={$context}&force_create_template=1", - ]; - } if ( (CRM_Core_Permission::check('edit contributions') || $context !== 'contribution') && ($paymentProcessorObj->supports('ChangeSubscriptionAmount') @@ -102,6 +92,16 @@ class CRM_Contribute_Page_Tab extends CRM_Core_Page { 'qs' => "reset=1&crid=%%crid%%&cid=%%cid%%&context={$context}", ]; } + if (!empty($templateContribution['id']) && $paymentProcessorObj->supportsEditRecurringContribution()) { + // Use constant CRM_Core_Action::PREVIEW as there is no such thing as view template. + // And reusing view will mangle the actions. + $links[CRM_Core_Action::PREVIEW] = [ + 'name' => ts('View Template'), + 'title' => ts('View Template Contribution'), + 'url' => 'civicrm/contact/view/contribution', + 'qs' => "reset=1&id={$templateContribution['id']}&cid=%%cid%%&action=view&context={$context}&force_create_template=1", + ]; + } return $links; } -- 2.25.1