civicrm-core.git
5 years agoMerge pull request #15710 from seamuslee001/custom_field_convert
Seamus Lee [Mon, 4 Nov 2019 23:13:52 +0000 (10:13 +1100)]
Merge pull request #15710 from seamuslee001/custom_field_convert

dev/core#561 Add in routine to convert custom date fields in smart groups to datep…

5 years agoMerge pull request #14349 from mattwire/case_links_refactor_3
Eileen McNaughton [Mon, 4 Nov 2019 23:07:40 +0000 (12:07 +1300)]
Merge pull request #14349 from mattwire/case_links_refactor_3

Convert case activity links to 'actionLinks'

5 years agoMerge pull request #15694 from eileenmcnaughton/custom
Seamus Lee [Mon, 4 Nov 2019 21:18:37 +0000 (08:18 +1100)]
Merge pull request #15694 from eileenmcnaughton/custom

Get rid of jcalendar range in custom data

5 years agoMerge pull request #15729 from civicrm/5.19
Eileen McNaughton [Mon, 4 Nov 2019 21:01:05 +0000 (10:01 +1300)]
Merge pull request #15729 from civicrm/5.19

5.19 to master

5 years agoMerge pull request #15726 from MiyaNoctem/dev-core-1093-fix-installation-of-custom...
Eileen McNaughton [Mon, 4 Nov 2019 21:00:06 +0000 (10:00 +1300)]
Merge pull request #15726 from MiyaNoctem/dev-core-1093-fix-installation-of-custom-fields-with-option-values

dev/core#1093: Fix Installation of Custom Fields with Option Values From XML

5 years agoAdd in a unit test of the custom field date range conversion
Seamus Lee [Mon, 4 Nov 2019 20:07:33 +0000 (07:07 +1100)]
Add in a unit test of the custom field date range conversion

5 years agoAdd in routine to convert custom date fields in smart groups to datepicker format
Seamus Lee [Sun, 3 Nov 2019 02:17:08 +0000 (13:17 +1100)]
Add in routine to convert custom date fields in smart groups to datepicker format

5 years agoRemove 'recode handling
eileen [Mon, 4 Nov 2019 04:56:19 +0000 (17:56 +1300)]
Remove 'recode handling

5 years agoAdd in template file for laying out datepicker in custom fields and extract js into...
Seamus Lee [Sat, 2 Nov 2019 00:20:38 +0000 (11:20 +1100)]
Add in template file for laying out datepicker in custom fields and extract js into own template for sharing

5 years agoGet rid of jcalendar range in custom data
eileen [Fri, 1 Nov 2019 07:02:18 +0000 (20:02 +1300)]
Get rid of jcalendar range in custom data

5 years agoMerge pull request #15727 from civicrm/5.19
Eileen McNaughton [Mon, 4 Nov 2019 19:37:33 +0000 (08:37 +1300)]
Merge pull request #15727 from civicrm/5.19

5.19

5 years agoMerge pull request #15719 from eileenmcnaughton/custom_query_fix_join
Seamus Lee [Mon, 4 Nov 2019 19:34:37 +0000 (06:34 +1100)]
Merge pull request #15719 from eileenmcnaughton/custom_query_fix_join

Fix Custom field date query builder to work with 'raw' high & low params

5 years agoMerge pull request #15724 from MiyaNoctem/dev-core-1360-fix-programatic-installation...
Seamus Lee [Mon, 4 Nov 2019 19:32:35 +0000 (06:32 +1100)]
Merge pull request #15724 from MiyaNoctem/dev-core-1360-fix-programatic-installation-of-extensions-v519

dev/core#1360: Fix Programatic Installation Of Multiple Extensions on v5.19

5 years agodev/core#1093: Fix Installation of Custom Fields with Option Values From XML
Camilo Rodriguez [Mon, 4 Nov 2019 16:40:36 +0000 (16:40 +0000)]
dev/core#1093: Fix Installation of Custom Fields with Option Values From XML

5 years agoMerge pull request #15722 from eileenmcnaughton/rel_test
colemanw [Mon, 4 Nov 2019 12:49:15 +0000 (07:49 -0500)]
Merge pull request #15722 from eileenmcnaughton/rel_test

