Eileen McNaughton [Tue, 11 Jan 2022 18:37:58 +0000 (07:37 +1300)]
Revert membership debug handling in IPN
A looong time ago we added handling for the possibility of messed up memberships going through
the paypal IPN. https://github.com/civicrm/civicrm-core/pull/15053
At the time we added a lot of debug to see if it was ever hit as the handling was
an attempt to figure out a bug that we couldn't reproduce. We never got any
evidence the debug was hit or the fix helped - but
it does create a lot of code complexity and makes clean up
more difficult so
this removes it again....
Seamus Lee [Tue, 11 Jan 2022 04:54:14 +0000 (15:54 +1100)]
Merge pull request #22456 from eileenmcnaughton/legt
Remove & deprecate silly function
Eileen McNaughton [Tue, 11 Jan 2022 02:09:27 +0000 (15:09 +1300)]
Merge pull request #22064 from colemanw/civigrant
Migrate CiviGrant component to an extension
Eileen McNaughton [Tue, 11 Jan 2022 01:40:45 +0000 (14:40 +1300)]
Merge pull request #22264 from sunilpawar/dev_recurring_error
Fix Fatal Error on contribution tab and user dashboard when recurring payment generated using extension get disabled
Seamus Lee [Tue, 11 Jan 2022 01:38:57 +0000 (12:38 +1100)]
Merge pull request #22462 from eileenmcnaughton/inv2
Remove unused variable
Eileen McNaughton [Mon, 10 Jan 2022 19:33:14 +0000 (08:33 +1300)]
Remove & deprecate silly function
This function just calls another function & it's slightly MORE complicted to call that then the function
it calls - deprecate it....
Eileen McNaughton [Tue, 11 Jan 2022 01:08:02 +0000 (14:08 +1300)]
Merge pull request #22455 from eileenmcnaughton/legg
Remove IF that only loops through one value
colemanw [Tue, 11 Jan 2022 00:38:10 +0000 (19:38 -0500)]
Merge pull request #22421 from eileenmcnaughton/tax
Replace all isset checks on line.tax_rate
Eileen McNaughton [Tue, 11 Jan 2022 00:15:06 +0000 (13:15 +1300)]
Merge pull request #22453 from braders/autorespond-failure
Fix syntax error in CRM_Mailing_Event_BAO_Reply
Seamus Lee [Mon, 10 Jan 2022 23:14:48 +0000 (10:14 +1100)]
Merge pull request #22313 from mlutfy/eventDefaultUrlValues
Event Registration: allow default Price Set values from the URL
colemanw [Mon, 10 Jan 2022 21:34:50 +0000 (16:34 -0500)]
Merge pull request #22457 from eileenmcnaughton/label
Mark function as private
Eileen McNaughton [Mon, 10 Jan 2022 21:32:56 +0000 (10:32 +1300)]
Remove unused variable
Eileen McNaughton [Mon, 10 Jan 2022 21:29:39 +0000 (10:29 +1300)]
Merge pull request #22460 from civicrm/5.46
5.46
Seamus Lee [Mon, 10 Jan 2022 21:24:00 +0000 (08:24 +1100)]
Merge pull request #22445 from eileenmcnaughton/546
Use field value function to get html signature
Eileen McNaughton [Mon, 10 Jan 2022 21:14:47 +0000 (10:14 +1300)]
Merge pull request #22454 from braders/phpdoc-types
A whole bunch of phpdoc fixes
Eileen McNaughton [Sat, 8 Jan 2022 07:50:21 +0000 (20:50 +1300)]
Ensure tax is set when it comes form Order BAO
Eileen McNaughton [Sat, 8 Jan 2022 03:53:00 +0000 (16:53 +1300)]
Replace all isset checks on line.tax_rate
It is actually always set here
https://github.com/civicrm/civicrm-core/blob/
64f4eebe75dbaeb429abcaa4dfca90094ce8be20/CRM/Price/BAO/LineItem.php#L246-L253
Eileen McNaughton [Mon, 10 Jan 2022 19:22:14 +0000 (08:22 +1300)]
Remove IF that only loops through one value
Eileen McNaughton [Mon, 10 Jan 2022 19:47:38 +0000 (08:47 +1300)]
Mark function as private
I did a universe search & this is not called outside this class (the
one on the LabelCommon class is called from one place outside that class
Bradley Taylor [Mon, 10 Jan 2022 19:13:26 +0000 (19:13 +0000)]
A whole bunch of phpdoc fixes
Bradley Taylor [Mon, 10 Jan 2022 18:29:24 +0000 (18:29 +0000)]
Fix syntax error in CRM_Mailing_Event_BAO_Reply
Coleman Watts [Fri, 7 Jan 2022 20:37:07 +0000 (15:37 -0500)]
CiviGrant - Regenerate SQL
Coleman Watts [Mon, 15 Nov 2021 17:09:12 +0000 (12:09 -0500)]
CiviGrant - Install extension + managed entities during upgrade
Disable & delete component, install extension as either "enabled" or "disabled" depending on the status of the component.
Migrate option values to managed entities
Migrate navigation menu to extension managed entities
Coleman Watts [Thu, 18 Nov 2021 21:56:18 +0000 (16:56 -0500)]
CiviGrant - Migrate legacy search query code
This fixes up the `CRM_Contact_BAO_Query_Interface` class which had incorrectly
omitted `static` from some static functions.
Adds defaultReurnProperties to search hook interface.
Coleman Watts [Thu, 18 Nov 2021 21:54:17 +0000 (16:54 -0500)]
CiviGrant - Remove or mitigate hardcoded references to civicrm_grant table in core
Removes CiviGrant from hardcoded lists when possible, or at least puts up
guards to check that it's available before attempting to use it.
Coleman Watts [Thu, 18 Nov 2021 00:35:55 +0000 (19:35 -0500)]
CiviGrant - Move unit tests
Coleman Watts [Fri, 12 Nov 2021 20:27:26 +0000 (15:27 -0500)]
CiviGrant - Move report files
Coleman Watts [Fri, 12 Nov 2021 19:45:16 +0000 (14:45 -0500)]
CiviGrant - Migrate schema files
Insert and then delete CiviGrant to avoid messing up legacy code with expectations of component IDs.
Coleman Watts [Fri, 12 Nov 2021 14:44:26 +0000 (09:44 -0500)]
CiviGrant - Migrate component functions to hooks
Coleman Watts [Fri, 12 Nov 2021 14:30:29 +0000 (09:30 -0500)]
CiviGrant - Move CRM & API code from core to extension
Coleman Watts [Fri, 12 Nov 2021 14:22:57 +0000 (09:22 -0500)]
Generate CiviGrant extension
colemanw [Mon, 10 Jan 2022 13:28:40 +0000 (08:28 -0500)]
Merge pull request #22439 from eileenmcnaughton/legt
Simplify variables pass in & out of function
colemanw [Mon, 10 Jan 2022 13:26:20 +0000 (08:26 -0500)]
Merge pull request #22447 from eileenmcnaughton/legg
Remove if & foreach that no longer do anything
colemanw [Mon, 10 Jan 2022 13:24:22 +0000 (08:24 -0500)]
Merge pull request #22446 from eileenmcnaughton/php4
Remove call to php 4 function
Eileen McNaughton [Sun, 9 Jan 2022 23:52:45 +0000 (12:52 +1300)]
Simplify variables pass in & out of function
Rather than compiling an array, pass in the 3 values. Also
its now obvious that there is only a max of 1 contact_check in the function
so just return rather than 'continuing' (allowing us to de-loop in a more
whitespacey follow up)
Eileen McNaughton [Mon, 10 Jan 2022 03:21:41 +0000 (16:21 +1300)]
Remove if & foreach that no longer do anything
Eileen McNaughton [Mon, 10 Jan 2022 03:14:50 +0000 (16:14 +1300)]
Remove call to php 4 function
This CRM-2122 seems to be php4 thing - it won't exist anymore
https://php.uz/manual/en/function.fribidi-log2vis.php
Eileen McNaughton [Mon, 10 Jan 2022 02:37:23 +0000 (15:37 +1300)]
Use field value function to get html signature
The function is used for all other tokens on the contact object and will better access
the right value and return an empty string rather NULL if not set.
I hit this as an enotice writing a test - but it is possibly the cause of this issue
https://github.com/eileenmcnaughton/nz.co.fuzion.civitoken/issues/58#issuecomment-
966611004
hence targetting the rc
The tokens() function does weird things if you pass it NULL
Seamus Lee [Mon, 10 Jan 2022 02:30:52 +0000 (13:30 +1100)]
Merge pull request #22440 from eileenmcnaughton/legg
Clean up input and outputs
colemanw [Mon, 10 Jan 2022 01:56:55 +0000 (20:56 -0500)]
Merge pull request #22441 from civicrm/5.46
5.46
colemanw [Mon, 10 Jan 2022 00:40:09 +0000 (19:40 -0500)]
Merge pull request #22435 from colemanw/subscriptionHistory
APIv4 - Add SubscriptionHistory entity
colemanw [Mon, 10 Jan 2022 00:39:19 +0000 (19:39 -0500)]
Merge pull request #22436 from eileenmcnaughton/noticeme
Enotice fix
Eileen McNaughton [Mon, 10 Jan 2022 00:25:54 +0000 (13:25 +1300)]
Merge pull request #22437 from MegaphoneJon/broken-search-urls
fixes report#93: SearchKit shows broken external URLs
demeritcowboy [Mon, 10 Jan 2022 00:02:40 +0000 (19:02 -0500)]
Merge pull request #22429 from colemanw/fixMoneyType2
Fix input type for smarty number formatting (more forgiving)
Eileen McNaughton [Mon, 10 Jan 2022 00:01:30 +0000 (13:01 +1300)]
Clean up input and outputs
By grepping universe we can see that params['contact_check'] only ever has one value when called
from the supported core place and the unsupported jma grant application extension place.
By clarifying that here we can do further cleanup without having to re-search universe...
Eileen McNaughton [Sun, 9 Jan 2022 23:43:55 +0000 (12:43 +1300)]
Merge pull request #22428 from civicrm/5.46
5.46
Eileen McNaughton [Sun, 9 Jan 2022 23:30:00 +0000 (12:30 +1300)]
Merge pull request #20884 from MegaphoneJon/financial-89
don't allow multiple currencies in a batch
Seamus Lee [Sun, 9 Jan 2022 23:06:12 +0000 (10:06 +1100)]
Merge pull request #22431 from eileenmcnaughton/leg
[REF] Rename variable to be meaningful
Jon Goldberg [Sun, 9 Jan 2022 22:48:33 +0000 (17:48 -0500)]
fixes report#93: SearchKit shows broken external URLs
Eileen McNaughton [Sun, 9 Jan 2022 22:39:58 +0000 (11:39 +1300)]
Enotice fix
Coleman Watts [Sun, 9 Jan 2022 22:27:33 +0000 (17:27 -0500)]
APIv4 - Add SubscriptionHistory entity
Coleman Watts [Sat, 8 Jan 2022 22:10:02 +0000 (17:10 -0500)]
Fix input type for smarty number formatting
Some smarty templates pass NULL to crmMoney, so it needs to handle that possibilty
Eileen McNaughton [Sun, 9 Jan 2022 22:06:54 +0000 (11:06 +1300)]
Merge pull request #22430 from colemanw/navigationDefaults
Navigation - Make required fields NOT NULL
Eileen McNaughton [Sun, 9 Jan 2022 22:05:29 +0000 (11:05 +1300)]
Merge pull request #22433 from braders/gotv-tpl-formatting
[REF] Tidy up formatting in gotv.tpl, remove extra </div>
Eileen McNaughton [Sun, 9 Jan 2022 22:02:17 +0000 (11:02 +1300)]
Merge pull request #22432 from braders/tidy-report-template-code
Tidy CRM_Report_Page_Options code
colemanw [Sun, 9 Jan 2022 15:40:26 +0000 (10:40 -0500)]
Merge pull request #22434 from braders/phpdoc-class-reference-fixes
Fix class references in phpdoc comments
Bradley Taylor [Sun, 9 Jan 2022 11:56:30 +0000 (11:56 +0000)]
Fix class references in phpdoc comments
Bradley Taylor [Sun, 9 Jan 2022 11:06:16 +0000 (11:06 +0000)]
Tidy up formatting in gotv.tpl, fix missing </div>
Eileen McNaughton [Thu, 6 Jan 2022 21:30:09 +0000 (10:30 +1300)]
[REF] Rename variable to be meaningful
It turns out key is organizationID - rename ...
I did this in both places the function is called from - as I clean up the copy some
cleanups on the original emerge too
colemanw [Sun, 9 Jan 2022 04:35:30 +0000 (23:35 -0500)]
Merge pull request #22401 from eileenmcnaughton/legit
[REF] Stop returning unused variables
Eileen McNaughton [Sun, 9 Jan 2022 04:24:58 +0000 (17:24 +1300)]
Merge pull request #22426 from colemanw/writeRecordsCustom
[REF] Centralize BAO handling of custom data
Coleman Watts [Sun, 9 Jan 2022 02:51:03 +0000 (21:51 -0500)]
Navigation - Make required fields NOT NULL
Coleman Watts [Sun, 9 Jan 2022 02:27:03 +0000 (21:27 -0500)]
APIv3 Navigation - Add defaults so generic writeRecord can be used instead of BAO::add
Seamus Lee [Sat, 8 Jan 2022 22:19:49 +0000 (09:19 +1100)]
Merge pull request #22418 from demeritcowboy/isdir-7-8-546
[NFC] isDir unit test fails on php 7 'min' matrix
demeritcowboy [Sat, 8 Jan 2022 21:28:11 +0000 (16:28 -0500)]
Merge pull request #22420 from eileenmcnaughton/case
Remove / deprecate case param handling
demeritcowboy [Sat, 8 Jan 2022 21:03:25 +0000 (16:03 -0500)]
Merge pull request #22425 from braders/remove-htmlfile-rule
Remove htmlFile validation rule, as it can't possibly work.
colemanw [Sat, 8 Jan 2022 19:31:11 +0000 (14:31 -0500)]
Merge pull request #22417 from eileenmcnaughton/construct
Fight back against copy & paste gone wild
Bradley Taylor [Sat, 8 Jan 2022 19:17:08 +0000 (19:17 +0000)]
Tidy CRM_Report_Page_Options code
Coleman Watts [Sat, 8 Jan 2022 19:13:12 +0000 (14:13 -0500)]
APIv3 - Refactor basic_create to use writeRecords when create/add functions are deprecated
- Stops passing the deprecated `$ids` param to BAO::create
- Uses BAO::writeRecord when BAO::create or BAO::add are `@deprecated`
- Trust BAO::writeRecord to handle custom data
Coleman Watts [Fri, 7 Jan 2022 05:49:43 +0000 (00:49 -0500)]
DAO - Update writeRecords function to also save custom data
Refactors a couple BAOs which use writeRecords, as they no longer need to
write the custom data themselves.
Bradley Taylor [Sat, 8 Jan 2022 17:59:27 +0000 (17:59 +0000)]
Remove htmlFile validation rule,
as it can't possibly work.
colemanw [Sat, 8 Jan 2022 15:31:25 +0000 (10:31 -0500)]
Merge pull request #22424 from braders/query-param-phpdoc-fixes
Fix phpdoc types for $_query in CRM_Core_Selector_Base subclasses
colemanw [Sat, 8 Jan 2022 15:29:07 +0000 (10:29 -0500)]
Merge pull request #22423 from braders/queryformatter-docblock
[NFC] Tidy up phpdoc in CRM_Utils_QueryFormatter
Bradley Taylor [Sat, 8 Jan 2022 12:14:31 +0000 (12:14 +0000)]
Fix phpdoc types for $_query in CRM_Core_Selector_Base subclasses
Bradley Taylor [Sat, 8 Jan 2022 12:08:55 +0000 (12:08 +0000)]
[NFC] Tidy up phpdoc in CRM_Utils_QueryFormatter
Eileen McNaughton [Sat, 8 Jan 2022 02:54:01 +0000 (15:54 +1300)]
Merge pull request #22416 from eileenmcnaughton/depit
Increase GroupContact:create deprecation
Eileen McNaughton [Thu, 6 Jan 2022 21:42:37 +0000 (10:42 +1300)]
Remove / deprecate case code
It's clear it can't be passed in from the separated off version & it also is not reached from
the importer - which leaves only external usages (not supported but deprecation will do for now)
colemanw [Sat, 8 Jan 2022 02:08:49 +0000 (21:08 -0500)]
Merge pull request #22410 from eileenmcnaughton/rel
Stop returning unused parameters
Eileen McNaughton [Fri, 7 Jan 2022 02:06:19 +0000 (15:06 +1300)]
[REF] Stop returning unused variables
Only 2 code places call this function (one an unsupported call outside core but in universe & the other in Parser_Contact)
and only the latter uses ANY of the return variables - this fixes the function to stop
returning those that are never used - this stops them from returning them
Eileen McNaughton [Sat, 8 Jan 2022 01:15:49 +0000 (14:15 +1300)]
Fight back against copy & paste gone wild
Eileen McNaughton [Sat, 8 Jan 2022 01:43:52 +0000 (14:43 +1300)]
Merge pull request #22415 from colemanw/deprecatedDocblocks
APIv4 - Docblock updates, mark BAO::create functions deprecated
Eileen McNaughton [Sat, 8 Jan 2022 01:43:37 +0000 (14:43 +1300)]
Merge pull request #22414 from colemanw/fixTest
APIv4 - Fix test
Eileen McNaughton [Sat, 8 Jan 2022 01:43:27 +0000 (14:43 +1300)]
Merge pull request #22413 from colemanw/fixDecodeRows
APIv4 - Fix incorrect placement of decodeRows in loop
demeritcowboy [Sat, 8 Jan 2022 01:41:57 +0000 (20:41 -0500)]
fails in unusual situation on php 7
Eileen McNaughton [Sat, 8 Jan 2022 01:01:55 +0000 (14:01 +1300)]
Increase GroupContact:create deprecation
Note the v3 api does not call this & no-where in core calls it directly.
Coleman Watts [Thu, 6 Jan 2022 20:20:21 +0000 (15:20 -0500)]
APIv4 - Docblock updates, mark BAO::create functions deprecated
Coleman Watts [Thu, 6 Jan 2022 19:32:11 +0000 (14:32 -0500)]
Fix test
Test can give false failure depending on site's contact display_name settings.
Coleman Watts [Thu, 6 Jan 2022 19:26:59 +0000 (14:26 -0500)]
APIv4 - Fix incorrect placement of decodeRows in loop
The funciton is designed to loop through all items, so needs to be placed
outside the loop that creates the items.
colemanw [Fri, 7 Jan 2022 23:56:51 +0000 (18:56 -0500)]
Merge pull request #22406 from eileenmcnaughton/rels
Remove unreachable else
Eileen McNaughton [Fri, 7 Jan 2022 23:36:02 +0000 (12:36 +1300)]
Merge pull request #22395 from eileenmcnaughton/legy
[REF] Remove handling for no organization being passed
Eileen McNaughton [Fri, 7 Jan 2022 23:35:32 +0000 (12:35 +1300)]
Merge pull request #22411 from eileenmcnaughton/dep
Remove deprecated code
Eileen McNaughton [Fri, 7 Jan 2022 22:25:46 +0000 (11:25 +1300)]
Merge pull request #22409 from colemanw/upgradeDocblock
NFC - Fix typo in docblock
Eileen McNaughton [Fri, 7 Jan 2022 21:16:23 +0000 (10:16 +1300)]
Remove deprecated code
Eileen McNaughton [Fri, 7 Jan 2022 00:32:58 +0000 (13:32 +1300)]
Simplify determination of organizationID
Eileen McNaughton [Fri, 7 Jan 2022 00:18:04 +0000 (13:18 +1300)]
[REF] Remove handling for no organization being passed
Eileen McNaughton [Thu, 6 Jan 2022 21:16:03 +0000 (10:16 +1300)]
Stop returning unused parameters
Coleman Watts [Fri, 7 Jan 2022 20:05:49 +0000 (15:05 -0500)]
NFC - Fix typo in docblock
colemanw [Fri, 7 Jan 2022 19:30:41 +0000 (14:30 -0500)]
Merge pull request #22407 from eileenmcnaughton/rel
Remove check for contact_check as it is always an array here
demeritcowboy [Fri, 7 Jan 2022 12:08:19 +0000 (07:08 -0500)]
Merge pull request #20561 from WeMoveEU/fix/double-autosave
dev/core#2587 Ignore modified_date when checking for changes during mailing auto-save
demeritcowboy [Fri, 7 Jan 2022 12:07:30 +0000 (07:07 -0500)]
Merge pull request #22274 from eileenmcnaughton/mems
Fix testMultipleMembershipsContribution to use order api