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
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
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
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
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.
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.
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
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
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
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
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
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
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
eileen [Mon, 28 Oct 2019 03:45:15 +0000 (16:45 +1300)]
Pass dbFieldName to dbFieldName parameter
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.
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
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
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
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
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
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
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
eileen [Sun, 27 Oct 2019 22:17:13 +0000 (11:17 +1300)]
Add call to getSearchFieldMetadata
eileen [Sun, 27 Oct 2019 21:49:48 +0000 (10:49 +1300)]
Change parent class on mailing_form
eileen [Thu, 24 Oct 2019 23:24:28 +0000 (12:24 +1300)]
[REF] simplify definition of isARefund
eileen [Sun, 27 Oct 2019 21:42:20 +0000 (10:42 +1300)]
Add date information to MailingJob Schema
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 …
eileen [Sun, 27 Oct 2019 21:38:52 +0000 (10:38 +1300)]
[NFC] reformat BAO_Case file
eileen [Sun, 27 Oct 2019 21:35:48 +0000 (10:35 +1300)]
Exceptions
Tim Otten [Sun, 27 Oct 2019 20:07:26 +0000 (13:07 -0700)]
Update ArrayDecoratorTest.php
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.
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
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
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
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.
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
Seamus Lee [Sun, 27 Oct 2019 00:57:53 +0000 (11:57 +1100)]
[REF] Throw execptions for invalid type erorrs when aborting
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
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
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
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…
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
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
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
Richard van Oosterhout [Tue, 15 Oct 2019 06:15:07 +0000 (08:15 +0200)]
Include Displayname in some workflow templates
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 …
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
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
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
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
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)
eileen [Sat, 26 Oct 2019 02:54:58 +0000 (15:54 +1300)]
Follow up cleanup
Coleman Watts [Sat, 26 Oct 2019 01:56:06 +0000 (21:56 -0400)]
Api4 explorer: Fix variable leaking to global scope
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
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…
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
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
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
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
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
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
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
Seamus Lee [Fri, 25 Oct 2019 22:26:27 +0000 (09:26 +1100)]
[REF] Remove CRM_Exception in favor of CRM_Core_Exception
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 …
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
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
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.
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.
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
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
Vangelis Pantazis [Fri, 25 Oct 2019 08:23:59 +0000 (09:23 +0100)]
Fixes output if location type is primary
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
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
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
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.
eileen [Thu, 24 Oct 2019 23:33:45 +0000 (12:33 +1300)]
Extract code to update line items to paid
eileen [Mon, 21 Oct 2019 02:13:52 +0000 (15:13 +1300)]
Add a bunch of additional getters & setters
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
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
Seamus Lee [Thu, 24 Oct 2019 21:13:37 +0000 (08:13 +1100)]
Merge pull request #15600 from civicrm/5.19
5.19
eileen [Tue, 15 Oct 2019 00:17:30 +0000 (13:17 +1300)]
Add getters & setters for contributionID on CRM_Core_Payment.
This will enable PaymentProcessor.pay to do ->setContributionID(['contribution_id'])
and set a pattern for definining other standardised parameters.
Seamus Lee [Thu, 24 Oct 2019 20:43:47 +0000 (07:43 +1100)]
Merge pull request #15597 from colemanw/apiPath
Update api3 explorer url path for consistency
Matthew Wire (MJW Consulting) [Tue, 22 Oct 2019 14:27:36 +0000 (15:27 +0100)]
Make getSettingPageFilter() public so we can conditionally load resources in hooks
Seamus Lee [Thu, 24 Oct 2019 19:35:46 +0000 (06:35 +1100)]
Merge pull request #15598 from alifrumin/rn5.19
5.19 Release Notes - first pass of sorting, annotating and editing
Alice Frumin [Fri, 18 Oct 2019 00:14:02 +0000 (20:14 -0400)]
5.19 Release Notes - first pass
Camilo Rodríguez [Thu, 24 Oct 2019 16:38:51 +0000 (11:38 -0500)]
Merge pull request #1 from civicrm/master
Updating Fork with Commits on Base
Coleman Watts [Thu, 24 Oct 2019 15:04:30 +0000 (11:04 -0400)]
Update api3 explorer url path for consistency
Vangelis Pantazis [Thu, 24 Oct 2019 08:51:44 +0000 (09:51 +0100)]
Visual rework on the results of SetProfileDefaults
eileen [Thu, 24 Oct 2019 02:42:37 +0000 (15:42 +1300)]
Remove for-each as silly
eileen [Thu, 24 Oct 2019 02:40:06 +0000 (15:40 +1300)]
Remove IF as always true
eileen [Thu, 24 Oct 2019 02:37:19 +0000 (15:37 +1300)]
[REF] minor refactor towards removing complexity.
This change actually makes the foreach & if following it redundant. I left them out for legibility
but basically all the wrangling is on the 'other' contact. We do just one thing with the 'main'
contact so the whole foreach & if is silly. Will follow up with removal of those
Seamus Lee [Thu, 24 Oct 2019 02:25:10 +0000 (13:25 +1100)]
Merge pull request #15546 from eileenmcnaughton/group_type
dev/core#1321 [test] add unit test to demonstrate behaviour
Seamus Lee [Wed, 23 Oct 2019 21:30:25 +0000 (08:30 +1100)]
Merge pull request #15564 from eileenmcnaughton/deprectate
dev/financial#79 minimal deprecation of Contribution.transact.
Seamus Lee [Wed, 23 Oct 2019 21:29:08 +0000 (08:29 +1100)]
Merge pull request #15591 from eileenmcnaughton/noisy_deprecate_transact
Add noisy deprecation warning to Contribution.transact
eileen [Mon, 21 Oct 2019 03:35:09 +0000 (16:35 +1300)]
dev/financial#79 minimal deprecation of Contribution.transact.
It seems urgent that we so some deprecation of this api - this is the absolute minimum.
More would involve creating some noise when people use it but there
is a separate issue for that. This is just to geet it out of being 'promoted'
by the api explorer
colemanw [Wed, 23 Oct 2019 19:46:16 +0000 (15:46 -0400)]
Merge pull request #15589 from mfb/obsolete-method
Remove obsolete supportStorageOfAccents() method.
eileen [Wed, 23 Oct 2019 19:27:45 +0000 (08:27 +1300)]
Add noisy deprecation warning to Contribution.transact
Note that the Order api has been an adequate replacement for over a year - per efforts by wordpress integration
Alice Frumin [Wed, 23 Oct 2019 17:38:40 +0000 (13:38 -0400)]
add help text to payment processor subject field
mark burdett [Wed, 23 Oct 2019 17:13:09 +0000 (10:13 -0700)]
Remove obsolete method.
colemanw [Wed, 23 Oct 2019 13:44:48 +0000 (09:44 -0400)]
Merge pull request #15504 from mattwire/transact
Extract deprecated Contribution.transact API into it's own file