From 573aa07e6fd431b32fd8a29994e87a65fa9cf971 Mon Sep 17 00:00:00 2001 From: eileen Date: Sat, 26 Oct 2019 16:42:04 +1300 Subject: [PATCH] Move inclusion of frontEndPaymentTrait to shared Parent class --- CRM/Contribute/Form/Contribution/Confirm.php | 1 - CRM/Contribute/Form/ContributionBase.php | 1 + CRM/Event/Form/Registration.php | 1 + CRM/Event/Form/Registration/Confirm.php | 1 - CRM/Event/Form/Registration/ThankYou.php | 1 - 5 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index a977f45dde..2abd6b4105 100644 --- a/CRM/Contribute/Form/Contribution/Confirm.php +++ b/CRM/Contribute/Form/Contribution/Confirm.php @@ -35,7 +35,6 @@ * form to process actions on the group aspect of Custom Data */ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_ContributionBase { - use CRM_Financial_Form_FrontEndPaymentFormTrait; /** * The id of the contact associated with this contribution. diff --git a/CRM/Contribute/Form/ContributionBase.php b/CRM/Contribute/Form/ContributionBase.php index 21cc18e75a..0584c055b0 100644 --- a/CRM/Contribute/Form/ContributionBase.php +++ b/CRM/Contribute/Form/ContributionBase.php @@ -35,6 +35,7 @@ * This class generates form components for processing a contribution. */ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form { + use CRM_Financial_Form_FrontEndPaymentFormTrait; /** * The id of the contribution page that we are processing. diff --git a/CRM/Event/Form/Registration.php b/CRM/Event/Form/Registration.php index d12d4ed4cd..3b56f33344 100644 --- a/CRM/Event/Form/Registration.php +++ b/CRM/Event/Form/Registration.php @@ -34,6 +34,7 @@ * This class generates form components for processing Event. */ class CRM_Event_Form_Registration extends CRM_Core_Form { + use CRM_Financial_Form_FrontEndPaymentFormTrait; /** * How many locationBlocks should we display? diff --git a/CRM/Event/Form/Registration/Confirm.php b/CRM/Event/Form/Registration/Confirm.php index bf4542866b..a75ad5063a 100644 --- a/CRM/Event/Form/Registration/Confirm.php +++ b/CRM/Event/Form/Registration/Confirm.php @@ -34,7 +34,6 @@ * This class generates form components for processing Event. */ class CRM_Event_Form_Registration_Confirm extends CRM_Event_Form_Registration { - use CRM_Financial_Form_FrontEndPaymentFormTrait; /** * The values for the contribution db object. diff --git a/CRM/Event/Form/Registration/ThankYou.php b/CRM/Event/Form/Registration/ThankYou.php index 00a1d89afa..45af6f3dbc 100644 --- a/CRM/Event/Form/Registration/ThankYou.php +++ b/CRM/Event/Form/Registration/ThankYou.php @@ -39,7 +39,6 @@ * */ class CRM_Event_Form_Registration_ThankYou extends CRM_Event_Form_Registration { - use CRM_Financial_Form_FrontEndPaymentFormTrait; /** * Set variables up before form is built. -- 2.25.1