[REF] minor tidy ups on very nasty function

5 years agodev/core#1360: Fix Programatic Installation Of Multiple Extensions
Camilo Rodriguez [Fri, 1 Nov 2019 15:03:39 +0000 (15:03 +0000)]
dev/core#1360: Fix Programatic Installation Of Multiple Extensions

5 years agoMerge pull request #15723 from eileenmcnaughton/rel_clean
colemanw [Mon, 4 Nov 2019 11:51:32 +0000 (06:51 -0500)]
Merge pull request #15723 from eileenmcnaughton/rel_clean

Eliminate silly parameter

5 years agoFurther join tests & fixes
eileen [Mon, 4 Nov 2019 06:08:17 +0000 (19:08 +1300)]
Further join tests & fixes

Turns out the carefully constructed join was being whomped - but only sometimes

5 years agoFix Custom field date query builder to work with 'raw' high & low params
eileen [Mon, 4 Nov 2019 04:17:21 +0000 (17:17 +1300)]
Fix Custom field date query builder to work with 'raw' high & low params

Once we convert to datePicker we will be passing in parameters like custom_3_high, custom_3_low & custom_3_relative.

Currently we pass in custom_3_to & custom_3_from and custom_3_relative. This adds support for the new high & low
withoutt touching support for previously working or switching the field across (as yet). This paves the way for
the datepicker conversion. After a lot of brain pain I concluded the fundamental problem was the whereTables
from the CustomQuery were being merged in but actually then lost when where() is called.

5 years agoMove all thte code that relates to joining tables/constructing From to one place.
eileen [Mon, 4 Nov 2019 01:15:18 +0000 (14:15 +1300)]
Move all thte code that relates to joining tables/constructing From to one place.

This could definitely be cleaned up more - but the goal of this step is just to move all the code that
constructs the from code into one place, so it can be called more sensibly.

Tested in the newly written testAddressCustomFields

5 years agoSwitch to cached retrieval function
eileen [Mon, 4 Nov 2019 07:41:16 +0000 (20:41 +1300)]
Switch to cached retrieval function

5 years agoAdd date check to test
eileen [Mon, 4 Nov 2019 07:35:38 +0000 (20:35 +1300)]
Add date check to test

Remove a few lines of unnecessary code
It used to be necessary to ISO format code before DAO->save. However, along the line wee fixed it lower
down & no longer need this smattered all over the code. Test proves it's OK

5 years agoEliminate silly parameter
eileen [Mon, 4 Nov 2019 09:52:29 +0000 (22:52 +1300)]
Eliminate silly parameter

 is only ever passed into this function once. In that instance
it is then populated off owner_membership_id & then wrangled in the calling function
back to a separatte arry before being unset. The moves it back to the calling function &
simplifieds

Good test cover exists in testCreateMembership

5 years agoMerge pull request #15721 from eileenmcnaughton/odd_return
Seamus Lee [Mon, 4 Nov 2019 09:33:31 +0000 (20:33 +1100)]
Merge pull request #15721 from eileenmcnaughton/odd_return

Remove early return on joinTable

5 years agoMerge pull request #15720 from eileenmcnaughton/test_clean
Eileen McNaughton [Mon, 4 Nov 2019 07:43:55 +0000 (20:43 +1300)]
Merge pull request #15720 from eileenmcnaughton/test_clean

Test improvements

5 years agoRemove early return on joinTable
eileen [Mon, 4 Nov 2019 01:05:30 +0000 (14:05 +1300)]
Remove early return on joinTable

I looked up the reason for the early return here and it was that the UI for adding other tables
in was too complex. In other words the removed lines should never be true.

However, I don't think it's the place of the query object to enforce not attempting a query the
UI struggles with. Removing this will save a later person having to figure that out

5 years agoConvert customQueryTest to test the BAO_Contact_Query
eileen [Mon, 4 Nov 2019 02:42:03 +0000 (15:42 +1300)]
Convert customQueryTest to test the BAO_Contact_Query

