civicrm-core.git
4 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

4 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

4 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

4 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

4 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

4 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…

4 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

4 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…

4 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

4 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

4 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.

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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.

4 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…

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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…

4 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

4 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

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

4 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

4 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

4 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…

4 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

4 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

4 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

4 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

4 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

4 years agoMerge pull request #15672 from eileenmcnaughton/unreachable
colemanw [Thu, 31 Oct 2019 11:51:58 +0000 (07:51 -0400)]
Merge pull request #15672 from eileenmcnaughton/unreachable

[NFC] Remove unreachable lines

4 years agoEnsure contributionRecurID is available to payment processors that need it in cancelS...
eileen [Thu, 31 Oct 2019 10:10:26 +0000 (23:10 +1300)]
Ensure contributionRecurID is available to payment processors that need it in cancelSubscription

Discussion starts here https://chat.civicrm.org/civicrm/pl/9m1goccmtpdy58cb7jyx791t7e

4 years agoSimplify billingName logic on xml/templates/message_templates/membership_online_recei...
eileen [Thu, 31 Oct 2019 09:54:15 +0000 (22:54 +1300)]
Simplify billingName logic on xml/templates/message_templates/membership_online_receipt_html.tpl

4 years agoRemove unreachable lines
eileen [Thu, 31 Oct 2019 08:55:30 +0000 (21:55 +1300)]
Remove unreachable lines

4 years agoMerge pull request #15669 from eileenmcnaughton/yesno
Yashodha Chaku [Thu, 31 Oct 2019 08:29:55 +0000 (13:59 +0530)]
Merge pull request #15669 from eileenmcnaughton/yesno

Use Yes-No radio instead of checkbox on search form.

4 years agoJcalendar replacement for event date
eileen [Wed, 30 Oct 2019 06:45:36 +0000 (19:45 +1300)]
Jcalendar replacement for event date

4 years agoMerge pull request #15662 from eileenmcnaughton/lines
Seamus Lee [Wed, 30 Oct 2019 20:11:55 +0000 (07:11 +1100)]
Merge pull request #15662 from eileenmcnaughton/lines

[NFC] Test cleanup -  switch to OrderApi in test setup, add throws, use sin…

4 years agoUse Yes-No radio instead of checkbox on search form.
eileen [Wed, 30 Oct 2019 19:29:05 +0000 (08:29 +1300)]
Use Yes-No radio instead of checkbox on search form.

When a field has an html type of 'Checkbox' it means that when editing it we want a checkbox for
'yes' or 'no'. However in the search forms there is a 3rd option 'don't care'.

This change takes the context into account for those forms

4 years agoMerge pull request #15650 from demeritcowboy/mode-value-missing
Eileen McNaughton [Wed, 30 Oct 2019 18:44:25 +0000 (07:44 +1300)]
Merge pull request #15650 from demeritcowboy/mode-value-missing

dev/core#1347 - Fix php warning in advanced search when opening some accordions

4 years agoMerge pull request #15667 from JMAConsulting/generalise-qill-1
Eileen McNaughton [Wed, 30 Oct 2019 18:41:11 +0000 (07:41 +1300)]
Merge pull request #15667 from JMAConsulting/generalise-qill-1

Add getQillValue fn to generalise qill string construct

4 years agoMerge pull request #15664 from eileenmcnaughton/odd_payment2
Eileen McNaughton [Wed, 30 Oct 2019 18:35:27 +0000 (07:35 +1300)]
Merge pull request #15664 from eileenmcnaughton/odd_payment2

dev/financial#94 fix eroneous payment creation when editing line items

4 years agoAdd CRM_Contact_BAO_Query::getQillValue fn
Monish Deb [Wed, 30 Oct 2019 12:22:40 +0000 (17:52 +0530)]
Add CRM_Contact_BAO_Query::getQillValue fn

4 years agodev/financial#94 fix eroneous payment creation when editing line items
eileen [Wed, 30 Oct 2019 10:49:23 +0000 (23:49 +1300)]
dev/financial#94 fix eroneous payment creation when editing line items

Per https://lab.civicrm.org/dev/financial/issues/94 an eroneous payment transaction is being created when an extra line is
added to an order. The code comments indicate that during the last refactoring the chunk of code
doing this was identified as highly suspect and on re-review of it I'm sure it should go
as we are altering the items purchases, not recording payment in this routine.

I think it dates back to an earlier concept of the flow where altering what was purchased implictly
altered the payments towards that purchase

4 years agoTest cleanup - switch to OrderApi in test setup, add throws, use single quotes
eileen [Wed, 30 Oct 2019 09:38:46 +0000 (22:38 +1300)]
Test cleanup -  switch to OrderApi in test setup, add throws, use single quotes

4 years ago[NFC] code cleanup on test class
eileen [Wed, 30 Oct 2019 10:14:01 +0000 (23:14 +1300)]
[NFC] code cleanup on test class

