civicrm-core.git
7 years agoMerge pull request #10016 from ErichBSchulz/refaction_entity_action_permissions
Tim Otten [Tue, 21 Mar 2017 08:02:27 +0000 (01:02 -0700)]
Merge pull request #10016 from ErichBSchulz/refaction_entity_action_permissions

extract two core API permission functions

7 years agoMerge pull request #10020 from jitendrapurohit/CRM-20216
Yashodha Chaku [Mon, 20 Mar 2017 11:30:43 +0000 (17:00 +0530)]
Merge pull request #10020 from jitendrapurohit/CRM-20216

CRM-20216 - Dedupe rules should be prevented from being saved if Weig…

7 years agoMerge pull request #10019 from eileenmcnaughton/cacheid
Eileen McNaughton [Mon, 20 Mar 2017 07:13:59 +0000 (20:13 +1300)]
Merge pull request #10019 from eileenmcnaughton/cacheid

CRM-19385 - remove dependence on ids in cache tables.

7 years agoCRM-20216 - Dedupe rules should be prevented from being saved if Weight Threshold...
Jitendra Purohit [Mon, 20 Mar 2017 05:40:58 +0000 (11:10 +0530)]
CRM-20216 - Dedupe rules should be prevented from being saved if Weight Threshold is null or zero

7 years agoCRM-19385 - remove dependence on ids in cache tables.
eileen [Mon, 20 Mar 2017 04:34:00 +0000 (17:34 +1300)]
CRM-19385 - remove dependence on ids in cache tables.

This removes the use of the primary id keys in the cache tables. The upgrade part of this
has gone stale a few times but I feel sure that this part is tested & confirmed
and committing this part will make testing easier

7 years agofix comment to comply with style
Erich Schulz [Mon, 20 Mar 2017 00:34:07 +0000 (10:34 +1000)]
fix comment to comply with style

7 years agoextract two core API permission functions
Erich Schulz [Sun, 19 Mar 2017 10:28:10 +0000 (20:28 +1000)]
extract two core API permission functions

This will enable a bit of discoverability for the entity x action
matrix.

This is pretty much a cut and paste job so should be no functional
change.

7 years agoMerge pull request #8980 from ergonlogic/dev/CRM-19308
Eileen McNaughton [Sun, 19 Mar 2017 06:18:02 +0000 (19:18 +1300)]
Merge pull request #8980 from ergonlogic/dev/CRM-19308

Fixes CRM-19308: Disallow false-y values for paths purged during cach…

7 years agoMerge pull request #10014 from totten/master-email-recip
Eileen McNaughton [Sun, 19 Mar 2017 05:51:07 +0000 (18:51 +1300)]
Merge pull request #10014 from totten/master-email-recip

CRM-20299 - CiviMail UI - Cleanup "Location Type" and "Selection Method"

7 years agoMerge pull request #9789 from fliespl/patch-2
Eileen McNaughton [Sun, 19 Mar 2017 05:38:16 +0000 (18:38 +1300)]
Merge pull request #9789 from fliespl/patch-2

CRM-19979 - Too big amount saved despite error

7 years agoMerge pull request #9971 from eileenmcnaughton/delayed_recur
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

7 years agoMerge pull request #10013 from seanmadsen/GenCodeChecksum
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

7 years agoMerge pull request #9751 from eileenmcnaughton/report
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.

7 years agoFix mis-cased class ref
eileen [Mon, 30 Jan 2017 07:55:12 +0000 (20:55 +1300)]
Fix mis-cased class ref

7 years agoCRM-20299 - CiviMail - "Location Type" requirement feels wonky
Tim Otten [Fri, 17 Mar 2017 23:25:22 +0000 (16:25 -0700)]
CRM-20299 - CiviMail - "Location Type" requirement feels wonky

If you select a "Location Type" and then deselect it, the field changes
to "Automatic". This is the default value (which is acceptable), but the UI
flags it as erroneous.

The "Selection Method" also defaults to "Automatic".  These fields are oddly
a bit different (e.g.  "Automatic" translates to `location_type_id==null`
and `email_selection_method=automatic`), so the fields are a little
different, but this revision brings them closer.

7 years agoCRM-20299 - CiviMail UI - Refresh recipient list after changing advanced options
Tim Otten [Fri, 17 Mar 2017 23:23:36 +0000 (16:23 -0700)]
CRM-20299 - CiviMail UI - Refresh recipient list after changing advanced options

When composing a new mailing, there are advanced options for targetting
recipients by location type (`location_type_id`, `email_selection_method`).
This ensures that the estimate recipient count updates to match the
selection.

7 years agoComment fixes
eileen [Sun, 29 Jan 2017 21:53:06 +0000 (10:53 +1300)]
Comment fixes

