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

5 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*.

5 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()

5 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()

5 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

5 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)

5 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

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

5 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

5 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

5 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

5 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

5 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

5 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

5 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

5 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

5 years agodev/core#1344 Simplify email template logic on displaying billing detail
eileen [Mon, 28 Oct 2019 20:26:51 +0000 (09:26 +1300)]
dev/core#1344 Simplify email template logic on displaying billing detail

Per https://lab.civicrm.org/dev/core/issues/1344 we currently use complex & fragile logic whereas we can simply display
what we have gathered. Since email templates are already being upgraded this release it feels like a good
opportunity to clean these up too.

This just includes one template - but I'll rip through the rest if this gets merged & people agree

5 years agoMerge pull request #15643 from omarabuhussein/fixing-optionvalues-xml-processing
Eileen McNaughton [Mon, 28 Oct 2019 19:35:43 +0000 (08:35 +1300)]
Merge pull request #15643 from omarabuhussein/fixing-optionvalues-xml-processing

Fixing a fatal error when installing extensions with Option Values defined in XML

5 years agoMerge pull request #15630 from eileenmcnaughton/pay_fail
Eileen McNaughton [Mon, 28 Oct 2019 19:34:22 +0000 (08:34 +1300)]
Merge pull request #15630 from eileenmcnaughton/pay_fail

Fix cancel payment action to reverse financial items related to cancelled payment

5 years agoMerge pull request #15644 from civicrm/5.19
Eileen McNaughton [Mon, 28 Oct 2019 19:33:08 +0000 (08:33 +1300)]
Merge pull request #15644 from civicrm/5.19

5.19 to master

5 years agoMerge pull request #15642 from MiyaNoctem/dev-core-1093-backport-fix-to-v5.19-rc
Eileen McNaughton [Mon, 28 Oct 2019 19:32:36 +0000 (08:32 +1300)]
Merge pull request #15642 from MiyaNoctem/dev-core-1093-backport-fix-to-v5.19-rc

dev/core#1093: Bckport Fix to v.5.19 to Add Custom Fields to Logging Tables

5 years agoFixing a fatal error when installing extensions with Option Values
Omar abu hussein [Mon, 28 Oct 2019 15:55:35 +0000 (15:55 +0000)]
Fixing a fatal error when installing extensions with Option Values
defined in XML

If an Extension has an option value defined in an XML file and the
option value belongs to an option group that is already defined in Civi
But in the XML (e.g activity_type option group) then installing the
extension will result in a fatal error with the following message :

"A fatal error was triggered: One of parameters (value: ) is not of the type Integer"

The error happen because CiviCRM fails to find the option group in the
XML file so it look for it in the database, but the code that look for
it pass the option group name as a SimpleXML object (since SimpleXML
does not return scalar values and rather objects of Type SimpleXML) and
because of that the code won't be able to find the value which will
result in executing a query that expect an integer but rather a NULL
pass to it which result in the fatal error.

I fixed it by casting the option group name inside the SimpleXML object
to string.

5 years agodev/core#1093: Add Custom Fields to Logging Tables
Camilo Rodríguez [Thu, 24 Oct 2019 18:34:54 +0000 (13:34 -0500)]
dev/core#1093: Add Custom Fields to Logging Tables

BulkSave method was adding fields to custom group table, but not to custom
group logging table. If these tables were updated on installation, before all
the schema is synced bewtween main and logging tables, fatal errors would be
thrown, as triggers tried to insert info into log tables missing required
fields.

Fixed by building log table after all fields are added to main table, and
before rebuilding triggers.

5 years agoMerge pull request #15639 from eileenmcnaughton/pay
Eileen McNaughton [Mon, 28 Oct 2019 11:32:51 +0000 (00:32 +1300)]
Merge pull request #15639 from eileenmcnaughton/pay

dev/financial#77 ++ Make contribution_id mandatory for PaymentProcessor.pay, pass invoiceID