4 years agoMerge pull request #15660 from totten/master-no-persistent
Eileen McNaughton [Wed, 30 Oct 2019 05:52:34 +0000 (18:52 +1300)]
Merge pull request #15660 from totten/master-no-persistent

Remove unused, hidden subsystem for "persistent DB tpl strings"

4 years agoUpgrader - Drop table "civicrm_persistent" (unless it has data)
Tim Otten [Wed, 30 Oct 2019 00:34:40 +0000 (17:34 -0700)]
Upgrader - Drop table "civicrm_persistent" (unless it has data)

4 years agosql/civicrm_generated.mysql - Update
Tim Otten [Wed, 30 Oct 2019 00:45:54 +0000 (17:45 -0700)]
sql/civicrm_generated.mysql - Update

4 years agoDB Tpl Strings - Remove table "civicrm_persistent"
Tim Otten [Wed, 30 Oct 2019 00:34:20 +0000 (17:34 -0700)]
DB Tpl Strings - Remove table "civicrm_persistent"

4 years agoDB Tpl Strings - Remove unused form 'civicrm/admin/tplstrings'
Tim Otten [Wed, 30 Oct 2019 00:29:26 +0000 (17:29 -0700)]
DB Tpl Strings - Remove unused form 'civicrm/admin/tplstrings'

If you grep for this (in v3.2, v5.20, and universe), you will find that the
only usages are self-referential or pro-forma:

- There is / never been a navigation item pointing to the page.
- There is no codepath which *consumes* data produced here.

4 years agoDB Tpl Strings - Remove unused Smarty function crmDBTpl
Tim Otten [Wed, 30 Oct 2019 00:24:05 +0000 (17:24 -0700)]
DB Tpl Strings - Remove unused Smarty function crmDBTpl

I've searched `universe` and haven't found any references to this.  This
appears to be the only code-path which consumes information from
`civicrm_persistent`.

I also went back to spot-check a few SVN branches of CiviCRM (v3.2, v3.3).
It appears that this was added in v3.2 *but never used or documented*.

4 years agoCRM_Upgrade_Incremental_Base - Add helper dropTableIfEmpty()
Tim Otten [Wed, 30 Oct 2019 00:20:46 +0000 (17:20 -0700)]
CRM_Upgrade_Incremental_Base - Add helper dropTableIfEmpty()

4 years agoCRM_Core_DAO - Add helper checkTableHasData()
Tim Otten [Wed, 30 Oct 2019 00:20:18 +0000 (17:20 -0700)]
CRM_Core_DAO - Add helper checkTableHasData()

4 years agoMerge pull request #15653 from eileenmcnaughton/billin_name
Seamus Lee [Tue, 29 Oct 2019 23:37:12 +0000 (10:37 +1100)]
Merge pull request #15653 from eileenmcnaughton/billin_name

dev/core#1344 Simplify email template logic on displaying card inform…

4 years agoMerge pull request #15659 from civicrm/5.19
Eileen McNaughton [Tue, 29 Oct 2019 23:36:07 +0000 (12:36 +1300)]
Merge pull request #15659 from civicrm/5.19

5.19

4 years agoMerge pull request #15657 from demeritcowboy/pledge-search-backport
Eileen McNaughton [Tue, 29 Oct 2019 23:35:51 +0000 (12:35 +1300)]
Merge pull request #15657 from demeritcowboy/pledge-search-backport

dev/core#1348 - pledge search not working backport of 15656

4 years agoMerge pull request #15658 from MikeyMJCO/patch-1
Eileen McNaughton [Tue, 29 Oct 2019 23:35:18 +0000 (12:35 +1300)]
Merge pull request #15658 from MikeyMJCO/patch-1

Delete mkdocs.yml

4 years agoMerge pull request #15655 from demeritcowboy/activity-search-form-values
Seamus Lee [Tue, 29 Oct 2019 22:08:27 +0000 (09:08 +1100)]
Merge pull request #15655 from demeritcowboy/activity-search-form-values

dev/core#1348 - backport of PR 15654

4 years agoMerge pull request #15652 from eileenmcnaughton/schema
Seamus Lee [Tue, 29 Oct 2019 21:49:51 +0000 (08:49 +1100)]
Merge pull request #15652 from eileenmcnaughton/schema

Add uniquenames for mailing_name, mailing_job_status

4 years agoDelete mkdocs.yml
Mikey O'Toole [Tue, 29 Oct 2019 21:48:30 +0000 (21:48 +0000)]
Delete mkdocs.yml

We may as well remove the old mkdocs.yml file as it's not used.

4 years agopledge search not working
DemeritCowboy [Tue, 29 Oct 2019 21:44:00 +0000 (17:44 -0400)]
pledge search not working

4 years agoactivity search not working at all
DemeritCowboy [Tue, 29 Oct 2019 21:08:31 +0000 (17:08 -0400)]
activity search not working at all

