projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0fc6c3b
)
Fix button name on updated form
author
eileen
<emcnaughton@wikimedia.org>
Thu, 30 Jul 2020 04:02:22 +0000
(16:02 +1200)
committer
eileen
<emcnaughton@wikimedia.org>
Mon, 3 Aug 2020 23:52:43 +0000
(11:52 +1200)
CRM/Contribute/Form/Task/Status.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Contribute/Form/Task/Status.php
b/CRM/Contribute/Form/Task/Status.php
index b501327a88f5757e27a1e0f25b5f9eab757cd832..496ca718dd4c15c1dac8e79af86568fc58947a77 100644
(file)
--- a/
CRM/Contribute/Form/Task/Status.php
+++ b/
CRM/Contribute/Form/Task/Status.php
@@
-91,7
+91,7
@@
AND co.id IN ( $contribIDs )";
$this->_rows = [];
$attributes = CRM_Core_DAO::getAttribute('CRM_Contribute_DAO_Contribution');
$defaults = [];
$this->_rows = [];
$attributes = CRM_Core_DAO::getAttribute('CRM_Contribute_DAO_Contribution');
$defaults = [];
- $now = date(
"Y-m-d"
);
+ $now = date(
'Y-m-d'
);
$paidByOptions = ['' => ts('- select -')] + CRM_Contribute_PseudoConstant::paymentInstrument();
while ($dao->fetch()) {
$paidByOptions = ['' => ts('- select -')] + CRM_Contribute_PseudoConstant::paymentInstrument();
while ($dao->fetch()) {
@@
-116,10
+116,10
@@
AND co.id IN ( $contribIDs )";
$row['trxn_date'] = $this->add('datepicker', "trxn_date_{$row['contribution_id']}", ts('Transaction Date'), [], FALSE, ['time' => FALSE]);
$defaults["trxn_date_{$row['contribution_id']}"] = $now;
$row['trxn_date'] = $this->add('datepicker', "trxn_date_{$row['contribution_id']}", ts('Transaction Date'), [], FALSE, ['time' => FALSE]);
$defaults["trxn_date_{$row['contribution_id']}"] = $now;
- $this->add(
"text"
, "check_number_{$row['contribution_id']}", ts('Check Number'));
+ $this->add(
'text'
, "check_number_{$row['contribution_id']}", ts('Check Number'));
$defaults["check_number_{$row['contribution_id']}"] = $dao->check_no;
$defaults["check_number_{$row['contribution_id']}"] = $dao->check_no;
- $this->add(
"select"
, "payment_instrument_id_{$row['contribution_id']}", ts('Payment Method'), $paidByOptions);
+ $this->add(
'select'
, "payment_instrument_id_{$row['contribution_id']}", ts('Payment Method'), $paidByOptions);
$defaults["payment_instrument_id_{$row['contribution_id']}"] = $dao->paid_by;
$this->_rows[] = $row;
$defaults["payment_instrument_id_{$row['contribution_id']}"] = $dao->paid_by;
$this->_rows[] = $row;
@@
-130,7
+130,7
@@
AND co.id IN ( $contribIDs )";
$this->addButtons([
[
'type' => 'next',
$this->addButtons([
[
'type' => 'next',
- 'name' => ts('
Update Pending Statu
s'),
+ 'name' => ts('
Record Payment
s'),
'isDefault' => TRUE,
],
[
'isDefault' => TRUE,
],
[
@@
-167,7
+167,7
@@
AND co.id IN ( $contribIDs )";
$contribID = substr($name, 13);
if ($fields["payment_instrument_id_{$contribID}"] != CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'payment_instrument_id', 'Check')) {
$contribID = substr($name, 13);
if ($fields["payment_instrument_id_{$contribID}"] != CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'payment_instrument_id', 'Check')) {
- $errors["payment_instrument_id_{$contribID}"] = ts(
"Payment Method should be Check when a check number is entered for a contribution."
);
+ $errors["payment_instrument_id_{$contribID}"] = ts(
'Payment Method should be Check when a check number is entered for a contribution.'
);
}
}
}
}
}
}