'id', $returnURL, $filter
);
- // retrieve financial account name for the payment instrument page
+ // retrieve financial account name for the payment method page
if ($gName = "payment_instrument") {
foreach ($optionValue as $key => $option) {
$optionValue[$key]['financial_account'] = CRM_Financial_BAO_FinancialTypeAccount::getFinancialAccount($key, 'civicrm_option_value');
'contribution_recur_id' => ts('Contact and Recurring'),
'financial_type_id' => ts('Contact and Financial Type'),
'campaign_id' => ts('Contact and Campaign'),
- 'payment_instrument_id' => 'Contact and Payment Instrument',
+ 'payment_instrument_id' => ts('Contact and Payment Method'),
);
$this->addElement('select', 'group_by', ts('Group contributions by'), $options, array(), "<br/>", FALSE);
// this was going to be free-text but I opted for radio options in case there was a script injection risk
</item>
<item>
<path>civicrm/admin/options/payment_instrument</path>
- <title>Payment Instruments</title>
+ <title>Payment Methods</title>
<page_callback>CRM_Admin_Page_Options</page_callback>
<desc>You may choose to record the payment instrument used for each contribution. Common payment methods are installed by default (e.g. Check, Cash, Credit Card...). If your site requires additional payment methods, add them here.</desc>
<adminGroup>CiviContribute</adminGroup>
),
'payment_instrument' => array(
'name' => 'payment_instrument',
- 'title' => ts('Payment Instrument'),
+ 'title' => ts('Payment Method'),
),
'contribution_status_id' => array(
'name' => 'contribution_status_id',
$nameTitle = array(
'payment_instrument' => array(
'name' => 'payment_instrument',
- 'title' => ts('Payment Instrument'),
+ 'title' => ts('Payment Method'),
'headerPattern' => '/^payment|(p(ayment\s)?instrument)$/i',
),
);
'{contribution.net_amount}' => ts('Net Amount'),
'{contribution.non_deductible_amount}' => ts('Non-deductible Amount'),
'{contribution.receive_date}' => ts('Contribution Date Received'),
- '{contribution.payment_instrument}' => ts('Payment Instrument'),
+ '{contribution.payment_instrument}' => ts('Payment Method'),
'{contribution.trxn_id}' => ts('Transaction ID'),
'{contribution.invoice_id}' => ts('Invoice ID'),
'{contribution.currency}' => ts('Currency'),
'componentPaymentField_total_amount' => ts('Total Amount'),
'componentPaymentField_contribution_status' => ts('Contribution Status'),
'componentPaymentField_received_date' => ts('Date Received'),
- 'componentPaymentField_payment_instrument' => ts('Payment Instrument'),
+ 'componentPaymentField_payment_instrument' => ts('Payment Method'),
'componentPaymentField_transaction_id' => ts('Transaction ID'),
);
}
$paymentInstrument = array_flip(CRM_Contribute_PseudoConstant::paymentInstrument('label'));
$values['payment_instrument_id'] = array_search($values['payment_instrument_id'], $paymentInstrument);
}
- $details = '<p>' . ts('Record:') . ' ' . $values['title'] . '</p><p>' . ts('Description:') . '</p><p>' . ts('Created By:') . " $createdBy" . '</p><p>' . ts('Created Date:') . ' ' . $values['created_date'] . '</p><p>' . ts('Last Modified By:') . ' ' . $modifiedBy . '</p><p>' . ts('Payment Instrument:') . ' ' . $values['payment_instrument_id'] . '</p>';
+ $details = '<p>' . ts('Record:') . ' ' . $values['title'] . '</p><p>' . ts('Description:') . '</p><p>' . ts('Created By:') . " $createdBy" . '</p><p>' . ts('Created Date:') . ' ' . $values['created_date'] . '</p><p>' . ts('Last Modified By:') . ' ' . $modifiedBy . '</p><p>' . ts('Payment Method:') . ' ' . $values['payment_instrument_id'] . '</p>';
$subject = '';
if (!empty($values['total'])) {
$subject .= ts('Total') . '[' . CRM_Utils_Money::format($values['total']) . '],';
'created_by' => ts('Created By'),
'status' => ts('Status'),
'description' => ts('Description'),
- 'payment_instrument' => ts('Payment Instrument'),
+ 'payment_instrument' => ts('Payment Method'),
'item_count' => ts('Entered Transactions'),
'assigned_item_count' => ts('Assigned Transactions'),
'total' => ts('Entered Total'),
$this->add('textarea', 'description', ts('Description'), $attributes['description']);
- $this->add('select', 'payment_instrument_id', ts('Payment Instrument'),
+ $this->add('select', 'payment_instrument_id', ts('Payment Method'),
array('' => ts('- select -')) + CRM_Contribute_PseudoConstant::paymentInstrument(),
FALSE
);
$this->add(
'select',
'payment_instrument_id',
- ts('Payment Instrument'),
+ ts('Payment Method'),
array('' => ts('- any -')) + CRM_Contribute_PseudoConstant::paymentInstrument(),
FALSE
);
'default' => TRUE,
),
'payment_instrument_id' => array(
- 'title' => ts('Payment Instrument'),
+ 'title' => ts('Payment Method'),
'default' => TRUE,
),
'currency' => array(
),
'filters' => array(
'payment_instrument_id' => array(
- 'title' => ts('Payment Instrument'),
+ 'title' => ts('Payment Method'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::paymentInstrument(),
),
),
),
'order_bys' => array(
- 'payment_instrument_id' => array('title' => ts('Payment Instrument')),
+ 'payment_instrument_id' => array('title' => ts('Payment Method')),
),
),
'civicrm_entity_financial_trxn' => array(
'order_bys' => array(
'financial_type_id' => array('title' => ts('Financial Type')),
'contribution_status_id' => array('title' => ts('Contribution Status')),
- 'payment_instrument_id' => array('title' => ts('Payment Instrument')),
+ 'payment_instrument_id' => array('title' => ts('Payment Method')),
'receive_date' => array('title' => ts('Date Received')),
),
'grouping' => 'contri-fields',
'alter_display' => 'alterContributionType',
),
'payment_instrument_id' => array(
- 'title' => ts('Payment Instrument'),
+ 'title' => ts('Payment Method'),
'alter_display' => 'alterPaymentType',
),
'source' => array('title' => 'Contribution Source'),
),
'order_bys' => array(
'payment_instrument_id' => array(
- 'title' => ts('Payment Instrument'),
+ 'title' => ts('Payment Method'),
),
'financial_type_id' => array(
'title' => ts('Financial Type'),
),
'group_bys' => array(
'financial_type_id' => array('title' => ts('Financial Type')),
- 'payment_instrument_id' => array('title' => ts('Payment Instrument')),
+ 'payment_instrument_id' => array('title' => ts('Payment Method')),
'contribution_id' => array(
'title' => ts('Individual Contribution'),
'name' => 'id',
-- CRM-16447
UPDATE civicrm_state_province SET name = 'Northern Ostrobothnia' WHERE name = 'Nothern Ostrobothnia';
+
+-- CRM-14078
+UPDATE civicrm_option_group SET title = '{ts escape="sql"}Payment Methods{/ts}' WHERE name = 'payment_instrument';
+UPDATE civicrm_navigation SET label = '{ts escape="sql"}Payment Methods{/ts}' WHERE name = 'Payment Instruments';
+
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
*}
-{* this template is used for adding/editing/deleting Payment-Instrument *}
+{* this template is used for adding/editing/deleting Payment-Method *}
<div class="crm-block crm-form-block crm-contribution-payment_instrument-form-block">
-<fieldset><legend>{if $action eq 1}{ts}New Payment Instrument{/ts}{elseif $action eq 2}{ts}Edit Payment Instrument{/ts}{else}{ts}Delete Payment Instrument{/ts}{/if}</legend>
+<fieldset><legend>{if $action eq 1}{ts}New Payment Method{/ts}{elseif $action eq 2}{ts}Edit Payment Method{/ts}{else}{ts}Delete Payment Method{/ts}{/if}</legend>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
{if $action eq 8}
<div class="messages status no-popup">
{/htxt}
{htxt id="payment_instrument_id-title"}
- {ts}Payment Instrument{/ts}
+ {ts}Payment Method{/ts}
{/htxt}
{htxt id="payment_instrument_id"}
<p>
{ts}Choose the method by which this transaction was paid.{/ts}
</p><p>
- {ts}Note: if the correct payment instrument is not listed here (e.g. for in-kind donations) ask your administrator to add a new option to this list.{/ts}
+ {ts}Note: if the correct payment method is not listed here (e.g. for in-kind donations) ask your administrator to add a new option to this list.{/ts}
</p>
{/htxt}
<tr>
<th class="crm-batch-checkbox">{$form.toggleSelect.html}</th>
<th class="crm-batch-name">{ts}Batch Name{/ts}</th>
- <th class="crm-batch-payment_instrument">{ts}Payment Instrument{/ts}</th>
+ <th class="crm-batch-payment_instrument">{ts}Payment Method{/ts}</th>
<th class="crm-batch-item_count">{ts}Item Count{/ts}</th>
<th class="crm-batch-total">{ts}Total Amount{/ts}</th>
<th class="crm-batch-status">{ts}Status{/ts}</th>
{capture assign="typeLink"}{crmURL p="civicrm/admin/financial/financialType" q="reset=1"}{/capture}
{capture assign="paymentLink"}{crmURL p="civicrm/admin/options/payment_instrument" q="reset=1"}{/capture}
{capture assign="premiumLink"}{crmURL p="civicrm/admin/contribute/managePremiums" q="reset=1"}{/capture}
- <p>{ts 1=$typeLink 2=$paymentLink 3=$premiumLink}Financial accounts correspond to those in your accounting system. <a href="%1">Financial types</a>, <a href="%2">payment
instruments</a>, and <a href="%3">premiums</a> are associated with financial accounts so that they can result in the proper double-entry transactions to export to your accounting system.{/ts}</p>
+ <p>{ts 1=$typeLink 2=$paymentLink 3=$premiumLink}Financial accounts correspond to those in your accounting system. <a href="%1">Financial types</a>, <a href="%2">payment
methods</a>, and <a href="%3">premiums</a> are associated with financial accounts so that they can result in the proper double-entry transactions to export to your accounting system.{/ts}</p>
</div>
{if $action ne 1 and $action ne 2}
<div class="action-link">
+--------------------------------------------------------------------+
*}
{htxt id="payment_instrument-title"}
- {ts}Payment Instrument{/ts}
+ {ts}Payment Method{/ts}
{/htxt}
{htxt id="payment_instrument"}
<p>
- {ts}If you specify a payment instrument then this batch will be limited to exporting only transactions paid with that method.{/ts}
+ {ts}If you specify a payment method then this batch will be limited to exporting only transactions paid with that method.{/ts}
</p>
<p>
- {ts}Note that not all transactions are necessarily associated with a payment instrument.{/ts}
+ {ts}Note that not all transactions are necessarily associated with a payment method.{/ts}
</p>
{/htxt}
</field>
<field>
<name>payment_instrument_id</name>
- <title>Batch Payment Instrument</title>
+ <title>Batch Payment Method</title>
<type>int unsigned</type>
<comment>fk to Payment Instrument options in civicrm_option_values</comment>
<pseudoconstant>
<field>
<name>payment_instrument_id</name>
<uniqueName>payment_instrument_id</uniqueName>
- <title>Payment Instrument ID</title>
+ <title>Payment Method</title>
<type>int unsigned</type>
<comment>FK to Payment Instrument</comment>
<pseudoconstant>
</foreignKey>
<field>
<name>payment_instrument_id</name>
- <title>Payment Instrument</title>
+ <title>Payment Method</title>
<type>int unsigned</type>
<comment>FK to Payment Instrument</comment>
<pseudoconstant>
<field>
<name>payment_instrument_id</name>
<uniqueName>financial_trxn_payment_instrument_id</uniqueName>
- <title>Payment Instrument</title>
+ <title>Payment Method</title>
<type>int unsigned</type>
<comment>FK to payment_instrument option group values</comment>
<pseudoconstant>
</field>
<field>
<name>payment_instrument_id</name>
- <title>Payment Instrument</title>
+ <title>Payment Method</title>
<type>int unsigned</type>
<default>1</default>
<comment>Payment Instrument ID</comment>
</field>
<field>
<name>payment_instrument_id</name>
- <title>Payment Instrument</title>
+ <title>Payment Method</title>
<type>int unsigned</type>
<default>1</default>
<comment>Payment Instrument ID</comment>
('individual_suffix' , '{ts escape="sql"}Individual contact suffixes{/ts}' , 1, 1, 0),
('acl_role' , '{ts escape="sql"}ACL Role{/ts}' , 1, 1, 0),
('accept_creditcard' , '{ts escape="sql"}Accepted Credit Cards{/ts}' , 1, 1, 0),
- ('payment_instrument' , '{ts escape="sql"}Payment Instruments{/ts}' , 1, 1, 0),
+ ('payment_instrument' , '{ts escape="sql"}Payment Methods{/ts}' , 1, 1, 0),
('contribution_status' , '{ts escape="sql"}Contribution Status{/ts}' , 1, 1, 1),
('pcp_status' , '{ts escape="sql"}PCP Status{/ts}' , 1, 1, 1),
('pcp_owner_notify' , '{ts escape="sql"}PCP owner notifications{/ts}' , 1, 1, 1),
( @domainID, 'civicrm/admin/contribute/managePremiums?reset=1', '{ts escape="sql" skip="true"}Premiums (Thank-you Gifts){/ts}', 'Premiums', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', 1, 9 ),
( @domainID, 'civicrm/admin/financial/financialType?reset=1', '{ts escape="sql" skip="true"}Financial Types{/ts}', 'Financial Types', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 10),
( @domainID, 'civicrm/admin/financial/financialAccount?reset=1', '{ts escape="sql" skip="true"}Financial Accounts{/ts}', 'Financial Accounts', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 11),
- ( @domainID, 'civicrm/admin/options/payment_instrument?reset=1', '{ts escape="sql" skip="true"}Payment Instruments{/ts}', 'Payment Instruments', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 12 ),
+ ( @domainID, 'civicrm/admin/options/payment_instrument?reset=1', '{ts escape="sql" skip="true"}Payment Methods{/ts}', 'Payment Instruments', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 12 ),
( @domainID, 'civicrm/admin/options/accept_creditcard?reset=1', '{ts escape="sql" skip="true"}Accepted Credit Cards{/ts}', 'Accepted Credit Cards', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 13 ),
( @domainID, 'civicrm/admin/options/soft_credit_type?reset=1', '{ts escape="sql" skip="true"}Soft Credit Types{/ts}', 'Soft Credit Types', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', 1, 14 ),
( @domainID, 'civicrm/admin/price?reset=1&action=add', '{ts escape="sql" skip="true"}New Price Set{/ts}', 'New Price Set', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 15 ),
projects / civicrm-core.git / commitdiff