From 4db803dd0299ff1f202290f25ec4455eb53dd6a0 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Mon, 3 Aug 2015 17:58:01 -0400 Subject: [PATCH] CRM-14078 - 'Paid By' -> 'Payment Method' --- CRM/Batch/Form/Entry.php | 6 +++--- CRM/Contribute/Form/AdditionalPayment.php | 2 +- CRM/Contribute/Form/Contribution.php | 2 +- CRM/Contribute/Form/Task/Status.php | 4 ++-- CRM/Event/Form/EventFees.php | 2 +- CRM/Event/Form/Participant.php | 2 +- CRM/Member/Form/Membership.php | 4 ++-- CRM/Member/Form/MembershipRenewal.php | 4 ++-- templates/CRM/Contribute/Form/AdditionalPayment.tpl | 2 +- templates/CRM/Contribute/Form/ContributionView.tpl | 2 +- templates/CRM/Contribute/Form/Task/Status.tpl | 2 +- tests/phpunit/WebTest/Contribute/AddPricesetTest.php | 4 ++-- tests/phpunit/WebTest/Contribute/ContactContextAddTest.php | 2 +- .../phpunit/WebTest/Contribute/OfflineContributionTest.php | 4 ++-- .../WebTest/Contribute/OfflineRecurContributionTest.php | 2 +- .../WebTest/Contribute/OnlineRecurContributionTest.php | 2 +- tests/phpunit/WebTest/Contribute/StandaloneAddTest.php | 4 ++-- .../WebTest/Contribute/UpdatePendingContributionTest.php | 2 +- tests/phpunit/WebTest/Event/AddParticipationTest.php | 4 ++-- tests/phpunit/WebTest/Event/AddPricesetTest.php | 2 +- tests/phpunit/WebTest/Event/AdditionalPaymentTest.php | 6 +++--- tests/phpunit/WebTest/resources/import/ImportContribs1.csv | 2 +- tests/phpunit/WebTest/resources/import/ImportContribs2.csv | 2 +- .../WebTest/resources/import/ImportContribsExtID.csv | 2 +- .../WebTest/resources/import/ImportContribs_custom.csv | 2 +- xml/templates/civicrm_data.tpl | 4 ++-- 26 files changed, 38 insertions(+), 38 deletions(-) diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php index 688fa27c08..7ea3a69658 100755 --- a/CRM/Batch/Form/Entry.php +++ b/CRM/Batch/Form/Entry.php @@ -280,9 +280,9 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form { $errors = array(); $batchTypes = CRM_Core_Pseudoconstant::get('CRM_Batch_DAO_Batch', 'type_id', array('flip' => 1), 'validate'); $fields = array( - 'total_amount' => 'Amount', - 'financial_type' => 'Financial Type', - 'payment_instrument' => 'Paid By', + 'total_amount' => ts('Amount'), + 'financial_type' => ts('Financial Type'), + 'payment_instrument' => ts('Payment Method'), ); //CRM-16480 if contact is selected, validate financial type and amount field. diff --git a/CRM/Contribute/Form/AdditionalPayment.php b/CRM/Contribute/Form/AdditionalPayment.php index 234c3a0c3c..e6159b3444 100644 --- a/CRM/Contribute/Form/AdditionalPayment.php +++ b/CRM/Contribute/Form/AdditionalPayment.php @@ -271,7 +271,7 @@ class CRM_Contribute_Form_AdditionalPayment extends CRM_Contribute_Form_Abstract ); $this->add('select', 'payment_instrument_id', - ts('Paid By'), + ts('Payment Method'), array('' => ts('- select -')) + CRM_Contribute_PseudoConstant::paymentInstrument(), TRUE, array('onChange' => "return showHideByValue('payment_instrument_id','4','checkNumber','table-row','select',false);") ); diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php index 3cf708216a..b7266ae04a 100644 --- a/CRM/Contribute/Form/Contribution.php +++ b/CRM/Contribute/Form/Contribution.php @@ -619,7 +619,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP $paymentInstrument = FALSE; if (!$this->_mode) { $paymentInstrument = $this->add('select', 'payment_instrument_id', - ts('Paid By'), + ts('Payment Method'), array('' => ts('- select -')) + CRM_Contribute_PseudoConstant::paymentInstrument(), TRUE, array('onChange' => "return showHideByValue('payment_instrument_id','4','checkNumber','table-row','select',false);") ); diff --git a/CRM/Contribute/Form/Task/Status.php b/CRM/Contribute/Form/Task/Status.php index 5d8d4d26a5..dad1e832c4 100644 --- a/CRM/Contribute/Form/Task/Status.php +++ b/CRM/Contribute/Form/Task/Status.php @@ -154,7 +154,7 @@ AND co.id IN ( $contribIDs )"; $this->add("text", "check_number_{$row['contribution_id']}", ts('Check Number')); $defaults["check_number_{$row['contribution_id']}"] = $dao->check_no; - $this->add("select", "payment_instrument_id_{$row['contribution_id']}", ts('Paid By'), $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; @@ -203,7 +203,7 @@ AND co.id IN ( $contribIDs )"; $contribID = substr($name, 13); if ($fields["payment_instrument_id_{$contribID}"] != CRM_Core_OptionGroup::getValue('payment_instrument', 'Check', 'name')) { - $errors["payment_instrument_id_{$contribID}"] = ts("Paid By 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."); } } } diff --git a/CRM/Event/Form/EventFees.php b/CRM/Event/Form/EventFees.php index 389f25de57..b0e7d66a16 100644 --- a/CRM/Event/Form/EventFees.php +++ b/CRM/Event/Form/EventFees.php @@ -426,7 +426,7 @@ SELECT id, html_type $form->addDateTime('receive_date', ts('Received'), FALSE, array('formatType' => 'activityDateTime')); $form->add('select', 'payment_instrument_id', - ts('Paid By'), + ts('Payment Method'), array('' => ts('- select -')) + CRM_Contribute_PseudoConstant::paymentInstrument(), FALSE, array('onChange' => "return showHideByValue('payment_instrument_id','4','checkNumber','table-row','select',false);") ); diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php index a3ef71f36b..898b81f0a6 100644 --- a/CRM/Event/Form/Participant.php +++ b/CRM/Event/Form/Participant.php @@ -814,7 +814,7 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment $errorMsg['financial_type_id'] = ts('Please enter the associated Financial Type'); } if (empty($values['payment_instrument_id'])) { - $errorMsg['payment_instrument_id'] = ts('Paid By is a required field.'); + $errorMsg['payment_instrument_id'] = ts('Payment Method is a required field.'); } } diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php index d4d8b0e39f..f58e7dd9df 100644 --- a/CRM/Member/Form/Membership.php +++ b/CRM/Member/Form/Membership.php @@ -630,7 +630,7 @@ class CRM_Member_Form_Membership extends CRM_Member_Form { $this->addDate('receive_date', ts('Received'), FALSE, array('formatType' => 'activityDateTime')); $this->add('select', 'payment_instrument_id', - ts('Paid By'), + ts('Payment Method'), array('' => ts('- select -')) + CRM_Contribute_PseudoConstant::paymentInstrument(), FALSE, array('onChange' => "return showHideByValue('payment_instrument_id','4','checkNumber','table-row','select',false);") ); @@ -804,7 +804,7 @@ class CRM_Member_Form_Membership extends CRM_Member_Form { } if (!empty($params['record_contribution']) && empty($params['payment_instrument_id'])) { - $errors['payment_instrument_id'] = ts('Paid By is a required field.'); + $errors['payment_instrument_id'] = ts('Payment Method is a required field.'); } if (!empty($params['is_different_contribution_contact'])) { diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php index 700f1a8e89..8c63c91165 100644 --- a/CRM/Member/Form/MembershipRenewal.php +++ b/CRM/Member/Form/MembershipRenewal.php @@ -354,7 +354,7 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form { $this->add('text', 'num_terms', ts('Extend Membership by'), array('onchange' => "setPaymentBlock();"), TRUE); $this->addRule('num_terms', ts('Please enter a whole number for how many periods to renew.'), 'integer'); - $this->add('select', 'payment_instrument_id', ts('Paid By'), + $this->add('select', 'payment_instrument_id', ts('Payment Method'), array('' => ts('- select -')) + CRM_Contribute_PseudoConstant::paymentInstrument(), FALSE, array('onChange' => "return showHideByValue('payment_instrument_id','4','checkNumber','table-row','select',false);") ); @@ -439,7 +439,7 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form { $errors['total_amount'] = ts('Please enter a Contribution Amount.'); } if (empty($params['payment_instrument_id'])) { - $errors['payment_instrument_id'] = ts('Paid By is a required field.'); + $errors['payment_instrument_id'] = ts('Payment Method is a required field.'); } } return empty($errors) ? TRUE : $errors; diff --git a/templates/CRM/Contribute/Form/AdditionalPayment.tpl b/templates/CRM/Contribute/Form/AdditionalPayment.tpl index a9f0d1b1a5..cbea7c2836 100644 --- a/templates/CRM/Contribute/Form/AdditionalPayment.tpl +++ b/templates/CRM/Contribute/Form/AdditionalPayment.tpl @@ -29,7 +29,7 @@ {ts}Amount{/ts} {ts}Type{/ts} - {ts}Paid By{/ts} + {ts}Payment Method{/ts} {ts}Received{/ts} {ts}Transaction ID{/ts} {ts}Status{/ts} diff --git a/templates/CRM/Contribute/Form/ContributionView.tpl b/templates/CRM/Contribute/Form/ContributionView.tpl index ba909ddca5..ddefa433ea 100644 --- a/templates/CRM/Contribute/Form/ContributionView.tpl +++ b/templates/CRM/Contribute/Form/ContributionView.tpl @@ -149,7 +149,7 @@ {/if} {/if} - {ts}Paid By{/ts} + {ts}Payment Method{/ts} {$payment_instrument}{if $payment_processor_name} ({$payment_processor_name}){/if} diff --git a/templates/CRM/Contribute/Form/Task/Status.tpl b/templates/CRM/Contribute/Form/Task/Status.tpl index 1ac91f1639..a1894a14c8 100644 --- a/templates/CRM/Contribute/Form/Task/Status.tpl +++ b/templates/CRM/Contribute/Form/Task/Status.tpl @@ -39,7 +39,7 @@ {ts}Amount{/ts}   {ts}Source{/ts} {ts}Fee Amount{/ts} - {ts}Paid By{/ts} + {ts}Payment Method{/ts} {ts}Check{/ts} # {ts}Transaction ID{/ts} {ts}Transaction Date{/ts} diff --git a/tests/phpunit/WebTest/Contribute/AddPricesetTest.php b/tests/phpunit/WebTest/Contribute/AddPricesetTest.php index 9be28008e2..886ea9664e 100644 --- a/tests/phpunit/WebTest/Contribute/AddPricesetTest.php +++ b/tests/phpunit/WebTest/Contribute/AddPricesetTest.php @@ -639,7 +639,7 @@ class WebTest_Contribute_AddPricesetTest extends CiviSeleniumTestCase { 'From' => $contact['display_name'], 'Financial Type' => $financialType, 'Contribution Amount' => 'Contribution Total: $ 590.00', - 'Paid By' => 'Check', + 'Payment Method' => 'Check', 'Check Number' => '1041', 'Contribution Status' => 'Completed', ); @@ -704,7 +704,7 @@ class WebTest_Contribute_AddPricesetTest extends CiviSeleniumTestCase { 'Financial Type' => $fields['values'][$fields['id']]['financial_type'], 'Contribution Amount' => $fields['values'][$fields['id']]['total_amount'], 'Contribution Status' => $fields['values'][$fields['id']]['contribution_status'], - 'Paid By' => $fields['values'][$fields['id']]['payment_instrument'], + 'Payment Method' => $fields['values'][$fields['id']]['payment_instrument'], 'Check Number' => $fields['values'][$fields['id']]['contribution_check_number'], ); diff --git a/tests/phpunit/WebTest/Contribute/ContactContextAddTest.php b/tests/phpunit/WebTest/Contribute/ContactContextAddTest.php index 57eca8fdf3..10672020fc 100644 --- a/tests/phpunit/WebTest/Contribute/ContactContextAddTest.php +++ b/tests/phpunit/WebTest/Contribute/ContactContextAddTest.php @@ -154,7 +154,7 @@ class WebTest_Contribute_ContactContextAddTest extends CiviSeleniumTestCase { 'From' => $firstName . " Anderson", 'Financial Type' => 'Donation', 'Contribution Status' => 'Completed', - 'Paid By' => 'Check', + 'Payment Method' => 'Check', 'Total Amount' => '$ 100.00', 'Non-deductible Amount' => '$ 12.50', 'Check Number' => 'check #1041', diff --git a/tests/phpunit/WebTest/Contribute/OfflineContributionTest.php b/tests/phpunit/WebTest/Contribute/OfflineContributionTest.php index bb7008825b..5db8c37dde 100644 --- a/tests/phpunit/WebTest/Contribute/OfflineContributionTest.php +++ b/tests/phpunit/WebTest/Contribute/OfflineContributionTest.php @@ -160,7 +160,7 @@ class WebTest_Contribute_OfflineContributionTest extends CiviSeleniumTestCase { 'Financial Type' => 'Donation', 'Total Amount' => '100.00', 'Contribution Status' => 'Completed', - 'Paid By' => 'Check', + 'Payment Method' => 'Check', 'Check Number' => 'check #1041', 'Non-deductible Amount' => '10.00', 'Received Into' => $financialAccount, @@ -427,7 +427,7 @@ class WebTest_Contribute_OfflineContributionTest extends CiviSeleniumTestCase { 'Financial Type' => 'Donation', 'Total Amount' => '0.00', 'Contribution Status' => 'Completed', - 'Paid By' => 'Credit Card', + 'Payment Method' => 'Credit Card', ); $this->webtestVerifyTabularData($expected); } diff --git a/tests/phpunit/WebTest/Contribute/OfflineRecurContributionTest.php b/tests/phpunit/WebTest/Contribute/OfflineRecurContributionTest.php index 1eebfe40dd..1c8a04a4af 100644 --- a/tests/phpunit/WebTest/Contribute/OfflineRecurContributionTest.php +++ b/tests/phpunit/WebTest/Contribute/OfflineRecurContributionTest.php @@ -100,7 +100,7 @@ class WebTest_Contribute_OfflineRecurContributionTest extends CiviSeleniumTestCa 'Financial Type' => 'Donation (test)', 'Total Amount' => 'Installments: 12, Interval: 1 month(s)', 'Contribution Status' => 'Pending : Incomplete Transaction', - 'Paid By' => 'Credit Card', + 'Payment Method' => 'Credit Card', ); foreach ($verifyData as $label => $value) { diff --git a/tests/phpunit/WebTest/Contribute/OnlineRecurContributionTest.php b/tests/phpunit/WebTest/Contribute/OnlineRecurContributionTest.php index 3fa7e20645..93067ca075 100644 --- a/tests/phpunit/WebTest/Contribute/OnlineRecurContributionTest.php +++ b/tests/phpunit/WebTest/Contribute/OnlineRecurContributionTest.php @@ -143,7 +143,7 @@ class WebTest_Contribute_OnlineRecurContributionTest extends CiviSeleniumTestCas 'Financial Type' => 'Donation (test)', 'Total Amount' => 'Installments: 12, Interval: 1 month(s)', 'Contribution Status' => 'Pending : Incomplete Transaction', - 'Paid By' => 'Credit Card', + 'Payment Method' => 'Credit Card', 'Online Contribution Page' => $pageTitle, ); foreach ($verifyData as $label => $value) { diff --git a/tests/phpunit/WebTest/Contribute/StandaloneAddTest.php b/tests/phpunit/WebTest/Contribute/StandaloneAddTest.php index df15c94a9d..fc55540825 100644 --- a/tests/phpunit/WebTest/Contribute/StandaloneAddTest.php +++ b/tests/phpunit/WebTest/Contribute/StandaloneAddTest.php @@ -143,7 +143,7 @@ class WebTest_Contribute_StandaloneAddTest extends CiviSeleniumTestCase { 'Financial Type' => 'Donation', 'Total Amount' => '$ 100.00', 'Contribution Status' => 'Completed', - 'Paid By' => 'Check', + 'Payment Method' => 'Check', 'Check Number' => 'check #1041', ); @@ -267,7 +267,7 @@ class WebTest_Contribute_StandaloneAddTest extends CiviSeleniumTestCase { 'Financial Type' => $financialType['name'], 'Total Amount' => '$ 100.00', 'Contribution Status' => 'Completed', - 'Paid By' => 'Check', + 'Payment Method' => 'Check', 'Check Number' => 'check #1041', ); diff --git a/tests/phpunit/WebTest/Contribute/UpdatePendingContributionTest.php b/tests/phpunit/WebTest/Contribute/UpdatePendingContributionTest.php index e62fbfd7e8..5f0f642904 100644 --- a/tests/phpunit/WebTest/Contribute/UpdatePendingContributionTest.php +++ b/tests/phpunit/WebTest/Contribute/UpdatePendingContributionTest.php @@ -153,7 +153,7 @@ class WebTest_Contribute_UpdatePendingContributionTest extends CiviSeleniumTestC 'Financial Type' => 'Donation', 'Total Amount' => '100.00', 'Contribution Status' => 'Pending', - 'Paid By' => 'Check', + 'Payment Method' => 'Check', 'Check Number' => 'check #1041', ); $this->webtestVerifyTabularData($expected); diff --git a/tests/phpunit/WebTest/Event/AddParticipationTest.php b/tests/phpunit/WebTest/Event/AddParticipationTest.php index 291e646a51..93adbbe5d9 100644 --- a/tests/phpunit/WebTest/Event/AddParticipationTest.php +++ b/tests/phpunit/WebTest/Event/AddParticipationTest.php @@ -116,7 +116,7 @@ class WebTest_Event_AddParticipationTest extends CiviSeleniumTestCase { 'Financial Type' => 'Event Fee', 'Total Amount' => '$ 800.00', 'Contribution Status' => 'Completed', - 'Paid By' => 'Check', + 'Payment Method' => 'Check', 'Check Number' => '1044', ) ); @@ -309,7 +309,7 @@ class WebTest_Event_AddParticipationTest extends CiviSeleniumTestCase { 'From' => $displayName, 'Financial Type' => 'Event Fee', 'Contribution Status' => 'Completed', - 'Paid By' => 'Check', + 'Payment Method' => 'Check', 'Check Number' => '1044', ) ); diff --git a/tests/phpunit/WebTest/Event/AddPricesetTest.php b/tests/phpunit/WebTest/Event/AddPricesetTest.php index f2701a7939..1eb9dec070 100644 --- a/tests/phpunit/WebTest/Event/AddPricesetTest.php +++ b/tests/phpunit/WebTest/Event/AddPricesetTest.php @@ -671,7 +671,7 @@ class WebTest_Event_AddPricesetTest extends CiviSeleniumTestCase { 'From' => $displayName, 'Financial Type' => 'Event Fee', 'Contribution Status' => 'Completed', - 'Paid By' => 'Check', + 'Payment Method' => 'Check', 'Check Number' => '1044', 'Received Into' => 'Deposit Bank Account', ) diff --git a/tests/phpunit/WebTest/Event/AdditionalPaymentTest.php b/tests/phpunit/WebTest/Event/AdditionalPaymentTest.php index 71f9258018..634c693d0b 100644 --- a/tests/phpunit/WebTest/Event/AdditionalPaymentTest.php +++ b/tests/phpunit/WebTest/Event/AdditionalPaymentTest.php @@ -138,7 +138,7 @@ class WebTest_Event_AdditionalPaymentTest extends CiviSeleniumTestCase { 'Financial Type' => 'Event Fee', 'Total Amount' => '$ 800.00', 'Contribution Status' => 'Partially paid', - 'Paid By' => 'Check', + 'Payment Method' => 'Check', 'Check Number' => '1044', ) ); @@ -190,7 +190,7 @@ class WebTest_Event_AdditionalPaymentTest extends CiviSeleniumTestCase { 'Financial Type' => 'Event Fee', 'Total Amount' => '$ 800.00', 'Contribution Status' => 'Completed', - 'Paid By' => 'Check', + 'Payment Method' => 'Check', 'Check Number' => '1044', ) ); @@ -200,7 +200,7 @@ class WebTest_Event_AdditionalPaymentTest extends CiviSeleniumTestCase { $this->waitForElementPresent("xpath=//td[@id='payment-info']/table[@id='info']/tbody/tr[2]/td[2]/a"); $this->clickAjaxLink("xpath=//td[@id='payment-info']/table[@id='info']/tbody/tr[2]/td[2]/a"); $this->waitForElementPresent("xpath=//table[@id='info']/tbody/tr/th[contains(text(), 'Amount')]/../../tr[2]/td[contains(text(), '$ 400.00')]/../../tr[3]/td[contains(text(), '$ 400.00')]"); - $this->waitForElementPresent("xpath=//table[@id='info']/tbody/tr/th[3][contains(text(), 'Paid By')]/../../tr[2]/td[3][contains(text(), 'Check')]/../../tr[3]/td[3][contains(text(), 'Cash')]"); + $this->waitForElementPresent("xpath=//table[@id='info']/tbody/tr/th[3][contains(text(), 'Payment Method')]/../../tr[2]/td[3][contains(text(), 'Check')]/../../tr[3]/td[3][contains(text(), 'Cash')]"); $this->waitForElementPresent("xpath=//table[@id='info']/tbody/tr/th[6][contains(text(), 'Status')]/../../tr[2]/td[6][contains(text(), 'Completed')]/../../tr[3]/td[6][contains(text(), 'Completed')]"); } diff --git a/tests/phpunit/WebTest/resources/import/ImportContribs1.csv b/tests/phpunit/WebTest/resources/import/ImportContribs1.csv index b6e426437f..2e4183f836 100644 --- a/tests/phpunit/WebTest/resources/import/ImportContribs1.csv +++ b/tests/phpunit/WebTest/resources/import/ImportContribs1.csv @@ -1 +1 @@ -Contact ID,External ID,Contribution Type,Amount,Date,Paid By,Source,Transaction ID,Fee Amount,Non-deductible,Check # 2,22,Campaign Contribution,125,20081011,Check,Oct 2005 Mailer 1,,,125,109 4,44,Donation,50,20080921,Credit Card,Online: Save the Penguins,P20901X9,1.75,, 6,66,Campaign Contribution,25,20081029,Check,Oct 2005 Mailer 1,,,25,2309 55,55abc,Campaign Contribution,2175,20081011,Check,Oct 2005 Mailer 1,,,175,1902 32,3232abc,Donation,50,20080927,Credit Card,Online: Save the Penguins,P20193L235,1.75,, 92,9292,Donation,10,20080908,Credit Card,Online: Save the Penguins,P40232Y256,0.27,, 34,3434,Donation,250,20081022,Credit Card,Online: Save the Penguins,P20193SSS092,3.55,, 199,199199,Donation,250,20081022,Credit Card,Online: Save the Penguins,XJA090322,3.55,, \ No newline at end of file +Contact ID,External ID,Contribution Type,Amount,Date,Payment Method,Source,Transaction ID,Fee Amount,Non-deductible,Check # 2,22,Campaign Contribution,125,20081011,Check,Oct 2005 Mailer 1,,,125,109 4,44,Donation,50,20080921,Credit Card,Online: Save the Penguins,P20901X9,1.75,, 6,66,Campaign Contribution,25,20081029,Check,Oct 2005 Mailer 1,,,25,2309 55,55abc,Campaign Contribution,2175,20081011,Check,Oct 2005 Mailer 1,,,175,1902 32,3232abc,Donation,50,20080927,Credit Card,Online: Save the Penguins,P20193L235,1.75,, 92,9292,Donation,10,20080908,Credit Card,Online: Save the Penguins,P40232Y256,0.27,, 34,3434,Donation,250,20081022,Credit Card,Online: Save the Penguins,P20193SSS092,3.55,, 199,199199,Donation,250,20081022,Credit Card,Online: Save the Penguins,XJA090322,3.55,, \ No newline at end of file diff --git a/tests/phpunit/WebTest/resources/import/ImportContribs2.csv b/tests/phpunit/WebTest/resources/import/ImportContribs2.csv index 9a79cff4b2..73c07be219 100644 --- a/tests/phpunit/WebTest/resources/import/ImportContribs2.csv +++ b/tests/phpunit/WebTest/resources/import/ImportContribs2.csv @@ -1 +1 @@ -Email,Contribution Type,Amount,Receive Date,Paid By,Source,Transaction ID,Invoice ID,Status,Comments jake@foo.org,Donation,125,,,Oct 2005 Mailer 1,,,Completed,Coming in by mail. dggreenberg@gmail.com,Donation,50,20060111,Check,Dec 2005 Mailer,,,Pending, adamspeter@hotmail.com,Member Dues,25,20051029,Check,Oct 2005 Mailer 1,check #2095,10924,Completed, ,Member Dues,50,20051011,Check,Oct 2005 Mailer 1,check #10552,10925,Completed, \ No newline at end of file +Email,Contribution Type,Amount,Receive Date,Payment Method,Source,Transaction ID,Invoice ID,Status,Comments jake@foo.org,Donation,125,,,Oct 2005 Mailer 1,,,Completed,Coming in by mail. dggreenberg@gmail.com,Donation,50,20060111,Check,Dec 2005 Mailer,,,Pending, adamspeter@hotmail.com,Member Dues,25,20051029,Check,Oct 2005 Mailer 1,check #2095,10924,Completed, ,Member Dues,50,20051011,Check,Oct 2005 Mailer 1,check #10552,10925,Completed, \ No newline at end of file diff --git a/tests/phpunit/WebTest/resources/import/ImportContribsExtID.csv b/tests/phpunit/WebTest/resources/import/ImportContribsExtID.csv index 5d3f355a0c..54111c1d7f 100644 --- a/tests/phpunit/WebTest/resources/import/ImportContribsExtID.csv +++ b/tests/phpunit/WebTest/resources/import/ImportContribsExtID.csv @@ -1 +1 @@ -External ID,Contribution Type,Amount,Date,Paid By,Source,Transaction ID,Fee Amount,Non-deductible N101,Campaign Contribution,125,20051011,Check,Oct 2005 Mailer 1,check #1066,,125 N102,Donation,50,20050921,Credit Card,Online: Save the Penguins,P20901X9,1.75, N103,Campaign Contribution,25,20051029,Check,Oct 2005 Mailer 1,Acct 2099002 check #2098,,25 N105,Campaign Contribution,50,20051011,Cash,Oct 2005 Mailer 1,,,50 N110,Campaign Contribution,500,20051015,Check,Oct 2005 Mailer 1,10909131 #09022,,500 \ No newline at end of file +External ID,Contribution Type,Amount,Date,Payment Method,Source,Transaction ID,Fee Amount,Non-deductible N101,Campaign Contribution,125,20051011,Check,Oct 2005 Mailer 1,check #1066,,125 N102,Donation,50,20050921,Credit Card,Online: Save the Penguins,P20901X9,1.75, N103,Campaign Contribution,25,20051029,Check,Oct 2005 Mailer 1,Acct 2099002 check #2098,,25 N105,Campaign Contribution,50,20051011,Cash,Oct 2005 Mailer 1,,,50 N110,Campaign Contribution,500,20051015,Check,Oct 2005 Mailer 1,10909131 #09022,,500 \ No newline at end of file diff --git a/tests/phpunit/WebTest/resources/import/ImportContribs_custom.csv b/tests/phpunit/WebTest/resources/import/ImportContribs_custom.csv index 783b18b42e..d13b5f3215 100644 --- a/tests/phpunit/WebTest/resources/import/ImportContribs_custom.csv +++ b/tests/phpunit/WebTest/resources/import/ImportContribs_custom.csv @@ -1 +1 @@ -Contact ID,Contribution Type,Amount,Date,Paid By,Source,Transaction ID,Fee Amount,Non-deductible,Region-Alpha,Region-Int,External ID 103,Campaign Contribution,33,20070111,Check,Mar 2007 Mailer 1,check #1066,,125,East,1,N101 104,Donation,33,20070521,Credit Card,Online: Save the Penguins,P20901X9,1.75,,East Region,East Region,N110 105,Campaign Contribution,33,20070129,Check,Mar 2007 Mailer 1,Acct 2099002 check #2098,,25,West,2,N102 105,Campaign Contribution,33,20070411,Cash,Mar 2007 Mailer 1,,,50,West Region,West Region,N105 107,Donation,33,20070315,Check,Mar 2007 Mailer 1,10909131 #09022,,500,Foo,3,N105 \ No newline at end of file +Contact ID,Contribution Type,Amount,Date,Payment Method,Source,Transaction ID,Fee Amount,Non-deductible,Region-Alpha,Region-Int,External ID 103,Campaign Contribution,33,20070111,Check,Mar 2007 Mailer 1,check #1066,,125,East,1,N101 104,Donation,33,20070521,Credit Card,Online: Save the Penguins,P20901X9,1.75,,East Region,East Region,N110 105,Campaign Contribution,33,20070129,Check,Mar 2007 Mailer 1,Acct 2099002 check #2098,,25,West,2,N102 105,Campaign Contribution,33,20070411,Cash,Mar 2007 Mailer 1,,,50,West Region,West Region,N105 107,Donation,33,20070315,Check,Mar 2007 Mailer 1,10909131 #09022,,500,Foo,3,N105 \ No newline at end of file diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl index d8791c7051..1606e20689 100644 --- a/xml/templates/civicrm_data.tpl +++ b/xml/templates/civicrm_data.tpl @@ -1479,7 +1479,7 @@ INSERT INTO civicrm_uf_field ( 10, 'contribution_status_id', 1, 1, 3, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Status{/ts}', 'Contribution', NULL, NULL ), ( 10, 'receive_date', 1, 1, 4, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Received{/ts}', 'Contribution', NULL, NULL ), ( 10, 'contribution_source', 0, 0, 5, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Source{/ts}', 'Contribution', NULL, NULL ), - ( 10, 'payment_instrument', 0, 0, 6, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Paid By{/ts}', 'Contribution', NULL, NULL ), + ( 10, 'payment_instrument', 0, 0, 6, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Payment Method{/ts}', 'Contribution', NULL, NULL ), ( 10, 'check_number', 0, 0, 7, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Check Number{/ts}', 'Contribution', NULL, NULL ), ( 10, 'send_receipt', 0, 0, 8, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Send Receipt{/ts}', 'Contribution', NULL, NULL ), ( 10, 'invoice_id', 0, 0, 9, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Invoice ID{/ts}', 'Contribution', NULL, NULL ), @@ -1494,7 +1494,7 @@ INSERT INTO civicrm_uf_field ( 11, 'financial_type', 0, 1, 7, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Financial Type{/ts}', 'Membership', NULL, NULL ), ( 11, 'total_amount', 0, 1, 8, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Amount{/ts}', 'Membership', NULL, NULL ), ( 11, 'receive_date', 1, 1, 9, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Received{/ts}', 'Membership', NULL, NULL ), - ( 11, 'payment_instrument', 0, 0, 10, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Paid By{/ts}', 'Membership', NULL, NULL ), + ( 11, 'payment_instrument', 0, 0, 10, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Payment Method{/ts}', 'Membership', NULL, NULL ), ( 11, 'check_number', 0, 0, 11, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Check Number{/ts}', 'Membership', NULL, NULL ), ( 11, 'contribution_status_id', 1, 1, 12, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Payment Status{/ts}', 'Membership', NULL, NULL ), ( 11, 'soft_credit', 0, 0, 13, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Soft Credit{/ts}', 'Membership', NULL, NULL ), -- 2.25.1