5 years agodev/financial#77 ++ Make contribution_id mandatory for PaymentProcessor.pay, pass...
eileen [Mon, 28 Oct 2019 10:05:18 +0000 (23:05 +1300)]
dev/financial#77 ++ Make contribution_id mandatory for PaymentProcessor.pay, pass incoieID

Replaces https://github.com/civicrm/civicrm-core/pull/15477 & also resolves https://lab.civicrm.org/dev/financial/issues/77

by requiring contribution_id for PaymentProcessor.pay as a way to ensure that it is only called after the order is created
per our preferred flow (people could still get past this but it feels like they would at least know they werre
hacking our process & take responsibility for any issues if it breaks or we suddenly start enforcing that
it is a valid contribution.

This also sets some of the recommended variables. Note that I had to use a few more lines to ensure we were always setting
contactID, contributionRecurID to an integer. I do think this stricter approach is better but it wound up
more verbose

5 years agoMerge pull request #15375 from ixiam/dev_issue#1282
Eileen McNaughton [Mon, 28 Oct 2019 09:22:20 +0000 (22:22 +1300)]
Merge pull request #15375 from ixiam/dev_issue#1282

dev/core#1282 Takes care of customfields of type multiselect that were not being rendered

5 years agoMerge pull request #15541 from ixiam/dev_issue#1324
Eileen McNaughton [Mon, 28 Oct 2019 08:08:12 +0000 (21:08 +1300)]
Merge pull request #15541 from ixiam/dev_issue#1324

Adds missing join on the customtable of address customfields while exposed as profile

5 years agoAdd unique name for relationship start & end dates
eileen [Mon, 28 Oct 2019 04:23:06 +0000 (17:23 +1300)]
Add unique name for relationship start & end dates

Preliminary to fixing for datepicker

5 years agoMerge pull request #15634 from eileenmcnaughton/mailing_date
Eileen McNaughton [Mon, 28 Oct 2019 05:12:42 +0000 (18:12 +1300)]
Merge pull request #15634 from eileenmcnaughton/mailing_date

Improve metadata support for table civicrm_mailing_job in search

5 years agoMerge pull request #15633 from seamuslee001/dev_core_561_mailing
Seamus Lee [Mon, 28 Oct 2019 04:32:25 +0000 (15:32 +1100)]
Merge pull request #15633 from seamuslee001/dev_core_561_mailing

dev/core#561 Convert mailing date search field to using datepicker

5 years agoMerge pull request #15631 from eileenmcnaughton/fix_it
Seamus Lee [Mon, 28 Oct 2019 04:04:25 +0000 (15:04 +1100)]
Merge pull request #15631 from eileenmcnaughton/fix_it

[REF] Further deconstruction of updateFinancialAccounts

5 years agoPass dbFieldName to dbFieldName parameter
eileen [Mon, 28 Oct 2019 03:45:15 +0000 (16:45 +1300)]
Pass dbFieldName to dbFieldName parameter

5 years agoImprove metadata support for table civicrm_mailing_job in search
eileen [Mon, 28 Oct 2019 02:56:17 +0000 (15:56 +1300)]
Improve metadata support for table civicrm_mailing_job in search

This makes the civicrm_mailing_job_start_date field available as
metadata and cleans up the code specifying how
civicrm_mailing_job gets joined in.

It turns out the code design has a pretty sensible methodology for ensuring that required
tables are added but unaware of this the tables
got configured all over the place in the where clause
functions.

5 years agodev/core#561 Convert mailing date search field to using datepicker
Seamus Lee [Mon, 28 Oct 2019 02:14:46 +0000 (13:14 +1100)]
dev/core#561 Convert mailing date search field to using datepicker

Some more cleanup and also open tab if specified in the URL

5 years agoMerge pull request #15629 from eileenmcnaughton/mailing_form
Seamus Lee [Sun, 27 Oct 2019 23:49:44 +0000 (10:49 +1100)]
Merge pull request #15629 from eileenmcnaughton/mailing_form

Change parent class on mailing_form

5 years agoMerge pull request #15627 from eileenmcnaughton/nfc
Seamus Lee [Sun, 27 Oct 2019 23:14:15 +0000 (10:14 +1100)]
Merge pull request #15627 from eileenmcnaughton/nfc

[NFC] reformat BAO_Case file

5 years agoFurther deconstruction of updateFinancialAccounts
eileen [Sun, 27 Oct 2019 23:08:01 +0000 (12:08 +1300)]
Further deconstruction of updateFinancialAccounts

updateFinancialAccounts is only called from one place with the context of 'changedStatus'. When called this
way the function updateFinancialAccountsOnContributionStatusChange is called & that 'tells'
the calling function whether to call the rest of this function.

Since this handling is specific to one place from which the function is called we can move that logic
back to the place that calls it & further simplify the updateFinancialAccounts function
which has been a bit of a haven of chaos

5 years agoFix cancel payment action to reverse financial items related to cancelled payment
eileen [Sun, 27 Oct 2019 22:54:53 +0000 (11:54 +1300)]
Fix cancel payment action to reverse financial items related to cancelled payment

The unit test to test & ensure this was failing to pick up that the records were not being created because it iterated
through the created rows & checked they were right but there was no check to ensure the rows were created :-(

This still leaves a gap I think for refunds not tied to a specific payment but that can be a later step

5 years agoMerge pull request #15601 from eileenmcnaughton/items
Seamus Lee [Sun, 27 Oct 2019 22:48:42 +0000 (09:48 +1100)]
Merge pull request #15601 from eileenmcnaughton/items

[REF] simplify definition of isARefund

5 years agoMerge pull request #15628 from eileenmcnaughton/mailing
Seamus Lee [Sun, 27 Oct 2019 22:48:23 +0000 (09:48 +1100)]
Merge pull request #15628 from eileenmcnaughton/mailing

[NFC] Add date information to MailingJob Schema

5 years agoAdd call to getSearchFieldMetadata
eileen [Sun, 27 Oct 2019 22:17:13 +0000 (11:17 +1300)]
Add call to getSearchFieldMetadata

5 years agoChange parent class on mailing_form
eileen [Sun, 27 Oct 2019 21:49:48 +0000 (10:49 +1300)]
Change parent class on mailing_form

5 years ago[REF] simplify definition of isARefund
eileen [Thu, 24 Oct 2019 23:24:28 +0000 (12:24 +1300)]
[REF] simplify definition of isARefund

5 years agoAdd date information to MailingJob Schema
eileen [Sun, 27 Oct 2019 21:42:20 +0000 (10:42 +1300)]
Add date information to MailingJob Schema

5 years agoMerge pull request #15625 from seamuslee001/e2e_cache_debugging
Seamus Lee [Sun, 27 Oct 2019 21:44:14 +0000 (08:44 +1100)]
Merge pull request #15625 from seamuslee001/e2e_cache_debugging

[NFC] Add in debugging to try and resolve E2E Cache intermitant test …

5 years ago[NFC] reformat BAO_Case file
eileen [Sun, 27 Oct 2019 21:38:52 +0000 (10:38 +1300)]
[NFC] reformat BAO_Case file

5 years agoExceptions
eileen [Sun, 27 Oct 2019 21:35:48 +0000 (10:35 +1300)]
Exceptions

5 years agoUpdate ArrayDecoratorTest.php
Tim Otten [Sun, 27 Oct 2019 20:07:26 +0000 (13:07 -0700)]
Update ArrayDecoratorTest.php

5 years agofix misfiled pdf merges
DemeritCowboy [Sun, 27 Oct 2019 12:18:35 +0000 (08:18 -0400)]
fix misfiled pdf merges

5 years agoMerge pull request #15613 from eileenmcnaughton/lines_extract
Matthew Wire [Sun, 27 Oct 2019 12:50:00 +0000 (12:50 +0000)]
Merge pull request #15613 from eileenmcnaughton/lines_extract

[REF] extract chunk of code that creates the financial items for a given line.

5 years agoExtract code to calculate how much of a line item has been paid
eileen [Sat, 26 Oct 2019 22:02:51 +0000 (11:02 +1300)]
Extract code to calculate how much of a line item has been paid

5 years agodev/financial#34 Fix line allocation in Payment.create
eileen [Tue, 9 Jul 2019 09:47:25 +0000 (21:47 +1200)]
dev/financial#34 Fix line allocation in Payment.create

Cast result of getContributionBalance to float to match comment block.

Without this it is possible for it to return 'null' which is not useful / in keeping. I did a bit of an audit &
did not find places where this would cause an === comparison to fail

5 years ago[NFC] Add in debugging to try and resolve E2E Cache intermitant test failures
Seamus Lee [Sun, 27 Oct 2019 03:02:40 +0000 (14:02 +1100)]
[NFC] Add in debugging to try and resolve E2E Cache intermitant test failures

5 years agoMerge pull request #15620 from eileenmcnaughton/order
Seamus Lee [Sun, 27 Oct 2019 02:45:14 +0000 (13:45 +1100)]
Merge pull request #15620 from eileenmcnaughton/order

Fix test setup Function to use order api

5 years agoMerge pull request #15623 from seamuslee001/type_check_exceptions
Seamus Lee [Sun, 27 Oct 2019 02:42:28 +0000 (13:42 +1100)]
Merge pull request #15623 from seamuslee001/type_check_exceptions

dev/core#560 [REF] Throw exceptions for invalid type errors when aborting

5 years agoMerge pull request #15621 from eileenmcnaughton/float
Seamus Lee [Sun, 27 Oct 2019 02:13:55 +0000 (13:13 +1100)]
Merge pull request #15621 from eileenmcnaughton/float

Cast result of getContributionBalance to float to match comment block.

5 years agoFix test setup Function to use order api
eileen [Sat, 26 Oct 2019 23:35:28 +0000 (12:35 +1300)]
Fix test setup Function to use order api

After ongoing issues resolving https://github.com/civicrm/civicrm-core/pull/14763 I have concluded the underlying
issue on the failing tests is the test setup. Specifically the use of 'partial_amount_to_pay' does not
create the correct underlying entities - it 'sort of' creates a payment without linking it to
the financial items.

These parameters are part of our first attempt at partial payments. I am removing them from the test here but
will deprecate later from other places in the code

5 years ago[REF] Throw execptions for invalid type erorrs when aborting
Seamus Lee [Sun, 27 Oct 2019 00:57:53 +0000 (11:57 +1100)]
[REF] Throw execptions for invalid type erorrs when aborting

5 years agoMerge pull request #15622 from eileenmcnaughton/deprecate_bad
Seamus Lee [Sun, 27 Oct 2019 00:44:58 +0000 (11:44 +1100)]
Merge pull request #15622 from eileenmcnaughton/deprecate_bad

Change test to use preferred methods, fix revealed money bug

5 years agoChange test to use preferred methods, fix revealed money bug
eileen [Sat, 26 Oct 2019 23:56:01 +0000 (12:56 +1300)]
Change test to use preferred methods, fix revealed money bug

In switching this test over I found that Payment.create does not handle cleaning money - which it should to bring it
into line with Contribution.create api

5 years agoCast result of getContributionBalance to float to match comment block.
eileen [Sat, 26 Oct 2019 21:43:56 +0000 (10:43 +1300)]
Cast result of getContributionBalance to float to match comment block.

Without this it is possible for it to return 'null' which is not useful / in keeping. I did a bit of an audit &
did not find places where this would cause an === comparison to fail

5 years agoMerge pull request #15619 from seamuslee001/fix_force_case_form_date
Eileen McNaughton [Sat, 26 Oct 2019 21:25:04 +0000 (10:25 +1300)]
Merge pull request #15619 from seamuslee001/fix_force_case_form_date

Ensure that using case_start_date_high and case_start_date_low etc in…

5 years agoMerge pull request #15513 from magnolia61/Display_name_in_some_workflow_templates
Seamus Lee [Sat, 26 Oct 2019 20:23:00 +0000 (07:23 +1100)]
Merge pull request #15513 from magnolia61/Display_name_in_some_workflow_templates

dev/core#1320 Include displayname in subjects to prevent grouping in email clients

5 years agoEnsure that using case_start_date_high and case_start_date_low etc in url variables...
Seamus Lee [Sat, 26 Oct 2019 19:28:44 +0000 (06:28 +1100)]
Ensure that using case_start_date_high and case_start_date_low etc in url variables works in force=1 mode

5 years agoMerge pull request #15618 from eileenmcnaughton/case_from_to
Seamus Lee [Sat, 26 Oct 2019 19:26:35 +0000 (06:26 +1100)]
Merge pull request #15618 from eileenmcnaughton/case_from_to

Case datepicker field conversion - Follow up cleanup

5 years agoInclude Displayname in some workflow templates
Richard van Oosterhout [Tue, 15 Oct 2019 06:15:07 +0000 (08:15 +0200)]
Include Displayname in some workflow templates

5 years agoMerge pull request #15614 from seamuslee001/convert_case_date_jcalendar
Eileen McNaughton [Sat, 26 Oct 2019 10:04:02 +0000 (23:04 +1300)]
Merge pull request #15614 from seamuslee001/convert_case_date_jcalendar

dev/core#561 Convert Case date fields on search forms from jcalendar …

5 years agoMerge pull request #15616 from eileenmcnaughton/qill
Seamus Lee [Sat, 26 Oct 2019 09:34:49 +0000 (20:34 +1100)]
Merge pull request #15616 from eileenmcnaughton/qill

Minimal fix for new enotice on case.subject

5 years agodev/core#561 Convert Case date fields on search forms from jcalendar to datepicker
Seamus Lee [Sat, 26 Oct 2019 00:07:52 +0000 (11:07 +1100)]
dev/core#561 Convert Case date fields on search forms from jcalendar to datepicker

Swap to using buildDateRangeQuery function

Fix notice error and generically handle cases where we have specified to use the LIKE operator for strings

5 years agoMerge pull request #15580 from jaapjansma/dev_1205
Eileen McNaughton [Sat, 26 Oct 2019 06:15:07 +0000 (19:15 +1300)]
Merge pull request #15580 from jaapjansma/dev_1205

Issue 1205: allow custom fields of type file for entities

5 years agoMerge pull request #15615 from colemanw/explorerFix
Eileen McNaughton [Sat, 26 Oct 2019 06:11:30 +0000 (19:11 +1300)]
Merge pull request #15615 from colemanw/explorerFix

Api4 explorer: Fix variable leaking to global scope

5 years agoMinimal fix for new enotice on case.subject
eileen [Sat, 26 Oct 2019 03:09:53 +0000 (16:09 +1300)]
Minimal fix for new enotice on case.subject

The new enotice is caused by treating it as a LIKE string rather than a strict match (which is generally
a good thing)

5 years agoFollow up cleanup
eileen [Sat, 26 Oct 2019 02:54:58 +0000 (15:54 +1300)]
Follow up cleanup

5 years agoApi4 explorer: Fix variable leaking to global scope
Coleman Watts [Sat, 26 Oct 2019 01:56:06 +0000 (21:56 -0400)]
Api4 explorer: Fix variable leaking to global scope

5 years agoMerge pull request #15370 from JMAConsulting/core-692-2
Eileen McNaughton [Sat, 26 Oct 2019 00:35:28 +0000 (13:35 +1300)]
Merge pull request #15370 from JMAConsulting/core-692-2

Core/dev#692 : Support search arguments to Case Search form

5 years agoMerge pull request #15611 from seamuslee001/ref_deleteentry_ussage
Seamus Lee [Sat, 26 Oct 2019 00:31:00 +0000 (11:31 +1100)]
Merge pull request #15611 from seamuslee001/ref_deleteentry_ussage

[REF] Remove usage of CRM_ACL_BAO_Cache::deleteEntry in favour of usi…

5 years agoMerge pull request #15608 from seamuslee001/more_fatal_exception
Seamus Lee [Sat, 26 Oct 2019 00:10:16 +0000 (11:10 +1100)]
Merge pull request #15608 from seamuslee001/more_fatal_exception

dev/core#560 Convert some more CRM_Core_Error::fatal to exception

5 years agoMerge pull request #15610 from seamuslee001/remove_crm_exception
Seamus Lee [Sat, 26 Oct 2019 00:07:01 +0000 (11:07 +1100)]
Merge pull request #15610 from seamuslee001/remove_crm_exception

[REF] Remove CRM_Exception in favour of CRM_Core_Exception

5 years ago[REF] extract chunk of code that creates tthe financial items for a given line.
eileen [Fri, 25 Oct 2019 23:44:48 +0000 (12:44 +1300)]
[REF] extract chunk of code that creates tthe financial items for a given line.

Private function since more refactoring steps can follow

5 years ago[REF] Remove usage of CRM_ACL_BAO_Cache::deleteEntry in favour of using functions...
Seamus Lee [Fri, 25 Oct 2019 23:30:23 +0000 (10:30 +1100)]
[REF] Remove usage of CRM_ACL_BAO_Cache::deleteEntry in favour of using functions that just delete from the ACL caches

5 years agoMerge pull request #15578 from mattwire/redundant_format
Eileen McNaughton [Fri, 25 Oct 2019 22:58:41 +0000 (11:58 +1300)]
Merge pull request #15578 from mattwire/redundant_format

Remove a redundant call to formatParamsForPaymentProcessor in AdditionalPayment form

5 years agodev/core#560 Convert some more CRM_Core_Error::fatal to exception
Seamus Lee [Fri, 25 Oct 2019 20:53:52 +0000 (07:53 +1100)]
dev/core#560 Convert some more CRM_Core_Error::fatal to exception

Switch from statusBounce to Exception in CRM_Mailing_BAO_Mailing::checkPermission as not on form layer

5 years agoMerge pull request #15599 from MiyaNoctem/dev-core-1093-fix-issue-when-updating-custo...
Eileen McNaughton [Fri, 25 Oct 2019 22:28:50 +0000 (11:28 +1300)]
Merge pull request #15599 from MiyaNoctem/dev-core-1093-fix-issue-when-updating-custom-fields-with.logging

dev/core#1093: Fix Issue When Updating Custom Fields With Logging Enabled

5 years ago[REF] Remove CRM_Exception in favor of CRM_Core_Exception
Seamus Lee [Fri, 25 Oct 2019 22:26:27 +0000 (09:26 +1100)]
[REF] Remove CRM_Exception in favor of CRM_Core_Exception

5 years agoMerge pull request #15607 from eileenmcnaughton/matt_tidy
Eileen McNaughton [Fri, 25 Oct 2019 22:15:56 +0000 (11:15 +1300)]
Merge pull request #15607 from eileenmcnaughton/matt_tidy

[NFC] comments tidy up …

5 years ago[NFC] comments tidy up per https://github.com/civicrm/civicrm-core/pull/15479
eileen [Fri, 25 Oct 2019 20:49:07 +0000 (09:49 +1300)]
[NFC] comments tidy up per https://github.com/civicrm/civicrm-core/pull/15479

5 years agoMerge pull request #15604 from mattwire/multiplelocks
Eileen McNaughton [Fri, 25 Oct 2019 20:29:42 +0000 (09:29 +1300)]
Merge pull request #15604 from mattwire/multiplelocks

Remove CIVICRM_SUPPORT_MULTIPLE_LOCKS and make it always enabled if available

5 years agodev/core#1093: Add Custom Fields to Logging Tables
Camilo Rodríguez [Thu, 24 Oct 2019 18:34:54 +0000 (13:34 -0500)]
dev/core#1093: Add Custom Fields to Logging Tables

BulkSave method was adding fields to custom group table, but not to custom
group logging table. If these tables were updated on installation, before all
the schema is synced bewtween main and logging tables, fatal errors would be
thrown, as triggers tried to insert info into log tables missing required
fields.

Fixed by building log table after all fields are added to main table, and
before rebuilding triggers.

5 years agoMerge pull request #15594 from eileenmcnaughton/dedupe2
Matthew Wire [Fri, 25 Oct 2019 09:51:22 +0000 (10:51 +0100)]
Merge pull request #15594 from eileenmcnaughton/dedupe2

[REF] minor refactor towards removing complexity.

5 years agoMerge pull request #15590 from alifrumin/subjecthelp
Matthew Wire [Fri, 25 Oct 2019 09:46:37 +0000 (10:46 +0100)]
Merge pull request #15590 from alifrumin/subjecthelp

Add help text to payment processor subject field

5 years agoRemove CIVICRM_SUPPORT_MULTIPLE_LOCKS and make it always enabled if available
Matthew Wire (MJW Consulting) [Fri, 25 Oct 2019 09:36:54 +0000 (10:36 +0100)]
Remove CIVICRM_SUPPORT_MULTIPLE_LOCKS and make it always enabled if available

5 years agoFixes output if location type is primary
Vangelis Pantazis [Fri, 25 Oct 2019 08:23:59 +0000 (09:23 +0100)]
Fixes output if location type is primary

5 years agoMerge pull request #15603 from seamuslee001/nfc_acl_doc_block_update
Eileen McNaughton [Fri, 25 Oct 2019 03:00:50 +0000 (16:00 +1300)]
Merge pull request #15603 from seamuslee001/nfc_acl_doc_block_update

[NFC] dev/core#1336 Update doc blocks for various ACL related functions

5 years agoMerge pull request #15602 from eileenmcnaughton/item_2
Seamus Lee [Fri, 25 Oct 2019 01:01:24 +0000 (12:01 +1100)]
Merge pull request #15602 from eileenmcnaughton/item_2

[REF] minor extraction - Extract code to update line items to paid

5 years ago[NFC] dev/core#1336 Update doc blocks for various ACL related functions
Seamus Lee [Fri, 25 Oct 2019 00:38:43 +0000 (11:38 +1100)]
[NFC] dev/core#1336 Update doc blocks for various ACL related functions

5 years agoMerge pull request #15509 from eileenmcnaughton/setter
Seamus Lee [Fri, 25 Oct 2019 00:31:51 +0000 (11:31 +1100)]
Merge pull request #15509 from eileenmcnaughton/setter

dev/financial#82 Add getters & setters for contributionID on CRM_Core_Payment.

5 years agoExtract code to update line items to paid
eileen [Thu, 24 Oct 2019 23:33:45 +0000 (12:33 +1300)]
Extract code to update line items to paid

5 years agoAdd a bunch of additional getters & setters
eileen [Mon, 21 Oct 2019 02:13:52 +0000 (15:13 +1300)]
Add a bunch of additional getters & setters

5 years agoMerge pull request #15576 from mattwire/settingtraitfilter
Seamus Lee [Thu, 24 Oct 2019 22:16:19 +0000 (09:16 +1100)]
Merge pull request #15576 from mattwire/settingtraitfilter

Generic Settings Pages: Make getSettingPageFilter() public so we can use it in hooks

5 years agoMerge pull request #15503 from magnolia61/Generalize_Thank_You_in_Message_Templates
Seamus Lee [Thu, 24 Oct 2019 21:21:00 +0000 (08:21 +1100)]
Merge pull request #15503 from magnolia61/Generalize_Thank_You_in_Message_Templates

dev/core#1316 Update 'Thank You' & other corrections