7 years agoExtract report functions for readability & overidabiity
eileen [Mon, 30 Jan 2017 07:53:50 +0000 (20:53 +1300)]
Extract report functions for readability & overidabiity

7 years agoNew GenCodeChecksum for auto-generated DAO files
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

7 years agoCRM-20252 Improve text when processing possibly-delayed-payments
eileen [Mon, 13 Mar 2017 08:40:33 +0000 (21:40 +1300)]
CRM-20252 Improve text when processing possibly-delayed-payments

7 years agoMerge pull request #10011 from eileenmcnaughton/test
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

7 years agoMerge pull request #9999 from JMAConsulting/CRM-20286
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

7 years agoFix test to use name that will not cause intermittant errors
eileen [Fri, 17 Mar 2017 20:23:27 +0000 (09:23 +1300)]
Fix test to use name that will not cause intermittant errors

7 years agoMerge pull request #10008 from civicrm/JoeMurray-patch-1
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

7 years agoCorrect description
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.

7 years agoCRM-20286, added card type form fields
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

7 years agoMerge pull request #9995 from JMAConsulting/CRM-20282
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

7 years agoMerge pull request #10004 from eileenmcnaughton/selector
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…

7 years agoMerge pull request #10002 from colemanw/News
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

7 years agoCRM-20208 rename 'In Selector' to 'Results Column' on Profile admin screens.
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

7 years agoNews dashlet - don't show count when it's zero
Coleman Watts [Fri, 17 Mar 2017 02:49:57 +0000 (22:49 -0400)]
News dashlet - don't show count when it's zero

7 years agoMerge pull request #9979 from mattwire/disable_payment_processor2
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

7 years agoMerge pull request #9421 from eileenmcnaughton/recur_icon
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…

7 years agoMerge pull request #10000 from eileenmcnaughton/agile
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

7 years agoMerge pull request #9986 from JMAConsulting/CRM-20272
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

7 years agoMerge pull request #9980 from mickadoo/CRM-20254-cache-busting-custom-css
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

7 years agoMerge pull request #9802 from eileenmcnaughton/lower
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…

7 years agoCRM-20282 Added credit card type field to bookkeeping report
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

7 years agoCRM-20272 Removed line break
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

7 years agoCRM-20272 Generalised function to add labels
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

7 years agoCRM-19674 Add ability to see at a glance if a contribution is part of a recurring...
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

7 years agoCRM-19710 - Preserve is_email_receipt parameter through to email sent
Agileware Support [Thu, 16 Mar 2017 06:51:43 +0000 (19:51 +1300)]
CRM-19710 - Preserve is_email_receipt parameter through to email sent

7 years agoCRM-20272 Added Credit Card Type field for Contribution Summary report
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

7 years agoMerge pull request #9602 from eileenmcnaughton/triggers
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.

7 years agoMerge pull request #9998 from eileenmcnaughton/part_fee
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

7 years agoCRM-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

7 years agoMerge pull request #9983 from JMAConsulting/CRM-19715-3
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…

7 years agoCRM-20254: code style changes
mickadoo [Wed, 15 Mar 2017 09:39:53 +0000 (09:39 +0000)]
CRM-20254: code style changes

7 years agoCRM-20254: simplify adding cache code logic. remove useless test case
mickadoo [Wed, 15 Mar 2017 09:36:26 +0000 (09:36 +0000)]
CRM-20254: simplify adding cache code logic. remove useless test case

7 years agoCRM-19715, removed settings related to close accounting period and moved to an extension
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

7 years agoMerge pull request #9982 from totten/master-zetamail
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

7 years agoCRM-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

7 years agoMerge pull request #9940 from colemanw/CRM-20102
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

7 years agoCRM-20102 - make case_type_id required
Coleman Watts [Tue, 14 Mar 2017 01:27:28 +0000 (21:27 -0400)]
CRM-20102 - make case_type_id required

7 years agoMerge pull request #9776 from jitendrapurohit/CRM-19741
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…

7 years agoCRM-20254: set cache buster code for tests
mickadoo [Tue, 14 Mar 2017 14:16:46 +0000 (14:16 +0000)]
CRM-20254: set cache buster code for tests

7 years agoCRM-20254: add cache buster string for custom CSS and improve query string generation...
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)

7 years agoCoding style
Matthew Wire [Tue, 14 Mar 2017 09:58:39 +0000 (09:58 +0000)]
Coding style

7 years agoDisable/enable both processors directly in BAO create function
Matthew Wire [Tue, 14 Mar 2017 09:54:42 +0000 (09:54 +0000)]
Disable/enable both processors directly in BAO create function

7 years agoMerge pull request #9978 from yashodha/CRM-20255
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

7 years agoCRM-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

