Eileen McNaughton [Sat, 18 Mar 2017 03:20:18 +0000 (16:20 +1300)]
Merge pull request #9971 from eileenmcnaughton/delayed_recur
CRM-20252 Improve text when processing possibly-delayed-payments
Eileen McNaughton [Sat, 18 Mar 2017 02:37:52 +0000 (15:37 +1300)]
Merge pull request #10013 from seanmadsen/GenCodeChecksum
New GenCodeChecksum for auto-generated DAO files
Eileen McNaughton [Sat, 18 Mar 2017 01:49:54 +0000 (14:49 +1300)]
Merge pull request #9751 from eileenmcnaughton/report
Minor comment fixes & function extraction.
eileen [Mon, 30 Jan 2017 07:55:12 +0000 (20:55 +1300)]
Fix mis-cased class ref
eileen [Sun, 29 Jan 2017 21:53:06 +0000 (10:53 +1300)]
Comment fixes
eileen [Mon, 30 Jan 2017 07:53:50 +0000 (20:53 +1300)]
Extract report functions for readability & overidabiity
Sean Madsen [Fri, 17 Mar 2017 22:06:30 +0000 (16:06 -0600)]
New GenCodeChecksum for auto-generated DAO files
@totten recommended that I submit this PR
http://civicrm.stackexchange.com/questions/17722/why-do-i-have-gencodechecksum-uncommitted-changes-after-a-fresh-civibuild-create/17724#17724
eileen [Mon, 13 Mar 2017 08:40:33 +0000 (21:40 +1300)]
CRM-20252 Improve text when processing possibly-delayed-payments
Eileen McNaughton [Fri, 17 Mar 2017 21:13:55 +0000 (10:13 +1300)]
Merge pull request #10011 from eileenmcnaughton/test
Fix test to use name that will not cause intermittant errors
Eileen McNaughton [Fri, 17 Mar 2017 20:25:10 +0000 (09:25 +1300)]
Merge pull request #9999 from JMAConsulting/CRM-20286
CRM-20286, added card type field on contribution search form
eileen [Fri, 17 Mar 2017 20:23:27 +0000 (09:23 +1300)]
Fix test to use name that will not cause intermittant errors
Eileen McNaughton [Fri, 17 Mar 2017 20:16:23 +0000 (09:16 +1300)]
Merge pull request #10008 from civicrm/JoeMurray-patch-1
Correct description of order api
Joe Murray [Fri, 17 Mar 2017 18:02:38 +0000 (14:02 -0400)]
Correct description
There are no order records as there is no order table.
Pradeep Nayak [Wed, 15 Mar 2017 12:30:05 +0000 (18:00 +0530)]
CRM-20286, added card type form fields
----------------------------------------
* CRM-20286: Add card type field on search form
https://issues.civicrm.org/jira/browse/CRM-20286
CRM-20286, code cleanup and defined $_wheretables and $_tables correctly for batch and is_payment fields
----------------------------------------
* CRM-20286: Add card type field on search form
https://issues.civicrm.org/jira/browse/CRM-20286
CRM-20286, added where clause for card type
----------------------------------------
* CRM-20286: Add card type field on search form
https://issues.civicrm.org/jira/browse/CRM-20286
CRM-20286, added unit test
----------------------------------------
* CRM-20286: Add card type field on search form
https://issues.civicrm.org/jira/browse/CRM-20286
Use metadata based method to add field to form
CRM-20286 Minor changes
----------------------------------------
* CRM-20286: Add card type field on search form
https://issues.civicrm.org/jira/browse/CRM-20286
Eileen McNaughton [Fri, 17 Mar 2017 07:20:23 +0000 (20:20 +1300)]
Merge pull request #9995 from JMAConsulting/CRM-20282
CRM-20282 Added credit card type field to bookkeeping report
Yashodha Chaku [Fri, 17 Mar 2017 07:12:03 +0000 (12:42 +0530)]
Merge pull request #10004 from eileenmcnaughton/selector
CRM-20208 rename 'In Selector' to 'Results Column' on Profile admin s…
Eileen McNaughton [Fri, 17 Mar 2017 06:25:51 +0000 (19:25 +1300)]
Merge pull request #10002 from colemanw/News
News dashlet - don't show count when it's zero
eileen [Fri, 17 Mar 2017 03:10:47 +0000 (16:10 +1300)]
CRM-20208 rename 'In Selector' to 'Results Column' on Profile admin screens.
THis is based on a recommendatation in the JIRA suggesting this would be less confusing & inline with the documentation
Coleman Watts [Fri, 17 Mar 2017 02:49:57 +0000 (22:49 -0400)]
News dashlet - don't show count when it's zero
Eileen McNaughton [Fri, 17 Mar 2017 02:26:55 +0000 (15:26 +1300)]
Merge pull request #9979 from mattwire/disable_payment_processor2
CRM-19900: Disable/enable both processors directly in BAO create function
Eileen McNaughton [Fri, 17 Mar 2017 01:40:26 +0000 (14:40 +1300)]
Merge pull request #9421 from eileenmcnaughton/recur_icon
CRM-19674 Add ability to see at a glance if a contribution is part of…
Eileen McNaughton [Fri, 17 Mar 2017 00:44:00 +0000 (13:44 +1300)]
Merge pull request #10000 from eileenmcnaughton/agile
CRM-19710 - Preserve is_email_receipt parameter through to email sent
Eileen McNaughton [Thu, 16 Mar 2017 19:29:22 +0000 (08:29 +1300)]
Merge pull request #9986 from JMAConsulting/CRM-20272
CRM-20272 Added credit card type field for contribution summary report
Tim Otten [Thu, 16 Mar 2017 18:49:46 +0000 (11:49 -0700)]
Merge pull request #9980 from mickadoo/CRM-20254-cache-busting-custom-css
CRM-20254: add cache buster string for custom CSS
colemanw [Thu, 16 Mar 2017 14:02:52 +0000 (10:02 -0400)]
Merge pull request #9802 from eileenmcnaughton/lower
CRM-19980, CRM-19811 - Fix slow queries due to LOWER on contact name…
Edsel [Wed, 15 Feb 2017 11:19:22 +0000 (16:49 +0530)]
CRM-20282 Added credit card type field to bookkeeping report
----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
https://issues.civicrm.org/jira/browse/CRM-19997
----------------------------------------
* CRM-20282:
https://issues.civicrm.org/jira/browse/CRM-20282
CRM-20282 Fixed report to read from card type rather than credit card type
----------------------------------------
* CRM-20282: Add credit card type field for Bookkeeping report
https://issues.civicrm.org/jira/browse/CRM-20282
Edsel [Thu, 16 Mar 2017 08:55:36 +0000 (14:25 +0530)]
CRM-20272 Removed line break
----------------------------------------
* CRM-20272: Add credit card type field for Contribution Summary Report
https://issues.civicrm.org/jira/browse/CRM-20272
Edsel [Thu, 16 Mar 2017 07:11:23 +0000 (12:41 +0530)]
CRM-20272 Generalised function to add labels
----------------------------------------
* CRM-20272: Add credit card type field for Contribution Summary Report
https://issues.civicrm.org/jira/browse/CRM-20272
CRM-20272 Generalised function to add labels
----------------------------------------
* CRM-20272: Add credit card type field for Contribution Summary Report
https://issues.civicrm.org/jira/browse/CRM-20272
eileenmcnaugton [Mon, 21 Nov 2016 08:17:43 +0000 (21:17 +1300)]
CRM-19674 Add ability to see at a glance if a contribution is part of a recurring series
Note this is a subset of https://github.com/civicrm/civicrm-core/pull/9421/commits/
c6ba3ef7253b4b27ac69f70d71b6a78d3475b635
It re-instates the display of the word recurring, but leaves out the extra column
for recurring & sortability based on that. This is mostly because I wanted to get the
PR resolved & merged & hence left out the stuff that did not
seem like I had a consensus on. However, I do think the loss
of sortability on recurring is a shame & hence kept a link to the
commit if anyone wants to revisit
Agileware Support [Thu, 16 Mar 2017 06:51:43 +0000 (19:51 +1300)]
CRM-19710 - Preserve is_email_receipt parameter through to email sent
Edsel [Fri, 10 Feb 2017 14:30:09 +0000 (20:00 +0530)]
CRM-20272 Added Credit Card Type field for Contribution Summary report
----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
https://issues.civicrm.org/jira/browse/CRM-19997
CRM-20272 Added credit card type field for contribution summary report
----------------------------------------
* CRM-20272: Add credit card type field for Contribution Summary Report
https://issues.civicrm.org/jira/browse/CRM-20272
CRM-20272 Fixed function to read from card type rather than credit card type
----------------------------------------
* CRM-20272: Add credit card type field for Contribution Summary Report
https://issues.civicrm.org/jira/browse/CRM-20272
CRM-20272 Fixed report to read from card type rather than credit card type
----------------------------------------
* CRM-20272: Add credit card type field for Contribution Summary Report
https://issues.civicrm.org/jira/browse/CRM-20272
CRM-20272 Removed entity financial trxn column in favour of hardcoded alias
----------------------------------------
* CRM-20272: Add credit card type field for Contribution Summary Report
https://issues.civicrm.org/jira/browse/CRM-20272
Eileen McNaughton [Thu, 16 Mar 2017 03:54:34 +0000 (16:54 +1300)]
Merge pull request #9602 from eileenmcnaughton/triggers
CRM-19051 improve respect for the offline trigger setting.
Eileen McNaughton [Wed, 15 Mar 2017 21:09:26 +0000 (10:09 +1300)]
Merge pull request #9998 from eileenmcnaughton/part_fee
CRM-19273 Fix in the usage of insertedLines and added test
Klaas Eikelboom [Tue, 3 Jan 2017 10:50:39 +0000 (05:50 -0500)]
CRM-19273 Fix in the usage of insertedLines and added test
Eileen McNaughton [Wed, 15 Mar 2017 11:08:15 +0000 (00:08 +1300)]
Merge pull request #9983 from JMAConsulting/CRM-19715-3
CRM-19715 (IIDA-96), removed settings related to close accounting period and mo…
mickadoo [Wed, 15 Mar 2017 09:39:53 +0000 (09:39 +0000)]
CRM-20254: code style changes
mickadoo [Wed, 15 Mar 2017 09:36:26 +0000 (09:36 +0000)]
CRM-20254: simplify adding cache code logic. remove useless test case
Pradeep Nayak [Wed, 15 Mar 2017 06:33:34 +0000 (12:03 +0530)]
CRM-19715, removed settings related to close accounting period and moved to an extension
----------------------------------------
* CRM-19715: Remove Close Accounting Period code
https://issues.civicrm.org/jira/browse/CRM-19715
Tim Otten [Wed, 15 Mar 2017 06:30:09 +0000 (23:30 -0700)]
Merge pull request #9982 from totten/master-zetamail
CRM-20270 - composer.lock - Fix multibyte warnings by updating ezcMail
Tim Otten [Tue, 14 Mar 2017 21:06:36 +0000 (14:06 -0700)]
CRM-20270 - composer.lock - Fix multibyte warnings by updating ezcMail
On many systems, the test suite outputs a long message which begins with:
```
PHP Warning: declare(encoding=...) ignored because Zend multibyte feature is turned off by settings in /path/to/sites/all/modules/civicrm/vendor/zetacomponents/mail/src/transports/variable/var_set.php on line 2
```
This patch addresses the warning by updating the version of ezcMail (aka `zetacomponents/mail`). See also:
* https://github.com/civicrm/zetacomponents-mail/pull/1
* http://civicrm.stackexchange.com/questions/16314/does-civicrm-have-a-recommended-setting-for-zend-multibyte
Eileen McNaughton [Tue, 14 Mar 2017 18:30:47 +0000 (07:30 +1300)]
Merge pull request #9940 from colemanw/CRM-20102
CRM-20102 - Case Activity api improvements
Coleman Watts [Tue, 14 Mar 2017 01:27:28 +0000 (21:27 -0400)]
CRM-20102 - make case_type_id required
Yashodha Chaku [Tue, 14 Mar 2017 14:55:54 +0000 (20:25 +0530)]
Merge pull request #9776 from jitendrapurohit/CRM-19741
CRM-19741: Price set and price set value label fields are inconsistan…
mickadoo [Tue, 14 Mar 2017 14:16:46 +0000 (14:16 +0000)]
CRM-20254: set cache buster code for tests
mickadoo [Tue, 14 Mar 2017 10:57:56 +0000 (10:57 +0000)]
CRM-20254: add cache buster string for custom CSS and improve query string generation (duplicated from original PR which was to the wrong branch)
Matthew Wire [Tue, 14 Mar 2017 09:58:39 +0000 (09:58 +0000)]
Coding style
Matthew Wire [Tue, 14 Mar 2017 09:54:42 +0000 (09:54 +0000)]
Disable/enable both processors directly in BAO create function
Eileen McNaughton [Tue, 14 Mar 2017 08:01:07 +0000 (21:01 +1300)]
Merge pull request #9978 from yashodha/CRM-20255
CRM-20255 - Add developer tabs to more reports
yashodha [Tue, 14 Mar 2017 05:44:45 +0000 (11:14 +0530)]
CRM-20255 - Add developer tabs to more reports
Tim Otten [Tue, 14 Mar 2017 05:09:16 +0000 (22:09 -0700)]
Merge pull request #9420 from eileenmcnaughton/settings
Settings
Coleman Watts [Mon, 13 Mar 2017 13:57:37 +0000 (09:57 -0400)]
Fix double-negative in function signature
Coleman Watts [Mon, 13 Mar 2017 01:59:37 +0000 (21:59 -0400)]
CRM-20102 - Tests
Coleman Watts [Wed, 8 Mar 2017 17:17:23 +0000 (12:17 -0500)]
More efficient loading of case type definition
Don't re-fetch info from the database if we already have it.
Coleman Watts [Wed, 8 Mar 2017 02:15:31 +0000 (21:15 -0500)]
CRM-20102 - Retrieve more case role info from api
Coleman Watts [Tue, 7 Mar 2017 03:49:00 +0000 (22:49 -0500)]
CRM-20102 - Return case_id from activity api
Coleman Watts [Mon, 6 Mar 2017 21:12:19 +0000 (16:12 -0500)]
CRM-20102 - Better filters for case contact_id field
Coleman Watts [Mon, 6 Mar 2017 21:02:46 +0000 (16:02 -0500)]
Use strict type checking in in_array
This php function has a bug where it incorrectly returns true if the first param is 0.
Eileen McNaughton [Tue, 14 Mar 2017 00:30:14 +0000 (13:30 +1300)]
Merge pull request #9966 from eileenmcnaughton/is_recur_template
CRM-20247 Add test & ensure $is_recur is assigned to the message_template.
Tim Otten [Mon, 13 Mar 2017 22:11:03 +0000 (15:11 -0700)]
Merge pull request #9910 from seamuslee001/CRM-19835
CRM-19835 Use host rather than server and put in port if supplied
Tim Otten [Mon, 13 Mar 2017 19:11:51 +0000 (12:11 -0700)]
CRM-19672 - Adapt TokenCompatSubscriber to new getDomain() signature
A recent commit for CRM-19672 changed the signature for `getDomain()`. It
now returns a regular object (not a reference), but this means that you
cannot pass the domain directly through to `replaceDomainTokens()`.
This manifested as a test error when running `flexmailer` on my local PHP
5.6/7.0 system.
Eileen McNaughton [Mon, 13 Mar 2017 09:07:11 +0000 (22:07 +1300)]
Merge pull request #9969 from totten/master-extbatch-cond
Civi\API\ExternalBatch - Improve test for variables_order/$_ENV
Yashodha Chaku [Mon, 13 Mar 2017 08:58:28 +0000 (14:28 +0530)]
Merge pull request #9965 from eileenmcnaughton/activity_report
CRM-20242 - Add developer Tab to Activity Detail report
Tim Otten [Mon, 13 Mar 2017 04:45:00 +0000 (21:45 -0700)]
Civi\API\ExternalBatch - Improve test for variables_order/$_ENV
The recent revision #9595 updated `ExternalBatch` to produce a more
informative error message. However, in the test environment used by
`flexmailer`, there was exactly 1 value in `$_ENV` (even if
`variables_order` was misconfigured).
This should make the test a bit harder to trip-up by affirmatively checking
for the most common environment variable.
Review note: In the known universe, the only direct references to
`ExternalBatch` are in `CiviUnitTestCase`, so this shouldn't impact any
runtime logic.
Eileen McNaughton [Mon, 13 Mar 2017 02:02:47 +0000 (15:02 +1300)]
Merge pull request #9967 from eileenmcnaughton/dummy
CRM-20248 correct hard coded payment processor type id for Dummy proc…
eileen [Sun, 12 Mar 2017 23:00:05 +0000 (12:00 +1300)]
CRM-20248 correct hard coded payment processor type id for Dummy processor
eileen [Sun, 12 Mar 2017 22:48:29 +0000 (11:48 +1300)]
CRM-20247 further removal of ignored is_recur parameter.
This variable was part of a legacy flow via the BaseIPN. Removing the variable is a good tidy up step
eileen [Sun, 12 Mar 2017 21:54:13 +0000 (10:54 +1300)]
CRM-20247 Add test & ensure $is_recur is assigned to the message_template.
eileen [Sun, 12 Mar 2017 21:03:06 +0000 (10:03 +1300)]
Remove deprecated function call from test
Eileen McNaughton [Sun, 12 Mar 2017 02:37:09 +0000 (15:37 +1300)]
Merge pull request #9836 from jmcclelland/CRM-20020
CRM-20020 - fix search with parent groups + other criteria
eileen [Sat, 11 Mar 2017 03:27:12 +0000 (16:27 +1300)]
CRM-20242 - Add developer Tab to Activity Detail report
colemanw [Fri, 10 Mar 2017 22:14:03 +0000 (17:14 -0500)]
Merge pull request #9936 from eileenmcnaughton/sig
CRM-20220 fix signature fields to be longtext
colemanw [Fri, 10 Mar 2017 21:01:35 +0000 (16:01 -0500)]
Update PaymentProcessor.php
colemanw [Fri, 10 Mar 2017 15:12:58 +0000 (10:12 -0500)]
Merge pull request #9963 from kainukempowerment/CRM-20239
CRM-20239 Extra tests for the Individual::format function
Klaas Eikelboom [Fri, 10 Mar 2017 13:15:53 +0000 (14:15 +0100)]
CRM-20239 Extra tests for the CRM_Contact_BAO_Individual::format function
Eileen McNaughton [Fri, 10 Mar 2017 07:46:50 +0000 (20:46 +1300)]
Merge pull request #9815 from WeMoveEU/CRM-19962
CRM-19962 - Wider name field for A/B mailings
Eileen McNaughton [Fri, 10 Mar 2017 07:12:03 +0000 (20:12 +1300)]
Merge pull request #9662 from JMAConsulting/CRM-19792
CRM-19792, fixed payment processor params to include email
Tim Otten [Fri, 10 Mar 2017 06:12:19 +0000 (22:12 -0800)]
Merge pull request #9948 from KarinG/CRM-19966
Fixes for CRM-19966 Unfair Double Taxation and net_amounts.
KarinG [Fri, 10 Mar 2017 03:43:58 +0000 (20:43 -0700)]
Added Test to Create Contribution -> then Edit it via BackOffice form - using default price_set.
eileen [Fri, 10 Mar 2017 03:23:17 +0000 (16:23 +1300)]
CRM-20220 fix signature fields to be longtext
colemanw [Fri, 10 Mar 2017 03:04:44 +0000 (22:04 -0500)]
Merge pull request #9961 from colemanw/Tweak
Tweak icon when expanding popup to fullscreen
Coleman Watts [Fri, 10 Mar 2017 02:47:57 +0000 (21:47 -0500)]
Tweak icon when expanding popup to fullscreen
Eileen McNaughton [Fri, 10 Mar 2017 00:40:26 +0000 (13:40 +1300)]
Merge pull request #9860 from JMAConsulting/CRM-20058
CRM-20058, added submit credit card payment link
Eileen McNaughton [Fri, 10 Mar 2017 00:38:20 +0000 (13:38 +1300)]
Merge pull request #9952 from JMAConsulting/CRM-20025
CRM-20025 [ready for review] Prevented query from fetching contacts without contributions
Tim Otten [Thu, 9 Mar 2017 23:36:35 +0000 (15:36 -0800)]
Merge pull request #9958 from seamuslee001/CRM-20023
CRM-20023 Add test showing passing in just state_province_id and coun…
Seamus Lee [Thu, 9 Mar 2017 22:40:37 +0000 (09:40 +1100)]
Use assertApproxEquals as per Tim's suggestion
Seamus Lee [Thu, 9 Mar 2017 21:17:36 +0000 (08:17 +1100)]
Fix tear down function
Seamus Lee [Thu, 9 Mar 2017 20:44:08 +0000 (07:44 +1100)]
CRM-20023 Add test showing passing in just state_province_id and country only geoloates based on country not state as well
Tim Otten [Thu, 9 Mar 2017 22:28:45 +0000 (14:28 -0800)]
Merge pull request #9959 from seamuslee001/logged_in_user_api_call
(NFC) Update API examples and add example of using user_contact_id as id fo…
Seamus Lee [Thu, 9 Mar 2017 21:40:56 +0000 (08:40 +1100)]
Update API examples and add example of using user_contact_id as id for current logged in user
Eileen McNaughton [Thu, 9 Mar 2017 21:09:13 +0000 (10:09 +1300)]
Merge pull request #9839 from fuzionnz/CRM-20023-geocode_state_province_id
CRM-20023: Do not require state_province value to use state_province_id value.
Eileen McNaughton [Thu, 9 Mar 2017 21:08:00 +0000 (10:08 +1300)]
Merge pull request #9957 from civicrm/4.7.17-rc
4.7.17 rc
Tim Otten [Thu, 9 Mar 2017 20:13:09 +0000 (12:13 -0800)]
Merge pull request #9956 from seamuslee001/master
Update to 4.7.18
Karin Gerritsen [Thu, 9 Mar 2017 16:41:46 +0000 (09:41 -0700)]
Merge pull request #3 from eileenmcnaughton/karing
Resolve immediate issues with test & add checks for mail content (sin…
colemanw [Thu, 9 Mar 2017 15:19:13 +0000 (10:19 -0500)]
Merge pull request #9655 from eileenmcnaughton/activities
CRM-19836 Enable activity create from replies to CiviMail.
Edsel [Thu, 9 Mar 2017 13:59:36 +0000 (19:29 +0530)]
CRM-20025 Added check to restrict test contributions from appearing
----------------------------------------
* CRM-20025: DB Error on email task for advanced search for contributions
https://issues.civicrm.org/jira/browse/CRM-20025
Edsel [Thu, 9 Mar 2017 13:30:47 +0000 (19:00 +0530)]
CRM-20058 Added check for backoffice credit card payment enabled
----------------------------------------
* CRM-20058: Add Credit Card Payment link for partially paid contribution
https://issues.civicrm.org/jira/browse/CRM-20058
Seamus Lee [Thu, 9 Mar 2017 08:08:03 +0000 (19:08 +1100)]
Update to 4.7.18
eileen [Thu, 9 Mar 2017 06:10:01 +0000 (19:10 +1300)]
Resolve immediate issues with test & add checks for mail content (since that function is edited
Eileen McNaughton [Thu, 9 Mar 2017 04:37:51 +0000 (17:37 +1300)]
Merge pull request #9955 from eileenmcnaughton/joe
Towards CRM-19715, Remove Close Accounting Period code
KarinG [Thu, 9 Mar 2017 04:22:40 +0000 (21:22 -0700)]
First pass at PHP Unit test for reSubmit (without priceset).
projects / civicrm-core.git / log