eileen [Wed, 19 Apr 2017 21:46:08 +0000 (09:46 +1200)]
CRM-20264 make pan_truncation save on event form.
note that this PR should be testable & mergeable as making 'no change' without the changes to Core_Payment_Manual as it is primarily code consolidation
eileen [Wed, 19 Apr 2017 07:41:22 +0000 (19:41 +1200)]
Fully remove deprecated Constants
Pradeep Nayak [Wed, 19 Apr 2017 07:03:30 +0000 (19:03 +1200)]
CRM-20392 enable remaining unit tests added by Pradeep
I did alter the fix side on this a little more - notably to use the shared
functions beginPostProcess and assignPaymentRelatedVariables so this will require
independent review
eileen [Thu, 13 Apr 2017 09:43:03 +0000 (21:43 +1200)]
CRM-20264, Added Card type and Pan Truncation form fields on Payment form
I deliberately excluded card_type because I think we need to review the appropriateness of
the field first. My issue is that the wrangling wound up really wierd & it was apparent the issue
is that card_type is 'Visa' whereas card_type_id is 1 - we should either rename the field
or store the word.
Eileen McNaughton [Wed, 19 Apr 2017 06:29:45 +0000 (18:29 +1200)]
Merge pull request #10187 from eileenmcnaughton/prad
CRM-20392 add unit test and fix for incorrect total used in line item…
Eileen McNaughton [Wed, 19 Apr 2017 05:04:02 +0000 (17:04 +1200)]
Merge pull request #10186 from eileenmcnaughton/mandatory_created_id
CRM-20316 the mailing should still create without created_id (not man…
Pradeep Nayak [Wed, 12 Apr 2017 11:32:42 +0000 (23:32 +1200)]
CRM-20392 add unit test and fix for incorrect total used in line item creation code.
Eileen's note - this is code done by Pradeep that I am reviewing - I am committing
and merging the portion I have reviewed so far. This fixes a bug replicable in
the test Pradeep wrote, and some minor obvious cleanups such as removing unused parameters.
I've commented out some tests to complete this portion & there is still code of Pradeeps
not yet reviewed.
eileen [Tue, 18 Apr 2017 23:00:06 +0000 (11:00 +1200)]
CRM-20316 the mailing should still create without created_id (not mandatory).
eileen [Tue, 18 Apr 2017 23:00:06 +0000 (11:00 +1200)]
CRM-20316 the mailing should still create without created_id (not mandatory).
Eileen McNaughton [Tue, 18 Apr 2017 23:24:04 +0000 (11:24 +1200)]
Merge pull request #10185 from eileenmcnaughton/master
[NFC] Fix invalid php in test-generated example
eileen [Tue, 18 Apr 2017 22:32:22 +0000 (10:32 +1200)]
Fix invalid php in test-generated example
Eileen McNaughton [Tue, 18 Apr 2017 22:08:48 +0000 (10:08 +1200)]
Merge pull request #10171 from seamuslee001/CRM-20427
CRM-20427 Fix issue with the regex in I18n query rewriting and add tests
Seamus Lee [Tue, 18 Apr 2017 21:21:16 +0000 (07:21 +1000)]
CRM-20427 Skip tests that are currently failing as edge cases and not blockers to current issue
Eileen McNaughton [Tue, 18 Apr 2017 21:19:19 +0000 (09:19 +1200)]
Merge pull request #10184 from colemanw/CRM-17711
CRM-17711 - Remove "-unstable" from backdrop filename
Coleman Watts [Tue, 18 Apr 2017 20:20:57 +0000 (16:20 -0400)]
CRM-17711 - Remove "-unstable" from backdrop filename
colemanw [Tue, 18 Apr 2017 14:55:19 +0000 (10:55 -0400)]
Merge pull request #10175 from TobiasLounsbury/CRM-20438-fix-panels
Added object type selector to panel rule to prevent broad disabling o…
Eileen McNaughton [Tue, 18 Apr 2017 10:12:04 +0000 (22:12 +1200)]
Merge pull request #10179 from yashodha/CRM-20417
CRM-20417 - translate strings
Eileen McNaughton [Tue, 18 Apr 2017 09:29:16 +0000 (21:29 +1200)]
Merge pull request #10178 from JMAConsulting/CRM-20439
CRM-20439: Rename card_type to card_type_id of civicrm_financial_trxn table (IIDA-126)
Eileen McNaughton [Tue, 18 Apr 2017 09:28:39 +0000 (21:28 +1200)]
Merge pull request #10155 from totten/master-pdf-save2
CRM-20420 - Add option to save generated PDF/doc files
yashodha [Tue, 18 Apr 2017 08:06:00 +0000 (13:36 +0530)]
CRM-20417 - translate strings
deb.monish [Tue, 18 Apr 2017 07:28:33 +0000 (12:58 +0530)]
Additional fixes in report and Search form
deb.monish [Tue, 18 Apr 2017 06:39:46 +0000 (12:09 +0530)]
Rename card_type to card_type_id of civicrm_financial_trxn table (IIDA-126)
Eileen McNaughton [Tue, 18 Apr 2017 01:37:40 +0000 (13:37 +1200)]
Merge pull request #10177 from eileenmcnaughton/master
Fix visibility typo
eileen [Tue, 18 Apr 2017 01:34:20 +0000 (13:34 +1200)]
Fix visibility typo
Eileen McNaughton [Mon, 17 Apr 2017 21:43:52 +0000 (09:43 +1200)]
Merge pull request #10174 from civicrm/colemanw-contributing
Document PR scope & size
Seamus Lee [Mon, 17 Apr 2017 21:42:32 +0000 (07:42 +1000)]
Minor alter to regex
Seamus Lee [Mon, 17 Apr 2017 21:28:43 +0000 (07:28 +1000)]
CRM-20427 add more tests in
Tobias Lounsbury [Mon, 17 Apr 2017 20:16:12 +0000 (13:16 -0700)]
Added object type selector to panel rule to prevent broad disabling of all objects with class panel on civicrm pages.
colemanw [Mon, 17 Apr 2017 18:50:01 +0000 (14:50 -0400)]
Update CONTRIBUTING.md
Seamus Lee [Sun, 16 Apr 2017 23:52:39 +0000 (09:52 +1000)]
CRM-20427 Fix regex issue with I18n query rewrite
Seamus Lee [Sun, 16 Apr 2017 23:29:59 +0000 (09:29 +1000)]
Add tests of I18n rewiteQuery to test regex
Eileen McNaughton [Sun, 16 Apr 2017 23:18:13 +0000 (11:18 +1200)]
Merge pull request #10109 from eileenmcnaughton/ayd
CRM-20312 index reconciliation
Coleman Watts [Sun, 16 Apr 2017 19:44:07 +0000 (15:44 -0400)]
CRM-20312 - Add a few more action buttons to system status screen
Coleman Watts [Sun, 16 Apr 2017 16:41:33 +0000 (12:41 -0400)]
CRM-20312 - Perform actions from within system status screen
eileen [Sun, 16 Apr 2017 04:55:06 +0000 (16:55 +1200)]
CRM-20312 add a little more detail as to how to update indexes
Aidan Saunders [Fri, 14 Oct 2016 21:20:14 +0000 (22:20 +0100)]
CRM-20312 add api wrapper for updating indexes
Monish Deb [Sun, 16 Apr 2017 17:22:37 +0000 (22:52 +0530)]
Merge pull request #10170 from seamuslee001/CRM-20436
CRM-20436 Make method updateKenyanProvinces Static
Seamus Lee [Sun, 16 Apr 2017 09:49:41 +0000 (19:49 +1000)]
CRM-20436 Make method updateKenyanProvinces Static
Eileen McNaughton [Sun, 16 Apr 2017 05:32:02 +0000 (17:32 +1200)]
Merge pull request #10169 from seamuslee001/new_indexes
CRM-20313,CRM-19357,CRM-20204,CRM-19383
Joe Murray [Tue, 21 Mar 2017 20:38:00 +0000 (16:38 -0400)]
CRM-20313,CRM-19357: Add index to civicrm_activity.status_id and unique index to civicrm_entity_financial_account table
Seamus Lee [Sun, 16 Apr 2017 04:10:07 +0000 (14:10 +1000)]
CRM-20204,CRM-19383 Add in Indexes to civicrm_activity.activity_date_time and civicrm_event_queue.hash
Eileen McNaughton [Sun, 16 Apr 2017 00:36:17 +0000 (12:36 +1200)]
Merge pull request #10166 from aydun/CRM-19464-upgrade
CRM-19464 sql upgrade
Eileen McNaughton [Sun, 16 Apr 2017 00:35:54 +0000 (12:35 +1200)]
Merge pull request #10163 from JohnFF/bugfix/fix_static_warning
Fixed static call of non static method.
Eileen McNaughton [Sat, 15 Apr 2017 23:59:23 +0000 (11:59 +1200)]
Merge pull request #10150 from eileenmcnaughton/friend
CRM-20328 remove call to duplicated code sequence.
Eileen McNaughton [Sat, 15 Apr 2017 21:46:03 +0000 (09:46 +1200)]
Merge pull request #9857 from aydun/CRM-19464
CRM-19464 Make 'Supplemental Address 3' usable
Aidan Saunders [Sat, 15 Apr 2017 11:42:59 +0000 (12:42 +0100)]
Localize description
Tim Otten [Fri, 14 Apr 2017 21:30:24 +0000 (14:30 -0700)]
Merge pull request #10160 from JohnFF/bugfix/silent_sql_file_error
Make sourceSQLFile throw an error when it can't find a file.
colemanw [Fri, 14 Apr 2017 21:04:08 +0000 (17:04 -0400)]
Merge pull request #10162 from yashodha/CRM-20429
CRM-20429 - Deleting an activity with target contacts > 50 results in…
Aidan Saunders [Fri, 14 Apr 2017 20:49:32 +0000 (21:49 +0100)]
CRM-19464 sql upgrade
Aidan Saunders [Fri, 17 Feb 2017 23:27:32 +0000 (23:27 +0000)]
CRM-19464 Enable use of 'Supplemental Address 3'
In some situations, the address format is too limited. The 'Supplemental Address 3'
already exists in the schema but was not exposed to the GUI.
This touches many files but the changes are fairly simple. Wherever 'Supplemental Address 2'
existed, there is now a 'Supplemental Address 3' as well.
John Kirk [Fri, 14 Apr 2017 06:27:29 +0000 (06:27 +0000)]
Fixed static call of non static method. Assume the method was meant to be static as there's nothing in there requiring it to be dynamic.
yashodha [Fri, 14 Apr 2017 06:17:59 +0000 (11:47 +0530)]
CRM-20429 - Deleting an activity with target contacts > 50 results in error
Eileen McNaughton [Fri, 14 Apr 2017 04:55:26 +0000 (16:55 +1200)]
Merge pull request #10148 from yashodha/CRM-20417
CRM-20417 - translate strings
John Kirk [Thu, 13 Apr 2017 22:11:11 +0000 (22:11 +0000)]
Make sourceSQLFile throw an error when it can't find a file - previously it just failed silently.
colemanw [Fri, 14 Apr 2017 01:23:19 +0000 (21:23 -0400)]
Merge pull request #10112 from JMAConsulting/CRM-20384
CRM-20384, Added Contribution ID column and Filter to Book Keeping report
Tim Otten [Thu, 13 Apr 2017 21:07:00 +0000 (14:07 -0700)]
CRM-20420 - PDFLetterCommon::createActivities() - Combine calls
Combine the calls to CRM_Activity_BAO_Activity::create() and
CRM_Activity_BAO_ActivityContact::create() into one call.
Remove unnecessary `$activityContacts`.
Pradeep Nayak [Wed, 12 Apr 2017 20:38:59 +0000 (02:08 +0530)]
CRM-20384, added function to get Organization Name associated with Financial Account.
----------------------------------------
* CRM-20384: Bookkeeping report add contrib ID, filter by financial account owner (IIDA-85)
https://issues.civicrm.org/jira/browse/CRM-20384
Pradeep Nayak [Wed, 5 Apr 2017 11:12:30 +0000 (16:42 +0530)]
CRM-20384, Added Contribution ID column and Filter
Added option to display and Filter by Financial Account Owner
----------------------------------------
* CRM-20384: bookkeeping transaction report
https://issues.civicrm.org/jira/browse/CRM-20384
Tim Otten [Thu, 13 Apr 2017 18:19:26 +0000 (11:19 -0700)]
CRM-20420 - Extract utility class, CRM_Utils_ConsoleTee
Tim Otten [Thu, 13 Apr 2017 17:20:31 +0000 (10:20 -0700)]
CRM-20420 - PDFLetterCommon::postProcess - Improve precondition check
It's not valid to apply the policy `combined-attached` unless you have
exactly 1 activity. The previous code would silently degrade if the
precondition wasn't met. The revision makes the failure clear.
Tim Otten [Thu, 13 Apr 2017 16:49:25 +0000 (09:49 -0700)]
CRM-20420 - Update sundry comments/docblocks
Tim Otten [Thu, 13 Apr 2017 16:41:34 +0000 (09:41 -0700)]
CRM-20420 - PDFLetterCommon::getMimeType() - Fix typo
Tim Otten [Thu, 13 Apr 2017 16:31:36 +0000 (09:31 -0700)]
CRM-20420 - Core.settings.php - Fix copy/pasted version#
The setting was written by copying and editing a similar one, but one of the
fields (`add => 4.3`) was stale.
Tim Otten [Thu, 13 Apr 2017 05:07:37 +0000 (22:07 -0700)]
CRM-20420 - PDFLetterCommon - Record attachments (in mode "combined-attached")
If the setting `recordGeneratedLetters` is `combined-attached`, then we
should capture the content of the generated file and save it to an
attachment.
Note: There are several different ways generating files (eg HTML=>PDF,
HTML=>docx/ODT, or docx/ODT template file). Ideally, these would support
common set of options for directing output (to a file, string, or console).
In fact, some do, and all the underlying libraries do... but the
middle-logic only handles the console consistently. We use output buffering
(ob_start()) to capture the content and save it to a file.
Tim Otten [Thu, 13 Apr 2017 03:25:22 +0000 (20:25 -0700)]
CRM-20420 - CRM_Utils_PDF_Document::printDocuments - Normalize $fileName
Normalize semantics of `$fileName` to align with
`CRM_Utils_PDF_Document::html2doc` and `CRM_Utils_PDF_Utils::html2pdf`.
Eileen McNaughton [Thu, 13 Apr 2017 04:08:39 +0000 (16:08 +1200)]
Merge pull request #10144 from eileenmcnaughton/iida8
CRM-20413 fix to setting wrong payment_instrument_id, by passing resp…
Eileen McNaughton [Thu, 13 Apr 2017 03:08:47 +0000 (15:08 +1200)]
Merge pull request #10127 from WeMoveEU/CRM-20389
CRM-20389 ignore mailing_type when cloning
Tim Otten [Thu, 13 Apr 2017 02:06:07 +0000 (19:06 -0700)]
CRM-20420 - Add docblocks
eileen [Tue, 11 Apr 2017 14:43:08 +0000 (02:43 +1200)]
CRM-20413 fix to setting wrong payment_instrument_id, by passing responsibility to the processor.
This also reflects work towards allowing payment_instrument specific fields on the payment form - ie. check, credit_card_type, pan_truncation.
This idea is to finish the code allowing pay-later to be the manual payment processor indexed with a 0 on all payment forms, and have the
form render with appropriate fields. Note that I got this working on multiple forms, this commit reflects the smallest piece I could
break off that is complete within itself, and resolves an issue
I tested that it was still possible to enter checks on the offline contribution as well as membership & additional payment forms, and the
check number still shows up.
I also tested front end contribution credit card & pay later & front end event forms
Edsel Roque Lopez [Wed, 12 Apr 2017 21:36:40 +0000 (03:06 +0530)]
CRM-20359 Extended the use of contribution tokens to include custom fields using API (#10082)
* CRM-20359 Extended the use of contribution tokens to include custom fields using API
----------------------------------------
* CRM-20359: Support contribution.custom_nn tokens for Thank You letters - print or email
https://issues.civicrm.org/jira/browse/CRM-20359
* extended testBuildContributionArray unit test
* Fix missing comma
Tim Otten [Wed, 12 Apr 2017 21:25:11 +0000 (14:25 -0700)]
CRM-20420 - Display `recordGeneratedLetters` setting in GUI
Tim Otten [Wed, 12 Apr 2017 07:11:42 +0000 (00:11 -0700)]
CRM-20420 - Generate combined or separated activities, per recordGeneratedLetters
When a user uses "Print/Merge Document" to generate a PDF or Word doc,
they may designate multiple contacts to include in the PDF/Doc. By
setting `recordGeneratedLetters`, they can specify whether to:
* Create one activity for each contact. (This is the traditional behavior,
but when you retain the fully-generated PDF documents, it wouldn't
be a good idea to copy the PDF to all those activities.)
* Create a single activity associated with all the contacts.
Tim Otten [Wed, 12 Apr 2017 05:39:50 +0000 (22:39 -0700)]
CRM-20420 - Define setting "recordGeneratedLetters"
Tim Otten [Wed, 12 Apr 2017 05:42:22 +0000 (22:42 -0700)]
CRM-20420 - PDFLetterCommon::createActivities() - Simplify. Address comment.
The comment asks why the code appears to use of `$contactIds` and
`$form->contactIds` interchangeably. If you grep for calls to
`createActivities()`, all 3-ish callpaths do set `$contactIds` based on
`$form->contactIds` -- so they are the same.
```
// Look for calls to createActivities()
$ grep -r ::createActivities CRM/ Civi/ api/
CRM/Contact/Form/Task/PDFLetterCommon.php: self::createActivities($form, $html_message, $form->_contactIds);
CRM/Member/Form/Task/PDFLetterCommon.php: self::createActivities($form, $html_message, $contactIDs);
CRM/Contribute/Form/Task/PDFLetterCommon.php: self::createActivities($form, $html_message, $form->_contactIds);
// Look for calls to createActivities via CRM/Member/Form/Task/PDFLetterCommon
$ rgrep -r postProcessMembers\( CRM/ Civi/ api/
CRM/Member/Form/Task/PDFLetter.php: CRM_Member_Form_Task_PDFLetterCommon::postProcessMembers(
CRM/Member/Form/Task/PDFLetterCommon.php: public static function postProcessMembers(&$form, $membershipIDs, $skipOnHold, $skipDeceased, $contactIDs) {
```
Monish Deb [Wed, 12 Apr 2017 12:22:19 +0000 (17:52 +0530)]
Merge pull request #10092 from jitendrapurohit/CRM-20339
CRM-20339: Fix custom data edit on Relationship
eileen [Tue, 28 Mar 2017 21:40:15 +0000 (10:40 +1300)]
CRM-20328 remove call to duplicated code sequence.
On looking is actually getting an ID so I renamed it
Eileen McNaughton [Wed, 12 Apr 2017 10:10:22 +0000 (22:10 +1200)]
Merge pull request #10143 from eileenmcnaughton/iida7
Towards CRM-20392 (IIDA-108) extract submit function
yashodha [Wed, 12 Apr 2017 09:15:29 +0000 (14:45 +0530)]
CRM-20417 - translate strings
deb.monish [Wed, 12 Apr 2017 09:15:26 +0000 (14:45 +0530)]
minor fix
eileen [Tue, 11 Apr 2017 11:43:18 +0000 (23:43 +1200)]
Remove e-notice causing declaration.
Since this is a deprecated name which doesn't work I have just removed it
eileen [Tue, 11 Apr 2017 11:53:16 +0000 (23:53 +1200)]
Towards CRM-20392 form cleanup, shared setting of ->mode
Pradeep Nayak [Tue, 11 Apr 2017 11:14:02 +0000 (23:14 +1200)]
Towards CRM-20392 (IIDA-108) extract submit function
Towards CRM-20392 enotice fixes
Eileen McNaughton [Wed, 12 Apr 2017 08:48:28 +0000 (20:48 +1200)]
Merge pull request #10130 from JMAConsulting/codeCleanup
Used Api to get financial account for an entity defined in civicrm_en…
Monish Deb [Wed, 12 Apr 2017 08:43:13 +0000 (14:13 +0530)]
Merge pull request #10081 from jitendrapurohit/CRM-20361
CRM-20361: Populate tokens when Scheduled Reminders are set to Record Activity for Automated Email
Pradeep Nayak [Fri, 7 Apr 2017 21:25:26 +0000 (02:55 +0530)]
Used Api to get financial account for an entity defined in civicrm_entity_financial_account table
Eileen McNaughton [Wed, 12 Apr 2017 02:42:22 +0000 (14:42 +1200)]
Merge pull request #10147 from KarinG/CRM-20393-dmaster
CRM-20393 - fix for check if the user already submitted transaction
KarinG [Wed, 12 Apr 2017 01:06:32 +0000 (19:06 -0600)]
No need to truncate x_invoice_num.
Eileen McNaughton [Wed, 12 Apr 2017 00:13:09 +0000 (12:13 +1200)]
Merge pull request #10129 from JMAConsulting/CRM-20392
CRM-20392, Code cleanup
Eileen McNaughton [Tue, 11 Apr 2017 23:27:03 +0000 (11:27 +1200)]
Merge pull request #10135 from seamuslee001/CRM-20410
CRM-20410 Reformat CRM_SMS_BAO_Provider to use standard create function style rather than the split
Eileen McNaughton [Tue, 11 Apr 2017 22:36:35 +0000 (10:36 +1200)]
Merge pull request #10145 from eileenmcnaughton/test-fail
Fix test regression by correctly setting timestamp in test method
eileen [Tue, 11 Apr 2017 22:31:01 +0000 (10:31 +1200)]
Fix test regression by correctly setting timestamp in test method
Seamus Lee [Tue, 11 Apr 2017 21:36:00 +0000 (07:36 +1000)]
Try replacing static with DAO
Eileen McNaughton [Tue, 11 Apr 2017 20:41:58 +0000 (08:41 +1200)]
Merge pull request #10139 from JMAConsulting/CRM-20391
CRM-20391 Added pan trucation to search
Eileen McNaughton [Tue, 11 Apr 2017 20:33:06 +0000 (08:33 +1200)]
Merge pull request #10115 from jmcclelland/CRM-20388
CRM-20388 - ensure connection errors are properly reported to user.
Eileen McNaughton [Tue, 11 Apr 2017 20:10:16 +0000 (08:10 +1200)]
Merge pull request #9848 from JMAConsulting/CRM-8526
CRM-8526 [ready for core team review] Added support for contribution tokens in emails sent via search results (Find contribution results and Advanced search when results are listed as contributions)
colemanw [Tue, 11 Apr 2017 15:31:16 +0000 (11:31 -0400)]
Merge pull request #10142 from JMAConsulting/IIDA-58
CRM-20022 Minor fix to change group by label
Edsel [Thu, 16 Feb 2017 10:20:41 +0000 (15:50 +0530)]
CRM-8526 Added contribution tokens to list
----------------------------------------
* CRM-8526: Support [contribution.custom_nn] tokens in templates
https://issues.civicrm.org/jira/browse/CRM-8526
CRM-8526 Added support for contribution tokens in find contributions search results
Edsel [Tue, 11 Apr 2017 12:58:35 +0000 (18:28 +0530)]
CRM-20022 Minor fix to change group by label
----------------------------------------
* CRM-20022: Add Batch Title to Columns, Grouping tabs on Contribution Summary report
https://issues.civicrm.org/jira/browse/CRM-20022
Pradeep Nayak [Fri, 7 Apr 2017 20:16:47 +0000 (01:46 +0530)]
CRM-20392, Code cleanup
----------------------------------------
* CRM-20392: Credit card payment not recorded when contribution is partially paid
https://issues.civicrm.org/jira/browse/CRM-20392
Edsel [Tue, 11 Apr 2017 08:47:42 +0000 (14:17 +0530)]
CRM-20391 Added card number to search
----------------------------------------
* CRM-20391: Add card number field on search form
https://issues.civicrm.org/jira/browse/CRM-20391