From: Coleman Watts Date: Mon, 3 Aug 2015 21:42:27 +0000 (-0400) Subject: CRM-14078 - 'Payment Instrument' -> 'Payment Method' X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=536f0e025a823c6ed9c7926d885f3e6bc108e6bc;p=civicrm-core.git CRM-14078 - 'Payment Instrument' -> 'Payment Method' --- diff --git a/CRM/Admin/Page/Options.php b/CRM/Admin/Page/Options.php index ad4bc74c14..bf29204202 100644 --- a/CRM/Admin/Page/Options.php +++ b/CRM/Admin/Page/Options.php @@ -250,7 +250,7 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic { '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'); diff --git a/CRM/Contribute/Form/Task/PDFLetter.php b/CRM/Contribute/Form/Task/PDFLetter.php index 43e7fbfe86..9e73154cfb 100644 --- a/CRM/Contribute/Form/Task/PDFLetter.php +++ b/CRM/Contribute/Form/Task/PDFLetter.php @@ -125,7 +125,7 @@ class CRM_Contribute_Form_Task_PDFLetter extends CRM_Contribute_Form_Task { '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(), "
", FALSE); // this was going to be free-text but I opted for radio options in case there was a script injection risk diff --git a/CRM/Contribute/xml/Menu/Contribute.xml b/CRM/Contribute/xml/Menu/Contribute.xml index f366685d8a..ef8694e9d3 100644 --- a/CRM/Contribute/xml/Menu/Contribute.xml +++ b/CRM/Contribute/xml/Menu/Contribute.xml @@ -141,7 +141,7 @@ civicrm/admin/options/payment_instrument - Payment Instruments + Payment Methods CRM_Admin_Page_Options 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. CiviContribute diff --git a/CRM/Core/BAO/UFField.php b/CRM/Core/BAO/UFField.php index bcc9ebff73..d05d4ff432 100644 --- a/CRM/Core/BAO/UFField.php +++ b/CRM/Core/BAO/UFField.php @@ -1141,7 +1141,7 @@ SELECT id ), 'payment_instrument' => array( 'name' => 'payment_instrument', - 'title' => ts('Payment Instrument'), + 'title' => ts('Payment Method'), ), 'contribution_status_id' => array( 'name' => 'contribution_status_id', diff --git a/CRM/Core/OptionValue.php b/CRM/Core/OptionValue.php index 82c40570e7..1039faab0a 100644 --- a/CRM/Core/OptionValue.php +++ b/CRM/Core/OptionValue.php @@ -291,7 +291,7 @@ class CRM_Core_OptionValue { $nameTitle = array( 'payment_instrument' => array( 'name' => 'payment_instrument', - 'title' => ts('Payment Instrument'), + 'title' => ts('Payment Method'), 'headerPattern' => '/^payment|(p(ayment\s)?instrument)$/i', ), ); diff --git a/CRM/Core/SelectValues.php b/CRM/Core/SelectValues.php index 072dbd4bf4..506fce1804 100644 --- a/CRM/Core/SelectValues.php +++ b/CRM/Core/SelectValues.php @@ -554,7 +554,7 @@ class CRM_Core_SelectValues { '{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'), diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php index 42d6360b25..ecc9b18499 100644 --- a/CRM/Export/BAO/Export.php +++ b/CRM/Export/BAO/Export.php @@ -2039,7 +2039,7 @@ WHERE {$whereClause}"; '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'), ); } diff --git a/CRM/Financial/BAO/ExportFormat.php b/CRM/Financial/BAO/ExportFormat.php index 7b1e0cb332..ac035fbe00 100644 --- a/CRM/Financial/BAO/ExportFormat.php +++ b/CRM/Financial/BAO/ExportFormat.php @@ -195,7 +195,7 @@ class CRM_Financial_BAO_ExportFormat { $paymentInstrument = array_flip(CRM_Contribute_PseudoConstant::paymentInstrument('label')); $values['payment_instrument_id'] = array_search($values['payment_instrument_id'], $paymentInstrument); } - $details = '

' . ts('Record:') . ' ' . $values['title'] . '

' . ts('Description:') . '

' . ts('Created By:') . " $createdBy" . '

' . ts('Created Date:') . ' ' . $values['created_date'] . '

' . ts('Last Modified By:') . ' ' . $modifiedBy . '

' . ts('Payment Instrument:') . ' ' . $values['payment_instrument_id'] . '

'; + $details = '

' . ts('Record:') . ' ' . $values['title'] . '

' . ts('Description:') . '

' . ts('Created By:') . " $createdBy" . '

' . ts('Created Date:') . ' ' . $values['created_date'] . '

' . ts('Last Modified By:') . ' ' . $modifiedBy . '

' . ts('Payment Method:') . ' ' . $values['payment_instrument_id'] . '