While I understand the theory of unit tests is to test low level chunks of code that relates in many
ways to WELL-DESIGNED chunks. In the case of the query object it is more important to
ensure the results experienced by the user are correct - this converts the existing test
to a more end-to-end test on the CRM_Contact_BAO_Query object acting correctly.

5 years ago[NFC] Test cleam up
eileen [Mon, 4 Nov 2019 01:56:31 +0000 (14:56 +1300)]
[NFC] Test cleam up

5 years agoMerge pull request #15718 from eileenmcnaughton/custom_query_fix
Seamus Lee [Mon, 4 Nov 2019 04:59:02 +0000 (15:59 +1100)]
Merge pull request #15718 from eileenmcnaughton/custom_query_fix

[REF] Remove early return on joinTable

5 years agoMerge pull request #15714 from eileenmcnaughton/custom_sane_save
Seamus Lee [Mon, 4 Nov 2019 04:57:59 +0000 (15:57 +1100)]
Merge pull request #15714 from eileenmcnaughton/custom_sane_save

[REF] remove  as a return Param of getHierContactDetails

5 years agoMerge pull request #15715 from eileenmcnaughton/custom_query
Seamus Lee [Mon, 4 Nov 2019 04:55:22 +0000 (15:55 +1100)]
Merge pull request #15715 from eileenmcnaughton/custom_query

Add test to lock in obscure custom join handling

5 years agoAdd test to lock in obscure custom join handling
eileen [Mon, 4 Nov 2019 00:16:43 +0000 (13:16 +1300)]
Add test to lock in obscure custom join handling

5 years agoMerge pull request #15717 from seamuslee001/backdrop_regen
Eileen McNaughton [Mon, 4 Nov 2019 03:25:01 +0000 (16:25 +1300)]
Merge pull request #15717 from seamuslee001/backdrop_regen

[NFC] Allow users on backdrop to trigger regen.sh

5 years agoMerge pull request #15716 from eileenmcnaughton/except
Eileen McNaughton [Mon, 4 Nov 2019 03:24:44 +0000 (16:24 +1300)]
Merge pull request #15716 from eileenmcnaughton/except

[NFC] Fix exception thrown to std CRM_Core_Exception

5 years agoMerge pull request #15062 from eileenmcnaughton/agile_fix
Seamus Lee [Mon, 4 Nov 2019 02:25:23 +0000 (13:25 +1100)]
Merge pull request #15062 from eileenmcnaughton/agile_fix

Agile fixFix inherited membership being deleted when there is still a valid …  …relationship

5 years agoRemove early return on joinTable
eileen [Mon, 4 Nov 2019 01:05:30 +0000 (14:05 +1300)]
Remove early return on joinTable

I looked up the reason for the early return here and it was that the UI for adding other tables
in was too complex. In other words the removed lines should never be true.

However, I don't think it's the place of the query object to enforce not attempting a query the
UI struggles with. Removing this will save a later person having to figure that out

5 years ago[NFC] Allow users on backdrop to trigger regen.sh
Seamus Lee [Mon, 4 Nov 2019 01:02:51 +0000 (12:02 +1100)]
[NFC] Allow users on backdrop to trigger regen.sh

5 years agoFix exception thrown to std CRM_Core_Exception
eileen [Mon, 4 Nov 2019 00:59:26 +0000 (13:59 +1300)]
Fix exception thrown to std CRM_Core_Exception

5 years agoMerge pull request #15713 from eileenmcnaughton/query_clean
Seamus Lee [Mon, 4 Nov 2019 00:36:00 +0000 (11:36 +1100)]
Merge pull request #15713 from eileenmcnaughton/query_clean

[NFC] various code cleanup on CRM_Contact_BAO_Query

5 years ago[REF] remove as a return Param of getHierContactDetails
eileen [Sun, 3 Nov 2019 23:34:43 +0000 (12:34 +1300)]
[REF] remove  as a return Param of getHierContactDetails

In trying to get to the bottom of BAO_CustomQuery I hit confusion about whether options should still exist.

