projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #14279 from eileenmcnaughton/db_test2
[civicrm-core.git]
/
CRM
/
Financial
/
Form
/
Payment.php
diff --git
a/CRM/Financial/Form/Payment.php
b/CRM/Financial/Form/Payment.php
index 1d3ab8604405c6e7d140df5a2fd7c1e884432772..9deb8ea265545e01b3d6506995834fd3fc0db29c 100644
(file)
--- a/
CRM/Financial/Form/Payment.php
+++ b/
CRM/Financial/Form/Payment.php
@@
-3,7
+3,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
8
|
+ | Copyright CiviCRM LLC (c) 2004-201
9
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
8
+ * @copyright CiviCRM LLC (c) 2004-201
9
*/
class CRM_Financial_Form_Payment extends CRM_Core_Form {
*/
class CRM_Financial_Form_Payment extends CRM_Core_Form {
@@
-38,7
+38,7
@@
class CRM_Financial_Form_Payment extends CRM_Core_Form {
protected $_paymentProcessorID;
protected $currency;
protected $_paymentProcessorID;
protected $currency;
- public $_values =
array()
;
+ public $_values =
[]
;
/**
* @var array
/**
* @var array
@@
-79,11
+79,6
@@
class CRM_Financial_Form_Payment extends CRM_Core_Form {
CRM_Core_Payment_ProcessorForm::preProcess($this);
CRM_Core_Payment_ProcessorForm::preProcess($this);
- self::addCreditCardJs($this->_paymentProcessorID);
-
- $this->assign('paymentProcessorID', $this->_paymentProcessorID);
- $this->assign('currency', $this->currency);
-
$this->assign('suppressForm', TRUE);
$this->controller->_generateQFKey = FALSE;
}
$this->assign('suppressForm', TRUE);
$this->controller->_generateQFKey = FALSE;
}
@@
-96,7
+91,7
@@
class CRM_Financial_Form_Payment extends CRM_Core_Form {
*
* @return string
*/
*
* @return string
*/
- public function getCurrency($submittedValues =
array()
) {
+ public function getCurrency($submittedValues =
[]
) {
return $this->currency;
}
return $this->currency;
}