'; $subject = ''; if (!empty($values['total'])) { $subject .= ts('Total') . '[' . CRM_Utils_Money::format($values['total']) . '],'; diff --git a/CRM/Financial/Form/BatchTransaction.php b/CRM/Financial/Form/BatchTransaction.php index 45c9afce8c..1325538fb3 100644 --- a/CRM/Financial/Form/BatchTransaction.php +++ b/CRM/Financial/Form/BatchTransaction.php @@ -64,7 +64,7 @@ class CRM_Financial_Form_BatchTransaction extends CRM_Contribute_Form { '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'), diff --git a/CRM/Financial/Form/FinancialBatch.php b/CRM/Financial/Form/FinancialBatch.php index 2a4599d57b..031319f9da 100644 --- a/CRM/Financial/Form/FinancialBatch.php +++ b/CRM/Financial/Form/FinancialBatch.php @@ -137,7 +137,7 @@ class CRM_Financial_Form_FinancialBatch extends CRM_Contribute_Form { $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 ); diff --git a/CRM/Financial/Form/Search.php b/CRM/Financial/Form/Search.php index 1dfcc15e0c..aefc5ec7ec 100644 --- a/CRM/Financial/Form/Search.php +++ b/CRM/Financial/Form/Search.php @@ -78,7 +78,7 @@ class CRM_Financial_Form_Search extends CRM_Core_Form { $this->add( 'select', 'payment_instrument_id', - ts('Payment Instrument'), + ts('Payment Method'), array('' => ts('- any -')) + CRM_Contribute_PseudoConstant::paymentInstrument(), FALSE ); diff --git a/CRM/Report/Form/Contribute/Bookkeeping.php b/CRM/Report/Form/Contribute/Bookkeeping.php index 864aacba44..662f497629 100644 --- a/CRM/Report/Form/Contribute/Bookkeeping.php +++ b/CRM/Report/Form/Contribute/Bookkeeping.php @@ -268,7 +268,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form { 'default' => TRUE, ), 'payment_instrument_id' => array( - 'title' => ts('Payment Instrument'), + 'title' => ts('Payment Method'), 'default' => TRUE, ), 'currency' => array( @@ -287,7 +287,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form { ), '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(), ), @@ -305,7 +305,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form { ), ), 'order_bys' => array( - 'payment_instrument_id' => array('title' => ts('Payment Instrument')), + 'payment_instrument_id' => array('title' => ts('Payment Method')), ), ), 'civicrm_entity_financial_trxn' => array( diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php index 23c7ac944c..6795ec9788 100644 --- a/CRM/Report/Form/Contribute/Detail.php +++ b/CRM/Report/Form/Contribute/Detail.php @@ -282,7 +282,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { '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', diff --git a/CRM/Report/Form/Extended.php b/CRM/Report/Form/Extended.php index 95aefff3f5..60934193d7 100644 --- a/CRM/Report/Form/Extended.php +++ b/CRM/Report/Form/Extended.php @@ -517,7 +517,7 @@ class CRM_Report_Form_Extended extends CRM_Report_Form { 'alter_display' => 'alterContributionType', ), 'payment_instrument_id' => array( - 'title' => ts('Payment Instrument'), + 'title' => ts('Payment Method'), 'alter_display' => 'alterPaymentType', ), 'source' => array('title' => 'Contribution Source'), @@ -553,7 +553,7 @@ class CRM_Report_Form_Extended extends CRM_Report_Form { ), 'order_bys' => array( 'payment_instrument_id' => array( - 'title' => ts('Payment Instrument'), + 'title' => ts('Payment Method'), ), 'financial_type_id' => array( 'title' => ts('Financial Type'), @@ -561,7 +561,7 @@ class CRM_Report_Form_Extended extends CRM_Report_Form { ), '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', diff --git a/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl index d9aaee70e3..3113f5e766 100644 --- a/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl @@ -43,3 +43,8 @@ UPDATE civicrm_country SET `name` = UPPER( `name` ); -- 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'; + diff --git a/templates/CRM/Contribute/Form/PaymentInstrument.tpl b/templates/CRM/Contribute/Form/PaymentInstrument.tpl index 2a2f3c71ee..885b0811be 100644 --- a/templates/CRM/Contribute/Form/PaymentInstrument.tpl +++ b/templates/CRM/Contribute/Form/PaymentInstrument.tpl @@ -23,9 +23,9 @@ | 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 *}
-
{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} +
{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}
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8}
diff --git a/templates/CRM/Contribute/Page/Tab.hlp b/templates/CRM/Contribute/Page/Tab.hlp index 687c350af1..b6f447f72e 100644 --- a/templates/CRM/Contribute/Page/Tab.hlp +++ b/templates/CRM/Contribute/Page/Tab.hlp @@ -38,13 +38,13 @@ {/htxt} {htxt id="payment_instrument_id-title"} - {ts}Payment Instrument{/ts} + {ts}Payment Method{/ts} {/htxt} {htxt id="payment_instrument_id"}

{ts}Choose the method by which this transaction was paid.{/ts}

- {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}

{/htxt} diff --git a/templates/CRM/Financial/Form/Search.tpl b/templates/CRM/Financial/Form/Search.tpl index 26b8165e43..754812d357 100644 --- a/templates/CRM/Financial/Form/Search.tpl +++ b/templates/CRM/Financial/Form/Search.tpl @@ -55,7 +55,7 @@ {$form.toggleSelect.html} {ts}Batch Name{/ts} - {ts}Payment Instrument{/ts} + {ts}Payment Method{/ts} {ts}Item Count{/ts} {ts}Total Amount{/ts} {ts}Status{/ts} diff --git a/templates/CRM/Financial/Page/FinancialAccount.tpl b/templates/CRM/Financial/Page/FinancialAccount.tpl index 732db89fdd..f915ce9de0 100644 --- a/templates/CRM/Financial/Page/FinancialAccount.tpl +++ b/templates/CRM/Financial/Page/FinancialAccount.tpl @@ -30,7 +30,7 @@ {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} -

{ts 1=$typeLink 2=$paymentLink 3=$premiumLink}Financial accounts correspond to those in your accounting system. Financial types, payment instruments, and premiums are associated with financial accounts so that they can result in the proper double-entry transactions to export to your accounting system.{/ts}

+

{ts 1=$typeLink 2=$paymentLink 3=$premiumLink}Financial accounts correspond to those in your accounting system. Financial types, payment methods, and premiums are associated with financial accounts so that they can result in the proper double-entry transactions to export to your accounting system.{/ts}

{if $action ne 1 and $action ne 2}
diff --git a/templates/CRM/Financial/Page/FinancialBatch.hlp b/templates/CRM/Financial/Page/FinancialBatch.hlp index 3c98610de4..6e773d9076 100644 --- a/templates/CRM/Financial/Page/FinancialBatch.hlp +++ b/templates/CRM/Financial/Page/FinancialBatch.hlp @@ -24,14 +24,14 @@ +--------------------------------------------------------------------+ *} {htxt id="payment_instrument-title"} - {ts}Payment Instrument{/ts} + {ts}Payment Method{/ts} {/htxt} {htxt id="payment_instrument"}

- {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}

- {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}

{/htxt} diff --git a/xml/schema/Batch/Batch.xml b/xml/schema/Batch/Batch.xml index 2841971a01..9477065c9f 100644 --- a/xml/schema/Batch/Batch.xml +++ b/xml/schema/Batch/Batch.xml @@ -193,7 +193,7 @@ payment_instrument_id - Batch Payment Instrument + Batch Payment Method int unsigned fk to Payment Instrument options in civicrm_option_values diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml index 02f271a097..84c80292a8 100644 --- a/xml/schema/Contribute/Contribution.xml +++ b/xml/schema/Contribute/Contribution.xml @@ -122,7 +122,7 @@ payment_instrument_id payment_instrument_id - Payment Instrument ID + Payment Method int unsigned FK to Payment Instrument diff --git a/xml/schema/Contribute/ContributionRecur.xml b/xml/schema/Contribute/ContributionRecur.xml index 122696f32d..9e5cfaf6be 100644 --- a/xml/schema/Contribute/ContributionRecur.xml +++ b/xml/schema/Contribute/ContributionRecur.xml @@ -299,7 +299,7 @@ payment_instrument_id - Payment Instrument + Payment Method int unsigned FK to Payment Instrument diff --git a/xml/schema/Financial/FinancialTrxn.xml b/xml/schema/Financial/FinancialTrxn.xml index b3926b7c6c..03fbf024d7 100755 --- a/xml/schema/Financial/FinancialTrxn.xml +++ b/xml/schema/Financial/FinancialTrxn.xml @@ -199,7 +199,7 @@ payment_instrument_id financial_trxn_payment_instrument_id - Payment Instrument + Payment Method int unsigned FK to payment_instrument option group values diff --git a/xml/schema/Financial/PaymentProcessor.xml b/xml/schema/Financial/PaymentProcessor.xml index e93e0a7755..f880640595 100644 --- a/xml/schema/Financial/PaymentProcessor.xml +++ b/xml/schema/Financial/PaymentProcessor.xml @@ -194,7 +194,7 @@ payment_instrument_id - Payment Instrument + Payment Method int unsigned 1 Payment Instrument ID diff --git a/xml/schema/Financial/PaymentProcessorType.xml b/xml/schema/Financial/PaymentProcessorType.xml index e5cd323f10..3e5de52682 100644 --- a/xml/schema/Financial/PaymentProcessorType.xml +++ b/xml/schema/Financial/PaymentProcessorType.xml @@ -182,7 +182,7 @@ payment_instrument_id - Payment Instrument + Payment Method int unsigned 1 Payment Instrument ID diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl index 7be89816a3..d8791c7051 100644 --- a/xml/templates/civicrm_data.tpl +++ b/xml/templates/civicrm_data.tpl @@ -141,7 +141,7 @@ VALUES ('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), diff --git a/xml/templates/civicrm_navigation.tpl b/xml/templates/civicrm_navigation.tpl index b9fa6f1789..682895f348 100644 --- a/xml/templates/civicrm_navigation.tpl +++ b/xml/templates/civicrm_navigation.tpl @@ -514,7 +514,7 @@ VALUES ( @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 ),