This removes it from the return values of getHierContactDetails, making for a cleaner later PR when
we can check all calls to CRM_Contact_BAO_Query::apiQuery use the 'list' construct and only
use one param - at which point we can pull it out of apiQuery

5 years ago[NFC] various code cleanup on CRM_Contact_BAO_Query
eileen [Sun, 3 Nov 2019 22:54:21 +0000 (11:54 +1300)]
[NFC] various code cleanup on CRM_Contact_BAO_Query

Fix comment blocks, correct parameter types in blocks etc, fix some miscased fn calls, add throws tags
use strict comparision when comparing with strings

5 years agoMerge pull request #15571 from herbdool/ops-906
Eileen McNaughton [Sun, 3 Nov 2019 22:38:40 +0000 (11:38 +1300)]
Merge pull request #15571 from herbdool/ops-906

Backdrop support for adding roles and perms

5 years agoMerge pull request #15701 from seamuslee001/allow_extensions_to_override_acl_temp_tab...
Eileen McNaughton [Sun, 3 Nov 2019 20:32:34 +0000 (09:32 +1300)]
Merge pull request #15701 from seamuslee001/allow_extensions_to_override_acl_temp_table_use

Add in method to allow extensions to opt out of using temporary table…

5 years agoMerge pull request #15712 from seamuslee001/form_reorder_modified
Seamus Lee [Sun, 3 Nov 2019 20:04:24 +0000 (07:04 +1100)]
Merge pull request #15712 from seamuslee001/form_reorder_modified

Re-arrange change log advanced search panel so both modified fields a…

5 years agoRe-arrange change log advanced search panel so both modified fields are next to each...
Seamus Lee [Sun, 3 Nov 2019 06:14:10 +0000 (17:14 +1100)]
Re-arrange change log advanced search panel so both modified fields are next to each other

5 years agoMerge pull request #15711 from eileenmcnaughton/cust_ug
Seamus Lee [Sun, 3 Nov 2019 06:08:36 +0000 (17:08 +1100)]
Merge pull request #15711 from eileenmcnaughton/cust_ug

Minor refactors to support converting custom fields to datepicker fields

5 years agoAdd a couple of throws to comments
eileen [Sun, 3 Nov 2019 04:42:46 +0000 (17:42 +1300)]
Add a couple of throws to comments

5 years agoMove CustomQuery iteraction out of the tail end of the SelectClause
eileen [Sun, 3 Nov 2019 04:41:34 +0000 (17:41 +1300)]
Move CustomQuery iteraction out of the tail end of the SelectClause

It's not part of the select clause so having it in there is confusing & mislead. No functional change as it's the next
thin to be called either way

5 years agoFix determination of whether custom fields are in play to include range
eileen [Sun, 3 Nov 2019 04:39:19 +0000 (17:39 +1300)]
Fix determination of whether custom fields are in play to include range

I've added in _high, _low as the new ones & also _from & _to as I'm having some transitional issues

5 years agoMerge pull request #15702 from seamuslee001/log_date_smart_group_upgrade
Seamus Lee [Sat, 2 Nov 2019 23:20:39 +0000 (10:20 +1100)]
Merge pull request #15702 from seamuslee001/log_date_smart_group_upgrade

dev/core#561 Add in Upgrade routine to convert log_date smart group s…

5 years agoMerge pull request #15693 from eileenmcnaughton/log_date
Seamus Lee [Sat, 2 Nov 2019 23:20:19 +0000 (10:20 +1100)]
Merge pull request #15693 from eileenmcnaughton/log_date

Replace log_date with created_date & modified_date in advanced search

5 years agoMerge pull request #10 from seamuslee001/log_date
Eileen McNaughton [Sat, 2 Nov 2019 21:59:50 +0000 (10:59 +1300)]
Merge pull request #10 from seamuslee001/log_date

Fix up display of date fields to ensure that they don't cause issue t…

5 years agoFix up display of date fields to ensure that they don't cause issue to each other...
Seamus Lee [Sat, 2 Nov 2019 19:43:05 +0000 (06:43 +1100)]
Fix up display of date fields to ensure that they don't cause issue to each other and add some description onto the modified by field