7 years agoMerge pull request #9420 from eileenmcnaughton/settings
Tim Otten [Tue, 14 Mar 2017 05:09:16 +0000 (22:09 -0700)]
Merge pull request #9420 from eileenmcnaughton/settings

Settings

7 years agoFix double-negative in function signature
Coleman Watts [Mon, 13 Mar 2017 13:57:37 +0000 (09:57 -0400)]
Fix double-negative in function signature

7 years agoCRM-20102 - Tests
Coleman Watts [Mon, 13 Mar 2017 01:59:37 +0000 (21:59 -0400)]
CRM-20102 - Tests

7 years agoMore efficient loading of case type definition
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.

7 years agoCRM-20102 - Retrieve more case role info from api
Coleman Watts [Wed, 8 Mar 2017 02:15:31 +0000 (21:15 -0500)]
CRM-20102 - Retrieve more case role info from api

7 years agoCRM-20102 - Return case_id from activity api
Coleman Watts [Tue, 7 Mar 2017 03:49:00 +0000 (22:49 -0500)]
CRM-20102 - Return case_id from activity api

7 years agoCRM-20102 - Better filters for case contact_id field
Coleman Watts [Mon, 6 Mar 2017 21:12:19 +0000 (16:12 -0500)]
CRM-20102 - Better filters for case contact_id field

7 years agoUse strict type checking in in_array
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.

7 years agoMerge pull request #9966 from eileenmcnaughton/is_recur_template
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.

7 years agoMerge pull request #9910 from seamuslee001/CRM-19835
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

7 years agoCRM-19672 - Adapt TokenCompatSubscriber to new getDomain() signature
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.

7 years agoMerge pull request #9969 from totten/master-extbatch-cond
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

7 years agoMerge pull request #9965 from eileenmcnaughton/activity_report
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

7 years agoCivi\API\ExternalBatch - Improve test for variables_order/$_ENV
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.

7 years agoMerge pull request #9967 from eileenmcnaughton/dummy
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…

7 years agoCRM-20248 correct hard coded payment processor type id for Dummy processor
eileen [Sun, 12 Mar 2017 23:00:05 +0000 (12:00 +1300)]
CRM-20248 correct hard coded payment processor type id for Dummy processor

7 years agoCRM-20247 further removal of ignored is_recur parameter.
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

7 years agoCRM-20247 Add test & ensure $is_recur is assigned to the message_template.
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.

7 years agoRemove deprecated function call from test
eileen [Sun, 12 Mar 2017 21:03:06 +0000 (10:03 +1300)]
Remove deprecated function call from test

7 years agoMerge pull request #9836 from jmcclelland/CRM-20020
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

7 years agoCRM-20242 - Add developer Tab to Activity Detail report
eileen [Sat, 11 Mar 2017 03:27:12 +0000 (16:27 +1300)]
CRM-20242 - Add developer Tab to Activity Detail report

7 years agoMerge pull request #9936 from eileenmcnaughton/sig
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

7 years agoUpdate PaymentProcessor.php
colemanw [Fri, 10 Mar 2017 21:01:35 +0000 (16:01 -0500)]
Update PaymentProcessor.php

7 years agoMerge pull request #9963 from kainukempowerment/CRM-20239
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

7 years agoCRM-20239 Extra tests for the CRM_Contact_BAO_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

7 years agoMerge pull request #9815 from WeMoveEU/CRM-19962
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

7 years agoMerge pull request #9662 from JMAConsulting/CRM-19792
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

7 years agoMerge pull request #9948 from KarinG/CRM-19966
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.

7 years agoAdded Test to Create Contribution -> then Edit it via BackOffice form - using default...
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.

7 years agoCRM-20220 fix signature fields to be longtext
eileen [Fri, 10 Mar 2017 03:23:17 +0000 (16:23 +1300)]
CRM-20220 fix signature fields to be longtext

7 years agoMerge pull request #9961 from colemanw/Tweak
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

7 years agoTweak 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

7 years agoMerge pull request #9860 from JMAConsulting/CRM-20058
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

7 years agoMerge pull request #9952 from JMAConsulting/CRM-20025
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

7 years agoMerge pull request #9958 from seamuslee001/CRM-20023
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…

7 years agoUse assertApproxEquals as per Tim's suggestion
Seamus Lee [Thu, 9 Mar 2017 22:40:37 +0000 (09:40 +1100)]
Use assertApproxEquals as per Tim's suggestion

7 years agoFix tear down function
Seamus Lee [Thu, 9 Mar 2017 21:17:36 +0000 (08:17 +1100)]
Fix tear down function

7 years agoCRM-20023 Add test showing passing in just state_province_id and country only geoloat...
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

7 years agoMerge pull request #9959 from seamuslee001/logged_in_user_api_call
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…