Mathieu Lutfy [Wed, 13 Nov 2019 19:56:02 +0000 (14:56 -0500)]
marketing/civicrm-website#163 Mitigate potential upgrade errors on missing msg_templates
Seamus Lee [Mon, 11 Nov 2019 03:19:01 +0000 (14:19 +1100)]
Merge pull request #15804 from eileenmcnaughton/fns
dev/core#1381 fix fatal on case search (unreleased regression
eileen [Mon, 11 Nov 2019 02:03:50 +0000 (15:03 +1300)]
dev/core#1381 fix fatal on case search (unreleased regression
Seamus Lee [Sat, 9 Nov 2019 05:30:13 +0000 (16:30 +1100)]
Merge pull request #15787 from eileenmcnaughton/recur_ug
Remove unhelpful alert from contribution search
Seamus Lee [Sat, 9 Nov 2019 02:57:37 +0000 (13:57 +1100)]
Merge pull request #15789 from seamuslee001/5_19_1_version_notes
5.19.1 Version Release Notes
Tim Otten [Sat, 9 Nov 2019 02:32:54 +0000 (18:32 -0800)]
Update 5.19.1.md
Seamus Lee [Sat, 9 Nov 2019 01:39:44 +0000 (12:39 +1100)]
Add in release notes for 5.19.1 drop
eileen [Sat, 9 Nov 2019 01:12:20 +0000 (14:12 +1300)]
Remove unhelpful alert from contribution search
Seamus Lee [Sat, 9 Nov 2019 00:37:51 +0000 (11:37 +1100)]
Merge pull request #15781 from eileenmcnaughton/cont_search
dev/core#1374 Fix search formValue handling on contribution search
Seamus Lee [Fri, 8 Nov 2019 23:58:17 +0000 (10:58 +1100)]
Merge pull request #15782 from seamuslee001/dev_mailing_56_2
Add in unit test for dev/mailing#56 and dev/mailing#57 and also fix i…
eileen [Fri, 8 Nov 2019 21:42:00 +0000 (10:42 +1300)]
dev/core#1374 Fix search formValue handling on contribution search
This fixes 2 issues
1) Search params being lost when editing a related entity per
https://lab.civicrm.org/dev/core/issues/1374
2) force=1&sort_name=p not working in contribution search url
In digging I concluded the problem is we have 3 underlying arrays which we keep jumbling together
1) formValues - the actual submitted values, augmented by any url passed params
2) the default values - values to load by default on the form
3) our working query params - a copy of formValues that we have prepared for the query
We need to stop mangling them. I added subtle code comments
Seamus Lee [Fri, 8 Nov 2019 22:40:22 +0000 (09:40 +1100)]
Add in unit test for dev/mailing#56 and dev/mailing#57 and also fix issue where by mailing_name has been namespaced also in 5.20
Seamus Lee [Fri, 8 Nov 2019 22:35:25 +0000 (09:35 +1100)]
Merge pull request #15779 from seamuslee001/dev_mailing_56
dev/mailing#56 dev/mailing#57 Ensure that we don't pass in any namesp…
Seamus Lee [Fri, 8 Nov 2019 21:27:41 +0000 (08:27 +1100)]
dev/mailing#56 dev/mailing#57 Ensure that we don't pass in any namespaced fields when building the row array for mailing reports
Seamus Lee [Fri, 8 Nov 2019 20:09:25 +0000 (07:09 +1100)]
Merge pull request #15772 from agh1/5.20.0-releasenotes-initial
5.20.0 release notes initial run
Andrew Hunt [Fri, 8 Nov 2019 17:26:55 +0000 (12:26 -0500)]
5.20.0 release notes: added boilerplate
Andrew Hunt [Fri, 8 Nov 2019 17:21:30 +0000 (12:21 -0500)]
5.20.0 release notes: raw from script
Eileen McNaughton [Fri, 8 Nov 2019 02:19:21 +0000 (15:19 +1300)]
Merge pull request #15765 from seamuslee001/5.20
dev/core#1376 Catch Invalid Argument Exception when looking for APIv4…
Seamus Lee [Thu, 7 Nov 2019 23:07:32 +0000 (10:07 +1100)]
dev/core#1376 Catch Invalid Argument Exception when looking for APIv4 Services
Seamus Lee [Thu, 7 Nov 2019 20:47:49 +0000 (07:47 +1100)]
Merge pull request #15762 from seamuslee001/dev_core_1371
dev/core#1371 Fix e-notice caused by trying to pass in known to the …
Seamus Lee [Thu, 7 Nov 2019 19:25:55 +0000 (06:25 +1100)]
dev/core#1371 Fix e-notice caused by trying to pass in known to the extension downloader when checking requirements
CiviCRM [Thu, 7 Nov 2019 02:11:34 +0000 (02:11 +0000)]
Set version to 5.20.beta1
Seamus Lee [Thu, 7 Nov 2019 01:44:11 +0000 (12:44 +1100)]
Merge pull request #15754 from seamuslee001/master
5.19
Seamus Lee [Thu, 7 Nov 2019 01:43:35 +0000 (12:43 +1100)]
Merge in 5.19
Tim Otten [Thu, 7 Nov 2019 01:39:32 +0000 (17:39 -0800)]
Set version to 5.19.0
Tim Otten [Thu, 7 Nov 2019 01:32:18 +0000 (17:32 -0800)]
Merge pull request #15752 from agh1/5.19.0-releasenotes-final
5.19.0 release notes: added late changes
Tim Otten [Thu, 7 Nov 2019 01:31:27 +0000 (17:31 -0800)]
Update 5.19.0.md
Eileen McNaughton [Thu, 7 Nov 2019 01:26:14 +0000 (14:26 +1300)]
Merge pull request #15751 from magnolia61/workflow_template_contribution_terms
changed wording to Total Fee & Total Paid
Andrew Hunt [Thu, 7 Nov 2019 01:16:33 +0000 (20:16 -0500)]
5.19.0 release notes: added late changes
Eileen McNaughton [Thu, 7 Nov 2019 01:02:14 +0000 (14:02 +1300)]
Merge pull request #15748 from eileenmcnaughton/line_item_belt_braces
Provide precautionary handling for theoretical error scenario.
magnolia61 [Wed, 6 Nov 2019 23:38:40 +0000 (00:38 +0100)]
changed wording to Total Fee & Total Paid
eileen [Wed, 6 Nov 2019 19:40:37 +0000 (08:40 +1300)]
Provide precautionary handling for theoretical error scenario.
While testing payments I hit a bug where I tried to add a payment to a contribution with no financial items.
I never managed to replicate it again or determine how the payment came to be in that state but
it's been playing in my mind that people could get fatal errors if the financial_items don't exist
and dealing with those as regression reports will very tough. So my plan is
- for 5.20 add this extra routine to create it if it does not exist
- use this mechanism + more digging to figure out how legit an issue it is https://github.com/civicrm/civicrm-core/pull/15706
- in future releases 'get noisy' about having to create them if they don't exist
- eventually remove this routine
Seamus Lee [Wed, 6 Nov 2019 23:23:44 +0000 (10:23 +1100)]
Merge pull request #15740 from eileenmcnaughton/partial
dev/financial#40 Fix for non-allocation of payment to fully reversed checkboxes option
Eileen McNaughton [Wed, 6 Nov 2019 22:07:34 +0000 (11:07 +1300)]
Merge pull request #15745 from seamuslee001/master
Update template upgrade list as per PR #15742
Eileen McNaughton [Wed, 6 Nov 2019 21:06:22 +0000 (10:06 +1300)]
Merge pull request #15750 from eileenmcnaughton/except
[NFC] Cleanup on exceptions
Eileen McNaughton [Wed, 6 Nov 2019 21:04:13 +0000 (10:04 +1300)]
Merge pull request #15744 from yashodha/participant_edit
(dev/core#1065) Participant in Edit mode needs to be shown consistently
Seamus Lee [Wed, 6 Nov 2019 20:56:27 +0000 (07:56 +1100)]
Merge pull request #15749 from seamuslee001/Additional_Fixes_to_workflow_templates
Additional fixes to workflow templates
Seamus Lee [Wed, 6 Nov 2019 18:43:57 +0000 (05:43 +1100)]
Update template upgrade list as per PR #15742
eileen [Wed, 6 Nov 2019 20:09:51 +0000 (09:09 +1300)]
Cleanup on exceptions
Fixes a low level function to throw a CRM_Core_Exception & tidies up functions
above to specify that. Fixes casing on a function call, removes a fatal
for status bounce
Seamus Lee [Wed, 6 Nov 2019 19:44:21 +0000 (06:44 +1100)]
Fix Smarty Syntax in payment_or_refund_notification_text template and update unit tests to match the change in langauge in the templates
Eileen McNaughton [Wed, 6 Nov 2019 19:29:45 +0000 (08:29 +1300)]
Merge pull request #15746 from civicrm/5.19
5.19
Seamus Lee [Wed, 6 Nov 2019 19:18:37 +0000 (06:18 +1100)]
Merge pull request #15741 from totten/5.19-volinst
(dev/core#1093) Fix regression during extension activation
Seamus Lee [Wed, 6 Nov 2019 18:35:01 +0000 (05:35 +1100)]
Merge pull request #15743 from eileenmcnaughton/validate_test
Fix test to be more valid
magnolia61 [Wed, 6 Nov 2019 07:52:02 +0000 (08:52 +0100)]
Additional changes to workflow message templates
yashodha [Wed, 6 Nov 2019 09:07:55 +0000 (14:37 +0530)]
(dev/core#1065) Participant in Edit mode needs to be shown consistently
eileen [Wed, 6 Nov 2019 08:51:35 +0000 (21:51 +1300)]
Fix test to be more valid
I've added a check to run after tests & before tearDown to ensure that all payments have the
right entity_financial_trxn records.
This required fixing one ttest to be valid. It's not possible to create a contribution using the
back office for with status set to Partially Paid (it's not an option in the drop down, so
the test should create as Pending & then add a payment to get to partially paid
Tim Otten [Wed, 6 Nov 2019 07:50:16 +0000 (23:50 -0800)]
(dev/core#1093) Fix permission error when activating extension
Overview
--------
This fixes a recent/unreleased regression from #15726 in which the D7 demo build fails.
Before
------
When running `civibuild reinstall ...` on a `drupal-demo` site, it fails at this step:
```
+++ drush -y cvapi extension.install key=org.civicrm.volunteer debug=1
Authorization failed [error]
Array
(
[error_code] => unauthorized
[entity] => Extension
[action] => install
[trace] => #0 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Kernel.php(166): Civi\API\Kernel->authorize(Object(Civi\Api4\Provider\ActionObjectProvider), Object(Civi\Api4\Generic\DAOSaveAction))
1 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/Api4/Generic/AbstractAction.php(235): Civi\API\Kernel->runRequest(Object(Civi\Api4\Generic\DAOSaveAction))
2 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Utils/Migrate/Import.php(374): Civi\Api4\Generic\AbstractAction->execute()
3 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Utils/Migrate/Import.php(82): CRM_Utils_Migrate_Import->customFields(Object(SimpleXMLElement), Array)
4 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/CRM/Volunteer/Upgrader.php(836): CRM_Utils_Migrate_Import->runXmlElement(Object(SimpleXMLElement))
5 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/CRM/Volunteer/Upgrader.php(48): CRM_Volunteer_Upgrader->executeCustomDataTemplateFile('volunteer-custo...')
6 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/CRM/Volunteer/Upgrader/Base.php(306): CRM_Volunteer_Upgrader->install()
7 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/volunteer.civix.php(131): CRM_Volunteer_Upgrader_Base->onInstall()
8 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/volunteer.php(204): _volunteer_civix_civicrm_install()
9 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Extension/Manager/Module.php(76): volunteer_civicrm_install()
10 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Extension/Manager/Module.php(48): CRM_Extension_Manager_Module->callHook(Object(CRM_Extension_Info), 'install')
11 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Extension/Manager.php(264): CRM_Extension_Manager_Module->onPreInstall(Object(CRM_Extension_Info))
12 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/api/v3/Extension.php(58): CRM_Extension_Manager->install(Array)
13 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Provider/MagicFunctionProvider.php(101): civicrm_api3_extension_install(Array)
14 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Kernel.php(168): Civi\API\Provider\MagicFunctionProvider->invoke(Array)
15 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Kernel.php(99): Civi\API\Kernel->runRequest(Array)
16 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/api/api.php(23): Civi\API\Kernel->runSafe('extension', 'install', Array, NULL)
17 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/drupal/drush/civicrm.drush.inc(1557): civicrm_api('extension', 'install', Array)
18 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/command.inc(422): drush_civicrm_api('extension.insta...', 'key=org.civicrm...', 'debug=1')
19 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/command.inc(231): _drush_invoke_hooks(Array, Array)
20 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/command.inc(199): drush_command('extension.insta...', 'key=org.civicrm...', 'debug=1')
21 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/lib/Drush/Boot/BaseBoot.php(67): drush_dispatch(Array)
22 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/preflight.inc(66): Drush\Boot\BaseBoot->bootstrap_and_dispatch()
23 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/startup.inc(465): drush_main()
24 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/startup.inc(369): drush_run_main(false, '/', 'Phar detected. ...')
25 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/drush(114): drush_startup(Array)
26 /Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar(10): require('phar:///Users/t...')
27 {main}
[is_error] => 1
[error_message] => Authorization failed
)
```
After
-----
It works again.
Eileen McNaughton [Wed, 6 Nov 2019 05:35:02 +0000 (18:35 +1300)]
Merge pull request #15738 from agileware/CIVICRM-1354
Fix the relationship direction in testSingleMembershipForTwoRelationships
eileen [Wed, 6 Nov 2019 04:51:20 +0000 (17:51 +1300)]
Fix for non-allocation of payment to fully reversed checkboxes option
This addresses an issue partially identified in https://lab.civicrm.org/dev/financial/issues/98 whereby
civicrm_entity_financial_trxn records for the civicrm_financial_item table are not created when
refunding against line items with a quantity of zero - ie where there were selected checkboxes & they
were reversed.
The reason this check was there relates to former logic - now we have a calculated allocation
we don't need this check.
I want to do a test but need to do a bit of work to get it set up & I think this should hit 5.20
as it relates to an issue identified by Kevin in reviewing patches merged to that version
Eileen McNaughton [Wed, 6 Nov 2019 04:05:26 +0000 (17:05 +1300)]
Merge pull request #15731 from eileenmcnaughton/rel_clean
dev/core#1361 Fix bug where 2 memberships created for same relationship
Eileen McNaughton [Wed, 6 Nov 2019 03:07:46 +0000 (16:07 +1300)]
Merge pull request #15556 from demeritcowboy/convert-label-to-name-2
Upgrade script for dev/core#1046
Pengyi [Wed, 6 Nov 2019 03:04:25 +0000 (14:04 +1100)]
CIVICRM-1354 fix test
Eileen McNaughton [Wed, 6 Nov 2019 02:46:25 +0000 (15:46 +1300)]
Merge pull request #15735 from jitendrapurohit/dev-1367
dev/core#1367 - Incorrect line items recorded with contribution repea…
eileen [Tue, 5 Nov 2019 15:32:08 +0000 (04:32 +1300)]
dev/core#1361 Fix bug where 2 memberships created for same relationship
Fixes a bug (likely recent regression) identified by @agileware-pengyi where duplicate inherited relationships for the same membership were being created
I've been pretty much sweating blood trying to understand the code, & have now resorted to adding a class to
generate a saner data set
Eileen McNaughton [Wed, 6 Nov 2019 02:08:08 +0000 (15:08 +1300)]
Merge pull request #15733 from seamuslee001/payment_process_api4_schema
Schema changes for PaymentProcessor and PaymentProcessorType to suppo…
Eileen McNaughton [Tue, 5 Nov 2019 22:46:22 +0000 (11:46 +1300)]
Merge pull request #15737 from eileenmcnaughton/php73
Php 7.3 fix - don't mis-use continue
Eileen McNaughton [Tue, 5 Nov 2019 22:44:55 +0000 (11:44 +1300)]
Merge pull request #15705 from eileenmcnaughton/refund_fix
Fix Payment.create with a negative value to create the correct financial items
Seamus Lee [Tue, 5 Nov 2019 21:03:52 +0000 (08:03 +1100)]
Merge pull request #15736 from demeritcowboy/remove-old-code
(NFC) Remove windows-specific debugging code from 11 years ago
eileen [Sat, 2 Nov 2019 02:39:16 +0000 (15:39 +1300)]
Fix Payment.create with a negative value to create the correct financial items
The job of a refund in this function turns out to be exactly the same as the a payment. I originally thought the
from & to accounts would be reversed but in fact because we are recording a negative amount that is not the case.
We need the from-to accounts to be the same. The only difference turns out to be the status
of the financialTrxn (Completed vs Refunded it seems).
Without this change the refund code is calling the recordFinancialAccounts function but after stepping
through it I'm sure the only thing that function is doing for it is creating the
FinancialTrxn. It *should* be creating the EntityFinancialItem too but it is not
and the best place for that to be done is in the payment class not in a spaghetti function.
Note that after this we need some robust testing & probably a follow up
patch on the handling of tax items - which is unlikely to be correct since it wasn't in the past
AFAIK and is unchanged.....
However, this fixes an important bug & should be merged as soon as it is confirmed non-regressive
to allow the next one to be investigated
m
eileen [Sat, 2 Nov 2019 02:09:23 +0000 (15:09 +1300)]
Bring recordRefundPayment back into the main function.
It's adding confusion and it turns out it's broken so let's fix properly
eileen [Sat, 2 Nov 2019 02:00:45 +0000 (15:00 +1300)]
Update all payment tests to ensure entity financial items created
Alsothwe had tests for this it turns out they were only checking that they were correct IF created. This
ensures they also exist & is a sanity check to run at the end of tests. The two failing tests are
really failing :-(
eileen [Fri, 1 Nov 2019 02:54:12 +0000 (15:54 +1300)]
Fix double loop on lineItems
Historically the code followed 2 loops - one for the (very rare) situation when an array of
'line_item' was passed in - in fact this array is an array of arrays where each array represents
the id of a line item and the amount to allocate.
The other loop is the main loop that allocates according to a calculation.
This fixes it so that the allocation is correctly merged in if passed in in
getPayableLineItems and from that point we only need one loop.
This simplification is tested via the testCreatePaymentLineItems
which I cleaned up and made more robust. I was able to step through it and identify how
it was working
Seamus Lee [Tue, 5 Nov 2019 21:01:08 +0000 (08:01 +1100)]
Merge pull request #15684 from eileenmcnaughton/legacy_extract
Remove recordPayment function.
eileen [Sat, 2 Nov 2019 05:21:36 +0000 (18:21 +1300)]
Php 7.3 fix - don't mis-use continue
Also fix some casing
Eileen McNaughton [Tue, 5 Nov 2019 20:44:53 +0000 (09:44 +1300)]
Merge pull request #15640 from eileenmcnaughton/pp_pay
Fix Payment.create bug whereby payment_processor_id is not being used for the to_account_id
DemeritCowboy [Tue, 5 Nov 2019 20:17:02 +0000 (15:17 -0500)]
remove debugging code
Jitendra Purohit [Tue, 5 Nov 2019 12:17:08 +0000 (17:47 +0530)]
dev/core#1367 - Incorrect line items recorded with contribution repeattransaction api
Tim Otten [Tue, 5 Nov 2019 06:34:29 +0000 (22:34 -0800)]
Merge pull request #15732 from totten/master-tplaner-when
composer.{json,lock} - Make the "tplaner/when" exception for old PHP reproducible
Seamus Lee [Tue, 5 Nov 2019 05:18:48 +0000 (16:18 +1100)]
Schema changes for PaymentProcessor and PaymentProcessorType to support apiv4 entities
Seamus Lee [Tue, 5 Nov 2019 05:09:23 +0000 (16:09 +1100)]
Merge pull request #15730 from seamuslee001/new_xkerman_package
Add in xkerman/restricted-unserialize package
Tim Otten [Tue, 5 Nov 2019 04:40:14 +0000 (20:40 -0800)]
composer.{json,lock} - Make the "tplaner/when" exception for old PHP reproducible
Overview
--------
The library `tplaner/when` has an inaccurate dependency on php71 and
requires special work to deploy on php70.
Before
------
The `composer.lock` file was manually edited to make it runnable on php70.
However, if you `rm composer.lock && composer install`, then it fails.
After
-----
The `composer.json` and `composer.lock` are more repeatable. If you run
`rm composer.lock && composer install`, then it works.
Comments
--------
This adds a fairly ugly section. However, the good news is that it should
be more transparent - which should make it easier to understand/remove
later.
As a general rule, we don't want to have `civicrm-core.git` depend on
packages/versions that aren't published. This is a somewhat unusual
edge-case - this package/version is published via `packagist.org`. If you
run without this on php71+, then you still get a valid/equivalent package.
All that we've done is to enable running on `php70` (when `civicrm-core` is
a root project).
Seamus Lee [Tue, 5 Nov 2019 03:47:26 +0000 (14:47 +1100)]
Add in xkerman/restricted-unserialize package
Eileen McNaughton [Tue, 5 Nov 2019 03:12:06 +0000 (16:12 +1300)]
Merge pull request #15728 from eileenmcnaughton/rel_clean
[REF] minor code simplification
eileen [Mon, 4 Nov 2019 20:51:37 +0000 (09:51 +1300)]
[REF] minor code simplification
Switches a call to an old function to an api function & removes post filtering.
Currently the code calls an old function which gets all membership ids & then filters on
statuses. This switches to an api call & passes statuses in as a filter
Strong test cover in testSingleMembershipForTwoRelationships which tests these lines in a variety of ways
Matthew Wire [Mon, 4 Nov 2019 23:27:30 +0000 (23:27 +0000)]
Merge pull request #15707 from eileenmcnaughton/setter
dev/financial#82 revert added setters
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…
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'
eileen [Mon, 4 Nov 2019 22:06:46 +0000 (11:06 +1300)]
Re-apply useful cleanups from reverted commits
eileen [Sat, 2 Nov 2019 06:06:12 +0000 (19:06 +1300)]
Revert "dev/financial#77 ++ Make contribution_id mandatory for PaymentProcessor.pay, pass incoieID"
This reverts commit
783b62a7dfe3c94bd69bcb182732b240e53911be.
eileen [Sat, 2 Nov 2019 04:16:33 +0000 (17:16 +1300)]
Revert places where setters are used to set things
These are all new in 5.20 & if we are going to change we should reverse & re-do before cutting 5.20
eileen [Sat, 2 Nov 2019 04:15:01 +0000 (17:15 +1300)]
Revert "Add getters & setters for contributionID on CRM_Core_Payment."
This reverts commit
c28ad54a7194e30033ffed1ad727586546e80db3.
eileen [Sat, 2 Nov 2019 04:14:19 +0000 (17:14 +1300)]
Revert "Add a bunch of additional getters & setters"
This reverts commit
c5884dfddb30e40e06af9ef0f2dc940ad6ae55bd.
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
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
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
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
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
eileen [Mon, 4 Nov 2019 04:56:19 +0000 (17:56 +1300)]
Remove 'recode handling
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
eileen [Fri, 1 Nov 2019 07:02:18 +0000 (20:02 +1300)]
Get rid of jcalendar range in custom data
Eileen McNaughton [Mon, 4 Nov 2019 19:37:33 +0000 (08:37 +1300)]
Merge pull request #15727 from civicrm/5.19
5.19
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
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
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
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
Camilo Rodriguez [Fri, 1 Nov 2019 15:03:39 +0000 (15:03 +0000)]
dev/core#1360: Fix Programatic Installation Of Multiple Extensions
colemanw [Mon, 4 Nov 2019 11:51:32 +0000 (06:51 -0500)]
Merge pull request #15723 from eileenmcnaughton/rel_clean
Eliminate silly parameter
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
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.
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