5 years agoMerge pull request #15704 from totten/master-container-warn
Eileen McNaughton [Sat, 2 Nov 2019 11:35:32 +0000 (00:35 +1300)]
Merge pull request #15704 from totten/master-container-warn

Civi\Core\Container - Fix warning about Symfony 3=>4 and boot services

5 years agoCivi\Core\Container - Fix warning about Symfony 3=>4 and boot services
Tim Otten [Sat, 2 Nov 2019 02:30:17 +0000 (19:30 -0700)]
Civi\Core\Container - Fix warning about Symfony 3=>4 and boot services

Boot services are initialized before the container starts -- and then passed in via `$container->set()`.

Symfony 3.4 changes the default handling of `set()` - it now emits warnings
unless the services were previously flagged as public.

https://symfony.com/blog/new-in-symfony-3-4-services-are-private-by-default

Before
------

```
[bknix-min:~/bknix/build/d8re] drush php
Psy Shell v0.9.9 (PHP 7.0.32 — cli) by Justin Hileman
>>> \Drupal::service('civicrm')->initialize();
PHP Deprecated:  The "runtime" service is private, replacing it is deprecated since Symfony 3.2 and will fail in 4.0. in /Users/totten/bknix/build/d8re/vendor/symfony/dependency-injection/Container.php on line 190
PHP Deprecated:  The "paths" service is private, replacing it is deprecated since Symfony 3.2 and will fail in 4.0. in /Users/totten/bknix/build/d8re/vendor/symfony/dependency-injection/Container.php on line 190
PHP Deprecated:  The "userSystem" service is private, replacing it is deprecated since Symfony 3.2 and will fail in 4.0. in /Users/totten/bknix/build/d8re/vendor/symfony/dependency-injection/Container.php on line 190
PHP Deprecated:  The "userPermissionClass" service is private, replacing it is deprecated since Symfony 3.2 and will fail in 4.0. in /Users/totten/bknix/build/d8re/vendor/symfony/dependency-injection/Container.php on line 190
PHP Deprecated:  The "cache.settings" service is private, replacing it is deprecated since Symfony 3.2 and will fail in 4.0. in /Users/totten/bknix/build/d8re/vendor/symfony/dependency-injection/Container.php on line 190
PHP Deprecated:  The "settings_manager" service is private, replacing it is deprecated since Symfony 3.2 and will fail in 4.0. in /Users/totten/bknix/build/d8re/vendor/symfony/dependency-injection/Container.php on line 190
PHP Deprecated:  The "lockManager" service is private, replacing it is deprecated since Symfony 3.2 and will fail in 4.0. in /Users/totten/bknix/build/d8re/vendor/symfony/dependency-injection/Container.php on line 190
```

After
-----

The warnings don't appear.

Comments
--------

The `Definition` class includes two methods, `setPublic()` and
`setPrivate()`, which appear to do the same thing (but as opposites).
`setPublic()` exists Symfony 2.8+, but `setPrivate()` was added in Symfony
3.x, so we use `setPublic()` for broader compatibility.

5 years agoMerge pull request #15415 from ixiam/dev_issue#1297
Eileen McNaughton [Sat, 2 Nov 2019 01:38:50 +0000 (14:38 +1300)]
Merge pull request #15415 from ixiam/dev_issue#1297

dev/core#1297 If start/end date is empty, results are empty

5 years agoMerge pull request #15685 from eileenmcnaughton/refund_allocate
Eileen McNaughton [Fri, 1 Nov 2019 23:27:40 +0000 (12:27 +1300)]
Merge pull request #15685 from eileenmcnaughton/refund_allocate

[NFC] Test class preliminary clean up

5 years ago[NFC] Test class preliminary clean up
eileen [Fri, 1 Nov 2019 01:51:36 +0000 (14:51 +1300)]
[NFC] Test class preliminary clean up

5 years agoSwitch default handling so that we convert to created_date field by default as that...
Seamus Lee [Fri, 1 Nov 2019 21:31:07 +0000 (08:31 +1100)]
Switch default handling so that we convert to created_date field by default as that matches the current form code and extend unit test to cover senario where no radio button was filled in