4 years agodev/core#1344 Simplify email template logic on displaying card information
eileen [Tue, 29 Oct 2019 20:19:33 +0000 (09:19 +1300)]
dev/core#1344 Simplify email template logic on displaying card information

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

4 years agoAdd uniquenames for mailing_name, mailing_job_status
eileen [Tue, 29 Oct 2019 19:28:14 +0000 (08:28 +1300)]
Add uniquenames for mailing_name, mailing_job_status

This is in support of https://github.com/civicrm/civicrm-core/pull/15369

Where the names in the search do not match the 'real names' we have 2 techniques

1) where adding a unique name to the schema gives a match we do that - here that is
the case for mailing_name
2) otherwise we ensure the schema has a unique name if appropriate &
rename the field in the upgrade scriptt

In this case when we look at CRM_Mailing_BAO_Query we don't see mailing_name
as present (only mailing_id which should be an entity reference field). However it
is used in the confusingly-not-related Mailing search so lets rename this
one at the same time.

4 years agoMerge pull request #15646 from eileenmcnaughton/add_pay
Seamus Lee [Tue, 29 Oct 2019 19:15:10 +0000 (06:15 +1100)]
Merge pull request #15646 from eileenmcnaughton/add_pay

dev/core#1344 Simplify email template logic on displaying billing detail

4 years agoMerge pull request #15626 from demeritcowboy/case-pdf-merge-order
Seamus Lee [Tue, 29 Oct 2019 19:11:48 +0000 (06:11 +1100)]
Merge pull request #15626 from demeritcowboy/case-pdf-merge-order

dev/core#893 - fix misfiled case print/merge pdfs (alternate to PR 15609/15364)

4 years agoMerge pull request #14763 from eileenmcnaughton/payment_3
Eileen McNaughton [Tue, 29 Oct 2019 19:07:20 +0000 (08:07 +1300)]
Merge pull request #14763 from eileenmcnaughton/payment_3

dev/financial#34 Fix line allocation in Payment.create

4 years agofix warning when no searchPane mapping for mode
DemeritCowboy [Tue, 29 Oct 2019 18:43:46 +0000 (14:43 -0400)]
fix warning when no searchPane mapping for mode

4 years agoMerge pull request #15648 from seamuslee001/relationship_date_cleanup_fixes
Eileen McNaughton [Tue, 29 Oct 2019 04:38:28 +0000 (17:38 +1300)]
Merge pull request #15648 from seamuslee001/relationship_date_cleanup_fixes

Cleanup following smart group conversions and fix the old name of the…

4 years agoCleanup following smart group conversions and fix the old name of the relationship...
Seamus Lee [Tue, 29 Oct 2019 01:33:00 +0000 (12:33 +1100)]
Cleanup following smart group conversions and fix the old name of the relationship date relative fields for conversion and add a unit test

4 years agoMerge pull request #15647 from demeritcowboy/regen-upper-lower
Seamus Lee [Tue, 29 Oct 2019 01:45:03 +0000 (12:45 +1100)]
Merge pull request #15647 from demeritcowboy/regen-upper-lower

Allow regen.sh to work with either upper/lower case for CMS name to match elsewhere

4 years agoMerge pull request #15637 from eileenmcnaughton/relationdates
Seamus Lee [Tue, 29 Oct 2019 01:19:19 +0000 (12:19 +1100)]
Merge pull request #15637 from eileenmcnaughton/relationdates

Convert relationship start & end dates to datepicker

4 years agowork with either upper/lower to match elsewhere
demeritcowboy [Tue, 29 Oct 2019 00:10:03 +0000 (20:10 -0400)]
work with either upper/lower to match elsewhere

4 years agoConvert relationship_start_date & relationship_end_date to datepicker
eileen [Mon, 28 Oct 2019 05:02:59 +0000 (18:02 +1300)]
Convert relationship_start_date & relationship_end_date to datepicker

This seems to work OK - look forwards to seeing you kick the tyres on it & see if you find any issues

4 years agoMerge pull request #15635 from eileenmcnaughton/contact_date
Seamus Lee [Mon, 28 Oct 2019 21:47:34 +0000 (08:47 +1100)]
Merge pull request #15635 from eileenmcnaughton/contact_date

dev/core#561 Convert birth_date & deceased_date to datepicker

4 years agoConvert birth_date & deceased_date to datepicker
eileen [Mon, 28 Oct 2019 04:13:07 +0000 (17:13 +1300)]
Convert birth_date & deceased_date to datepicker

4 years agoMerge pull request #15636 from eileenmcnaughton/relationship_date
Seamus Lee [Mon, 28 Oct 2019 20:40:48 +0000 (07:40 +1100)]
Merge pull request #15636 from eileenmcnaughton/relationship_date

Add unique name for relationship start & end dates