From 0be0b79d228eb8a511c1997d6f5649bb31b8f1fc Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 5 Nov 2014 17:33:17 +1300 Subject: [PATCH] CRM-15555 fix for paypal express code showing in backoffice --- CRM/Contribute/Form/AbstractEditPayment.php | 7 +++++++ CRM/Core/Payment/Form.php | 20 ++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/CRM/Contribute/Form/AbstractEditPayment.php b/CRM/Contribute/Form/AbstractEditPayment.php index 3d8ea49997..768730769f 100644 --- a/CRM/Contribute/Form/AbstractEditPayment.php +++ b/CRM/Contribute/Form/AbstractEditPayment.php @@ -169,6 +169,13 @@ class CRM_Contribute_Form_AbstractEditPayment extends CRM_Core_Form { */ public $_lineItems; + /** + * Is this a backoffice form + * (this will affect whether paypal express code is displayed) + * @var bool + */ + public $isBackOffice = TRUE; + protected $_formType; protected $_cdType; diff --git a/CRM/Core/Payment/Form.php b/CRM/Core/Payment/Form.php index 34cff2171a..f5b4fbf08a 100644 --- a/CRM/Core/Payment/Form.php +++ b/CRM/Core/Payment/Form.php @@ -387,14 +387,18 @@ class CRM_Core_Payment_Form { * @param $form */ protected static function addPaypalExpressCode(&$form) { - if ($form->_paymentProcessor['billing_mode'] & CRM_Core_Payment::BILLING_MODE_BUTTON) { - $form->_expressButtonName = $form->getButtonName('upload', 'express'); - $form->assign('expressButtonName', $form->_expressButtonName); - $form->add('image', - $form->_expressButtonName, - $form->_paymentProcessor['url_button'], - array('class' => 'crm-form-submit') - ); + if (empty($form->isBackOffice)) { + if ($form->_paymentProcessor['billing_mode'] & + CRM_Core_Payment::BILLING_MODE_BUTTON + ) { + $form->_expressButtonName = $form->getButtonName('upload', 'express'); + $form->assign('expressButtonName', $form->_expressButtonName); + $form->add('image', + $form->_expressButtonName, + $form->_paymentProcessor['url_button'], + array('class' => 'crm-form-submit') + ); + } } } /** -- 2.25.1