Eileen McNaughton [Wed, 18 Jul 2018 10:36:38 +0000 (22:36 +1200)]
Merge pull request #12489 from eileenmcnaughton/mergees
dev/core/#/233 Expose information about where a contact has been merged to
Eileen McNaughton [Wed, 18 Jul 2018 08:24:08 +0000 (20:24 +1200)]
Merge pull request #12507 from eileenmcnaughton/report_test_fix
Fix enotice in test
eileen [Wed, 18 Jul 2018 08:22:27 +0000 (20:22 +1200)]
Fix enotice in test
Not sure how the last fix got merged - did I misread the test result - this was a clear error
Eileen McNaughton [Wed, 18 Jul 2018 04:06:17 +0000 (16:06 +1200)]
Merge pull request #12500 from pradpnayak/28
dev/financial/issues/28, Financial Account cannot be change to non de…
Eileen McNaughton [Tue, 17 Jul 2018 23:49:17 +0000 (11:49 +1200)]
Merge pull request #12487 from agh1/rel-permission-icon-titles-aydun
dev/core#34 Add permission details in `title` attribute of icons
Eileen McNaughton [Tue, 17 Jul 2018 21:07:15 +0000 (09:07 +1200)]
Merge pull request #12490 from eileenmcnaughton/report
Test fix, use separate emails so distinct doesn't meld them
Pradeep Nayak [Tue, 17 Jul 2018 20:35:46 +0000 (02:05 +0530)]
dev/financial/issues/28, Financial Account cannot be change to non deductible
eileen [Tue, 17 Jul 2018 07:09:11 +0000 (19:09 +1200)]
Test fix, use separate emails so distinct doesn't meld them
A change was merged today that would have required this change to the test to pass. However,
tests were not re-run & it was missed.
a DISTINCT is used so 2 separate emails make sense to test this
Eileen McNaughton [Tue, 17 Jul 2018 10:53:31 +0000 (22:53 +1200)]
Merge pull request #12485 from eileenmcnaughton/queryFields
Export cleanup - pass processor object rather than the query object
Monish Deb [Tue, 17 Jul 2018 07:39:00 +0000 (13:09 +0530)]
Merge pull request #12468 from eileenmcnaughton/export_return
Minor refactor preparatory to function extraction
eileen [Tue, 17 Jul 2018 05:18:42 +0000 (17:18 +1200)]
dev/core/#/233 Use merged data api to display navigation help on contact deleted by merge
eileen [Tue, 17 Jul 2018 04:38:31 +0000 (16:38 +1200)]
dev/core/#/233 Add apis to retrieve information about the ultimate destination contact and source contacts for merged contacts.
This 'data structure' is 'owned' by core & somewhat subject to future change so establishing a tested methodology for retrieving contact history in
core can support extensions such as
- extended reports - which exposes an address_history tab
- privacy extensions - which need to recover and potentially delete contacts that were merged
into the current contact
Eileen McNaughton [Tue, 17 Jul 2018 07:00:28 +0000 (19:00 +1200)]
Merge pull request #12482 from mattwire/nfc_cc_premium_financial
NFC cleanup to financial classes
Eileen McNaughton [Tue, 17 Jul 2018 06:24:52 +0000 (18:24 +1200)]
Merge pull request #12230 from JMAConsulting/dev_core_150
dev/core#150 : Chain select for country/state in Search Builder does not stay within OR groupings
Eileen McNaughton [Tue, 17 Jul 2018 04:50:25 +0000 (16:50 +1200)]
Merge pull request #12486 from eileenmcnaughton/savedSearch
dev/core#230 : set mapping id null on delete action
eileen [Mon, 16 Jul 2018 03:35:19 +0000 (15:35 +1200)]
Set, don't pass queryOperator
eileen [Mon, 16 Jul 2018 03:29:42 +0000 (15:29 +1200)]
Start passing around processor instead of query object
eileen [Sat, 14 Jul 2018 00:29:34 +0000 (12:29 +1200)]
Minor refactor preparatory to function extraction
Eileen McNaughton [Tue, 17 Jul 2018 00:20:47 +0000 (12:20 +1200)]
Merge pull request #12415 from aydun/core-34-v2
core-34 Add view-only option on permissioned relationships
Andrew Hunt [Tue, 17 Jul 2018 00:12:19 +0000 (20:12 -0400)]
dev/core#34 relationships: add display names and permission explanation as title for permission icons
Andrew Hunt [Tue, 17 Jul 2018 00:14:40 +0000 (20:14 -0400)]
NFC: make phpcs happy with spacing and no caps for `and` and `or`
Sunil Pawar [Mon, 16 Jul 2018 23:07:09 +0000 (11:07 +1200)]
dev/core#230 : set mapping id null on delete action
Eileen McNaughton [Mon, 16 Jul 2018 22:56:39 +0000 (10:56 +1200)]
Merge pull request #12452 from colemanw/arrayPath
Cleanup redundant array functions
Eileen McNaughton [Mon, 16 Jul 2018 22:38:26 +0000 (10:38 +1200)]
Merge pull request #12460 from freephile/patch-1
Fix false negatives in checkResourceUrl()
Eileen McNaughton [Mon, 16 Jul 2018 22:15:08 +0000 (10:15 +1200)]
Merge pull request #12484 from eileenmcnaughton/queryFields
Export code tidy up Use queryFields rather than query. Look to stop passing around query.
colemanw [Mon, 16 Jul 2018 22:12:21 +0000 (18:12 -0400)]
Merge pull request #11660 from JMAConsulting/CRM-21754
CRM-21754: Duplicate rows in Activity Details report when address fields are displayed
Greg Rundlett [Thu, 12 Jul 2018 13:47:27 +0000 (09:47 -0400)]
Fix false positives in checkResourceUrl()
Without this proposed fix, I'm receiving false errors about the CiviCRM Resource URL not being set correctly.
The stripos() function will return '0' if the needle string is the first thing found in the haystack. Thus, you must use equivalence rather than a true/false test where "position zero" evaluates to false.
Tested on Civi 5.3.0 on WordPress 4.9.7
I can access http://coastaltrails.org/wp-content/plugins/civicrm/civicrm/packages/jquery/css/images/arrow.png But WITHOUT the fix, I get an error
```
The Resource URL is not set correctly. Please set the CiviCRM Resource URL.
```
I have CiviCRM Resource URL set to `[civicrm.root]/`
My URL Variables are calculated as:
```
[cms.root] http://coastaltrails.org/
[civicrm.root] http://coastaltrails.org/wp-content/plugins/civicrm/civicrm/
[civicrm.files] http://coastaltrails.org/wp-content/uploads/civicrm/
These variables are computed automatically using civicrm.settings.php and its options, such as CIVICRM_TEMPLATE_COMPILEDIR.
```
eileen [Mon, 16 Jul 2018 03:18:22 +0000 (15:18 +1200)]
Use queryFields rather than query. Look to stop passing around query.
Eileen McNaughton [Mon, 16 Jul 2018 12:42:04 +0000 (00:42 +1200)]
Merge pull request #12479 from eileenmcnaughton/export_class
Export class code cleanup Start building export processor class.
Matthew Wire [Mon, 16 Jul 2018 09:27:30 +0000 (10:27 +0100)]
NFC cleanup to financial classes
eileen [Sun, 15 Jul 2018 23:53:22 +0000 (11:53 +1200)]
Start building export processor class.
A fundamental cause of code mess in the Export class is that it is a mishmash of static functions with variables passed around crazily. This starts the process of moving work to a object oriented class.
I think this migratory approach is the best plan to clean up the code
I did move some vars to being accessed via 'self' but there is leakage across tests so going
full OOO seems like a better approach
Eileen McNaughton [Mon, 16 Jul 2018 04:54:27 +0000 (16:54 +1200)]
Merge pull request #12453 from eileenmcnaughton/activity_report
Fix activity report to bring it under standardised report testing
eileen [Fri, 13 Jul 2018 04:46:32 +0000 (16:46 +1200)]
Alter temp report creation to
a) use new temp table mechanism and
b) add sql to dev tab and
c) make temp table cleanup easier in tests
eileen [Wed, 11 Jul 2018 03:58:27 +0000 (15:58 +1200)]
Fix activity report to bring it under standardised report testing
Eileen McNaughton [Mon, 16 Jul 2018 00:39:30 +0000 (12:39 +1200)]
Merge pull request #12423 from mattwire/optiongroup_isreserved
dev/core#155 Fix optiongroup is_reserved data and use when selecting option group for custom fields
Eileen McNaughton [Mon, 16 Jul 2018 00:17:21 +0000 (12:17 +1200)]
Merge pull request #12474 from mattwire/deprecate_bao_managepremiums
Rename CRM_Contribute_BAO_ManagePremiums to CRM_Contribute_BAO_Product and deprecate CRM_Contribute_BAO_ManagePremiums
Eileen McNaughton [Sun, 15 Jul 2018 23:02:58 +0000 (11:02 +1200)]
Merge pull request #12352 from MiyaNoctem/CRM-188-fix-floating-point-comparison
dev/core#188: Fix Floating Point Precision Comparison Exception
Eileen McNaughton [Sun, 15 Jul 2018 22:16:26 +0000 (10:16 +1200)]
Merge pull request #12315 from mattwire/CRM-21682_onlyrenewmembershipwhencompleted
Only auto-renew membership when contribution status is completed
Eileen McNaughton [Sun, 15 Jul 2018 22:03:07 +0000 (10:03 +1200)]
Merge pull request #12477 from seamuslee001/membership_type_test_comment
(NFC) Update comment on membership type domain_id API Test
Eileen McNaughton [Sun, 15 Jul 2018 22:02:31 +0000 (10:02 +1200)]
Merge pull request #12478 from seamuslee001/optiongroup_regen_dao
(NFC) Regenerate OptionGroup DAO file
colemanw [Sun, 15 Jul 2018 20:57:54 +0000 (16:57 -0400)]
Merge pull request #12476 from colemanw/navigation
BAO_Navigation: Respect domain_id param
Coleman Watts [Sun, 15 Jul 2018 15:08:53 +0000 (11:08 -0400)]
Add test, remove redundant api default
Matthew Wire [Sat, 14 Jul 2018 17:46:31 +0000 (18:46 +0100)]
Add unit test for Membership renewal when contribution not completed
Matthew Wire [Sun, 15 Jul 2018 11:03:26 +0000 (12:03 +0100)]
Don't overwrite Product parameters on update
Matthew Wire [Fri, 15 Jun 2018 08:07:52 +0000 (09:07 +0100)]
Only auto-renew membership when contribution status is completed
Seamus Lee [Sun, 15 Jul 2018 04:07:37 +0000 (14:07 +1000)]
Merge pull request #12312 from colemanw/multiRecordCustomProfile
Disable inline-edit of multi-record custom fields in profiles
Seamus Lee [Sun, 15 Jul 2018 03:57:00 +0000 (13:57 +1000)]
(NFC) Regenerate OptionGroup DAO file
Seamus Lee [Sun, 15 Jul 2018 03:50:49 +0000 (13:50 +1000)]
(NFC) Update comment on membership type domain_id API Test
Coleman Watts [Sun, 15 Jul 2018 02:58:22 +0000 (22:58 -0400)]
BAO_Navigation: Respect domain_id param
Seamus Lee [Sat, 14 Jul 2018 22:37:19 +0000 (08:37 +1000)]
Merge pull request #12461 from eileenmcnaughton/domain_id
Make domain_id optional in membership_type api.
Seamus Lee [Sat, 14 Jul 2018 21:22:30 +0000 (07:22 +1000)]
Merge pull request #12472 from eileenmcnaughton/add_product
Remove unused variables & comment cleanup
Matthew Wire [Sat, 14 Jul 2018 16:14:03 +0000 (17:14 +0100)]
Rename CRM_Contribute_BAO_ManagePremiums to CRM_Contribute_BAO_Product and deprecate CRM_Contribute_BAO_ManagePremiums
Matthew Wire [Wed, 11 Jul 2018 11:59:29 +0000 (12:59 +0100)]
Fix is_reserved flag on option groups
eileen [Sat, 14 Jul 2018 02:09:55 +0000 (14:09 +1200)]
Comment clean up
eileen [Sat, 14 Jul 2018 02:03:23 +0000 (14:03 +1200)]
Remove redundant variables
Eileen McNaughton [Sat, 14 Jul 2018 01:25:28 +0000 (13:25 +1200)]
Merge pull request #12464 from jaapjansma/issue_141
Fixed #141: only check if name exists.
Eileen McNaughton [Fri, 13 Jul 2018 23:22:14 +0000 (11:22 +1200)]
Merge pull request #12465 from WeMoveEU/core-256
dev/core#256 - use unsigned int for temporary recipient ids
Seamus Lee [Fri, 13 Jul 2018 21:29:35 +0000 (07:29 +1000)]
Merge pull request #12320 from mattwire/export_form_select_tweaks
Non functional changes towards shared functions in Core_Form_Task
Romain Thouvenin [Fri, 13 Jul 2018 13:55:43 +0000 (15:55 +0200)]
dev/core#256 - use unsigned int for temporary recipient ids
Camilo Rodriguez [Mon, 18 Jun 2018 18:48:44 +0000 (18:48 +0000)]
CRM-188: Fix Floating Point Precision Comparison Exception
Under certain circumstances, floating point comparison between set and
calculated values may fail, even if they should be equal. This is due to the
way floating point values are represented internally in binary form. To avoid
this problem, comparison needs to be made using an expected precision below
which compared values may be treated as equal. Implemented precision of 0.001
and used it to check the difference between both values is less.
Eileen McNaughton [Fri, 13 Jul 2018 10:43:21 +0000 (22:43 +1200)]
Merge pull request #12290 from eileenmcnaughton/export
Export class code readability - Reduce passing of variable, define on class
Eileen McNaughton [Fri, 13 Jul 2018 10:24:52 +0000 (22:24 +1200)]
Merge pull request #12462 from seamuslee001/nfc_kamra_cv
(NFC) Ignore generated karma.cv.js file
Jaap Jansma [Fri, 13 Jul 2018 09:33:10 +0000 (09:33 +0000)]
Fixed #141: only check if name exists.
Seamus Lee [Fri, 13 Jul 2018 04:03:35 +0000 (14:03 +1000)]
(NFC) Ignore generated karma.cv.js file
Ingore /tmp as per tim
eileen [Fri, 13 Jul 2018 03:53:32 +0000 (15:53 +1200)]
Make domain_id optional in membership_type api.
This is in support of #12439 & making domain_id optional
Monish Deb [Fri, 13 Jul 2018 03:44:19 +0000 (09:14 +0530)]
Merge pull request #12456 from chamilwijesooriya/issue-93
Issue #93 Update CRM_Utils_Rule::mysqlOrderBy() to accommodate more than 2 joins
Eileen McNaughton [Fri, 13 Jul 2018 03:37:29 +0000 (15:37 +1200)]
Merge pull request #10673 from JMAConsulting/CRM-20845
CRM-20845: create alterMailingRecipients hook
Eileen McNaughton [Fri, 13 Jul 2018 02:31:25 +0000 (14:31 +1200)]
Merge pull request #11838 from mfb/ses-smtp-support
CiviMail: Fix logic for handling SMTP socket errors, temporary failures and permanent failures
Seamus Lee [Fri, 13 Jul 2018 00:56:14 +0000 (10:56 +1000)]
Merge pull request #12346 from michaelmcandrew/dev/mail/15
dev/mail/15 deal better with spaces in from email address
colemanw [Thu, 12 Jul 2018 23:13:33 +0000 (19:13 -0400)]
Merge pull request #12449 from colemanw/gettree
CustomValue gettree api - More accurate permission check
Eileen McNaughton [Thu, 12 Jul 2018 23:06:12 +0000 (11:06 +1200)]
Merge pull request #12436 from mattwire/financial_type_pseudoconstant
dev/core#241 Fix Manage Premiums UI
Eileen McNaughton [Thu, 12 Jul 2018 23:00:12 +0000 (11:00 +1200)]
Merge pull request #12459 from yashodha/dev-255
(dev/core#255) Changes to copied event location reflects in original …
yashodha [Thu, 12 Jul 2018 09:45:20 +0000 (15:15 +0530)]
(dev/core#255) Changes to copied event location reflects in original event location
Chamil Wijesooriya [Thu, 12 Jul 2018 08:52:43 +0000 (09:52 +0100)]
Fixed errors: "Failure in api call for Country get: Unknown field specified for sort. Cannot order by ''id DESC''"
Eileen McNaughton [Thu, 12 Jul 2018 03:18:08 +0000 (15:18 +1200)]
Merge pull request #12458 from mlutfy/pricefield-isset
PriceField: show pre/post help if not empty, not if isset.
Mathieu Lutfy [Wed, 11 Jul 2018 20:46:37 +0000 (16:46 -0400)]
PriceField: show pre/post help if not empty, not if isset.
colemanw [Wed, 11 Jul 2018 16:47:13 +0000 (12:47 -0400)]
Merge pull request #12451 from eileenmcnaughton/premiums
Deprecate array on ManagePremiums
Chamil Wijesooriya [Wed, 11 Jul 2018 12:03:15 +0000 (13:03 +0100)]
Issue #93 Update CRM_Utils_Rule::mysqlOrderBy() to accommodate more than 2 joins
Matthew Wire [Tue, 29 May 2018 20:57:35 +0000 (21:57 +0100)]
Switch to API and get all option groups that are not reserved instead of only ones that are already linked to custom fields
Matthew Wire [Tue, 10 Jul 2018 16:27:39 +0000 (17:27 +0100)]
Don't reset financial type every time product is edited
Matthew Wire [Fri, 6 Jul 2018 17:37:20 +0000 (18:37 +0100)]
Enable pseudoconstant for financial_type and use it to display financial type for premiums. Add "cost" column to premium UI and properly format money
Seamus Lee [Wed, 11 Jul 2018 04:00:09 +0000 (14:00 +1000)]
Merge pull request #12450 from eileenmcnaughton/comments
[NFC] Comment fixes
Coleman Watts [Wed, 11 Jul 2018 02:23:29 +0000 (22:23 -0400)]
Cleanup redundant array functions
Eileen McNaughton [Wed, 11 Jul 2018 01:00:32 +0000 (13:00 +1200)]
Merge pull request #12392 from madhavimalgaonkar/issue-221
dev/core#221, check if the grouptree is not empty
eileen [Wed, 11 Jul 2018 00:36:11 +0000 (12:36 +1200)]
Comment fixes
eileen [Wed, 11 Jul 2018 00:33:53 +0000 (12:33 +1200)]
Deprecate array on ManagePremiums
Eileen McNaughton [Wed, 11 Jul 2018 00:20:53 +0000 (12:20 +1200)]
Merge pull request #12448 from civicrm/5.4
5.4
colemanw [Tue, 10 Jul 2018 23:49:31 +0000 (19:49 -0400)]
Merge pull request #12410 from eileenmcnaughton/option_group
dev/core/issues/228 fix OptionGroup create action to not disable on update
Coleman Watts [Tue, 10 Jul 2018 22:45:43 +0000 (18:45 -0400)]
CustomValue gettree api - More accurate permission check
colemanw [Tue, 10 Jul 2018 21:28:56 +0000 (17:28 -0400)]
Merge pull request #12373 from JMAConsulting/access-3-contact-dash
dev/accessibility#3: Add accessible label on Contact Edit form elements and helpicon
Coleman Watts [Fri, 15 Jun 2018 03:20:17 +0000 (23:20 -0400)]
Disable inline-edit of multi-record custom fields in profiles
Seamus Lee [Tue, 10 Jul 2018 20:36:35 +0000 (06:36 +1000)]
Merge pull request #12447 from mattwire/allcontactexport_regression
dev/core#249 Fix crash when performing export all contacts from search
Matthew Wire [Mon, 9 Jul 2018 22:38:10 +0000 (23:38 +0100)]
Fix crash when performing export all contacts from search
Seamus Lee [Mon, 9 Jul 2018 23:25:01 +0000 (09:25 +1000)]
Merge pull request #12445 from MiyaNoctem/CRM-21425-make-inbound-emails-editable-try-2
CRM-21425: Make Inbound Emails Editable With Permissions
Eileen McNaughton [Mon, 9 Jul 2018 22:13:09 +0000 (10:13 +1200)]
Merge pull request #12384 from JMAConsulting/dev-core-218
dev/core#218 : On Case Type listing page, for reserved ones the, 'More' link don't show any options
Matthew Wire [Fri, 15 Jun 2018 09:23:33 +0000 (10:23 +0100)]
Non functional changes towards shared functions in Core_Form_Task
Eileen McNaughton [Mon, 9 Jul 2018 21:30:42 +0000 (09:30 +1200)]
Merge pull request #12442 from colemanw/crmeditable.tpl
Remove old deprecated crmeditable.tpl
Eileen McNaughton [Mon, 9 Jul 2018 21:29:47 +0000 (09:29 +1200)]
Merge pull request #12443 from colemanw/empty
Fix potential undefined array index
Aidan Saunders [Fri, 6 Jul 2018 14:51:28 +0000 (15:51 +0100)]
Make permission condition more explicit
colemanw [Mon, 9 Jul 2018 11:44:07 +0000 (07:44 -0400)]
Merge pull request #12438 from totten/master-contact-sel
(dev/core#217) CRM_Contact_Selector::getRows() - Use generator instead of DAO loop