5 years agodev/core#561 Add in Upgrade routine to convert log_date smart group searches to their...
Seamus Lee [Fri, 1 Nov 2019 21:19:23 +0000 (08:19 +1100)]
dev/core#561 Add in Upgrade routine to convert log_date smart group searches to their new names

Fix log date function call in upgrade

5 years agoMerge pull request #15698 from jitendrapurohit/fix-participant-fields
Eileen McNaughton [Fri, 1 Nov 2019 20:48:21 +0000 (09:48 +1300)]
Merge pull request #15698 from jitendrapurohit/fix-participant-fields

Fix loading of profile fields on additional participant form

5 years agoAdd in method to allow extensions to opt out of using temporary table when building...
Seamus Lee [Fri, 1 Nov 2019 20:05:13 +0000 (07:05 +1100)]
Add in method to allow extensions to opt out of using temporary table when building ACL Contact Cache

5 years agoMerge pull request #15617 from eileenmcnaughton/even_clen
Matthew Wire [Fri, 1 Nov 2019 16:46:35 +0000 (16:46 +0000)]
Merge pull request #15617 from eileenmcnaughton/even_clen

dev/financial#2 Support payment processor title if configured on Contribution & Event Pages

5 years agoMerge pull request #15687 from eileenmcnaughton/add_pay_date
Matthew Wire [Fri, 1 Nov 2019 15:52:15 +0000 (15:52 +0000)]
Merge pull request #15687 from eileenmcnaughton/add_pay_date

Cleanup date handling on Payment.create

5 years agoMerge pull request #15632 from eileenmcnaughton/pay_form
Matthew Wire [Fri, 1 Nov 2019 15:50:28 +0000 (15:50 +0000)]
Merge pull request #15632 from eileenmcnaughton/pay_form

Partial conversion of Payment form to use the EntityFormTrait & add title

5 years agoFix loading of profile fields on additional participant form
Jitendra Purohit [Fri, 1 Nov 2019 12:20:48 +0000 (17:50 +0530)]
Fix loading of profile fields on additional participant form

5 years agoMerge pull request #15641 from eileenmcnaughton/cont_clean
Matthew Wire [Fri, 1 Nov 2019 11:50:37 +0000 (11:50 +0000)]
Merge pull request #15641 from eileenmcnaughton/cont_clean

[REF] Move calls to CRM_Core_BAO_FinancialTrxn::createDeferredTrxn back to the calling functions.

5 years agoConvert case activity links to 'actionLinks'
Matthew Wire (MJW Consulting) [Mon, 15 Jul 2019 23:32:13 +0000 (00:32 +0100)]
Convert case activity links to 'actionLinks'

5 years agoAdd function to get 'view only' activity types
Matthew Wire (MJW Consulting) [Sun, 26 May 2019 12:01:34 +0000 (13:01 +0100)]
Add function to get 'view only' activity types

5 years agoMerge pull request #15651 from seamuslee001/dev_core_1344
Matthew Wire [Fri, 1 Nov 2019 11:36:19 +0000 (11:36 +0000)]
Merge pull request #15651 from seamuslee001/dev_core_1344

dev/core#1344 Fix logic for displaying BillingName and Credit Card De…

5 years agoMerge pull request #15588 from seamuslee001/ref_group_contact_cache_rebuild
Matthew Wire [Fri, 1 Nov 2019 11:31:55 +0000 (11:31 +0000)]
Merge pull request #15588 from seamuslee001/ref_group_contact_cache_rebuild

[REF] Refactor Smart Group Cache population code to be less intensive

5 years agoMerge pull request #15592 from seamuslee001/ref_acl_contact_cache_generation
Matthew Wire [Fri, 1 Nov 2019 11:26:11 +0000 (11:26 +0000)]
Merge pull request #15592 from seamuslee001/ref_acl_contact_cache_generation

[REF] Refactor ACL Contact Cache generation to be more efficient

5 years agoMerge pull request #15679 from eileenmcnaughton/script_fee
Yashodha Chaku [Fri, 1 Nov 2019 10:40:51 +0000 (16:10 +0530)]
Merge pull request #15679 from eileenmcnaughton/script_fee

dev/event#19 remove obsolete scriptFee & scriptArray

5 years agoMerge pull request #15688 from eileenmcnaughton/billing_name
Eileen McNaughton [Fri, 1 Nov 2019 08:28:48 +0000 (21:28 +1300)]
Merge pull request #15688 from eileenmcnaughton/billing_name

Fix BillingName to be assigned in email receipts IF available

5 years agoReplace log_date with created_date & modified_date in advanced search
eileen [Fri, 1 Nov 2019 06:15:03 +0000 (19:15 +1300)]
Replace log_date with created_date & modified_date in advanced search

This is almost the last step in getting rid of an awful lot of technical debt & hard to maintain code around jcalendar & datepicker.

It does change the UI a bit - the code to create the current UI is pretty tough going and from seeing users try
to work with it I don't think all that code is making it more usable. OTOH we can remove a maintainability blockerr
by switching over

5 years agoFix BillingName to be assigned in email receipts IF available
eileen [Fri, 1 Nov 2019 04:28:45 +0000 (17:28 +1300)]
Fix BillingName to be assigned in email receipts IF available

Previously it was assigned at the form layer, now we assign it in the email sending routine, depending on
whether the contribution has address_id & there is a value assigned

5 years agoMerge pull request #15691 from civicrm/5.19
Eileen McNaughton [Fri, 1 Nov 2019 05:43:28 +0000 (18:43 +1300)]
Merge pull request #15691 from civicrm/5.19

5.19

5 years agoMerge pull request #15690 from seamuslee001/nfc_authorize_test_fix
Seamus Lee [Fri, 1 Nov 2019 05:42:46 +0000 (16:42 +1100)]
Merge pull request #15690 from seamuslee001/nfc_authorize_test_fix

[NFC] Fix AuthorizeNet Test failure due to credit card being expired

5 years ago[NFC] Fix AuthorizeNet Test failure due to credit card being expired
Seamus Lee [Fri, 1 Nov 2019 04:50:46 +0000 (15:50 +1100)]
[NFC] Fix AuthorizeNet Test failure due to credit card being expired

5 years agodev/core#1344 Fix logic for displaying BillingName and Credit Card Details in email...
Seamus Lee [Tue, 29 Oct 2019 19:24:06 +0000 (06:24 +1100)]
dev/core#1344 Fix logic for displaying BillingName and Credit Card Details in email Receipts

5 years agoMerge pull request #15682 from seamuslee001/dev_core_1344_aditional_if
Seamus Lee [Fri, 1 Nov 2019 04:44:02 +0000 (15:44 +1100)]
Merge pull request #15682 from seamuslee001/dev_core_1344_aditional_if

dev/core#1344 Re-work if statements and remove excess ifs

5 years agodev/core#1344 Re-work if statements and remove excess ifs
Seamus Lee [Thu, 31 Oct 2019 22:42:34 +0000 (09:42 +1100)]
dev/core#1344 Re-work if statements and remove excess ifs

5 years agoCleanup date handling on Payment.create
eileen [Wed, 30 Oct 2019 21:53:13 +0000 (10:53 +1300)]
Cleanup date handling on Payment.create

Fix a bug identified by @kcristiano whereby adding a payment with the
additional payment form changes the contribution receive_date.

Also, add a default to Payment.create of 'now' for the
trxn_date and require it to be set. Use that value later on.

Some string fixes

5 years agoMerge pull request #15638 from eileenmcnaughton/vangelis
Eileen McNaughton [Fri, 1 Nov 2019 03:04:37 +0000 (16:04 +1300)]
Merge pull request #15638 from eileenmcnaughton/vangelis

dev/core#1282 unit test for bug

5 years agoMerge pull request #15683 from eileenmcnaughton/test
Eileen McNaughton [Fri, 1 Nov 2019 02:30:37 +0000 (15:30 +1300)]
Merge pull request #15683 from eileenmcnaughton/test

[NFC] test cleanup

5 years agoMerge pull request #15681 from eileenmcnaughton/nfc
colemanw [Fri, 1 Nov 2019 00:38:54 +0000 (20:38 -0400)]
Merge pull request #15681 from eileenmcnaughton/nfc

[NFC] define variable type

5 years ago[NFC] test cleanup
eileen [Fri, 1 Nov 2019 00:35:40 +0000 (13:35 +1300)]
[NFC] test cleanup

I failed to replicate what I was trying to replicate but   adding the test cleanup for now

5 years agoMerge pull request #15677 from seamuslee001/event_smart_group_upgrade
Seamus Lee [Fri, 1 Nov 2019 00:15:24 +0000 (11:15 +1100)]
Merge pull request #15677 from seamuslee001/event_smart_group_upgrade

Add in upgrade step for upgrading Event date and Relationship Active Date smart groups

5 years agoMerge pull request #15680 from seamuslee001/dev_core_1344_straightforward
Seamus Lee [Thu, 31 Oct 2019 23:54:43 +0000 (10:54 +1100)]
Merge pull request #15680 from seamuslee001/dev_core_1344_straightforward

dev/core#1344 Fix complicated logic on credit card and billing name s…

5 years agoAdd in upgrade step for upgrading Event date smart groups
Seamus Lee [Thu, 31 Oct 2019 21:08:33 +0000 (08:08 +1100)]
Add in upgrade step for upgrading Event date smart groups

Include relation_active_period_date field for upgrade

5 years agoMerge pull request #15671 from eileenmcnaughton/rel_action
Seamus Lee [Thu, 31 Oct 2019 22:51:58 +0000 (09:51 +1100)]
Merge pull request #15671 from eileenmcnaughton/rel_action

Jcalendar conversion on relation_active_period_date

5 years ago[NFC] define variable type
eileen [Thu, 31 Oct 2019 22:13:20 +0000 (11:13 +1300)]
[NFC] define variable type

5 years agodev/core#1344 Fix complicated logic on credit card and billing name sections as agree...
Seamus Lee [Thu, 31 Oct 2019 22:10:55 +0000 (09:10 +1100)]
dev/core#1344 Fix complicated logic on credit card and billing name sections as agreed in #15651

5 years agodev/event#19 remove obsolete scriptFee & scriptArray
eileen [Thu, 31 Oct 2019 21:53:58 +0000 (10:53 +1300)]
dev/event#19 remove obsolete scriptFee & scriptArray

https://lab.civicrm.org/dev/event/issues/19#note_25984

Both @mattwire & myself determined these are obsolete, unused parameters, removing

5 years agoMerge pull request #15674 from eileenmcnaughton/tpls
Seamus Lee [Thu, 31 Oct 2019 21:35:31 +0000 (08:35 +1100)]
Merge pull request #15674 from eileenmcnaughton/tpls

Simplify billingName logic on xml/templates/message_templates/members…

5 years agoRemove test on legacy relative dates handling
eileen [Thu, 31 Oct 2019 11:04:41 +0000 (00:04 +1300)]
Remove test on legacy relative dates handling

5 years agoJcalendar converstion on relation_active_period_date
eileen [Thu, 31 Oct 2019 07:35:00 +0000 (20:35 +1300)]
Jcalendar converstion on relation_active_period_date

Same as https://github.com/civicrm/civicrm-core/pull/15661

Conversion excluded for now

5 years agoMerge pull request #15362 from yashodha/edit
Eileen McNaughton [Thu, 31 Oct 2019 21:15:58 +0000 (10:15 +1300)]
Merge pull request #15362 from yashodha/edit

(dev/core#1065) Member in Edit mode needs to be shown consistently

5 years agoMerge pull request #15661 from eileenmcnaughton/event
Seamus Lee [Thu, 31 Oct 2019 20:01:15 +0000 (07:01 +1100)]
Merge pull request #15661 from eileenmcnaughton/event

Jcalendar replacement for event date

5 years agoMerge pull request #15673 from eileenmcnaughton/set
Matthew Wire [Thu, 31 Oct 2019 18:42:01 +0000 (18:42 +0000)]
Merge pull request #15673 from eileenmcnaughton/set

Ensure contributionRecurID is set on processor