civicrm-core.git
5 years agodev/core#561 Convert Scheduled Reminders Form to use datepicker and ensure that eithe...
Seamus Lee [Mon, 3 Dec 2018 08:51:18 +0000 (19:51 +1100)]
dev/core#561 Convert Scheduled Reminders Form to use datepicker and ensure that either start_action_offset or absolute_date is filled in

5 years agoMerge pull request #13210 from eileenmcnaughton/search_ref
Seamus Lee [Mon, 3 Dec 2018 00:29:55 +0000 (11:29 +1100)]
Merge pull request #13210 from eileenmcnaughton/search_ref

[REF] refactor shared search functions in pre-Process

5 years agoMerge pull request #13206 from eileenmcnaughton/pledge_jcal
Seamus Lee [Sun, 2 Dec 2018 23:50:34 +0000 (10:50 +1100)]
Merge pull request #13206 from eileenmcnaughton/pledge_jcal

dev/core#561 Convert Pledge Payment form to use datepicker rather tha…

5 years agoMerge pull request #13208 from seamuslee001/final_custom_search_conversion_561
Seamus Lee [Sun, 2 Dec 2018 22:21:46 +0000 (09:21 +1100)]
Merge pull request #13208 from seamuslee001/final_custom_search_conversion_561

dev/core#561 Convert DateAdded and Tagged Contributions custom search…

5 years ago[REF] refactor shared search functions in pre-Process
eileen [Sun, 2 Dec 2018 21:28:57 +0000 (10:28 +1300)]
[REF] refactor shared search functions in pre-Process

This simply reduces some duplicate code in the search forms

5 years agodev/core#561 Convert DateAdded and Tagged Contributions custom searches to using...
Seamus Lee [Sun, 2 Dec 2018 20:53:59 +0000 (07:53 +1100)]
dev/core#561 Convert DateAdded and Tagged Contributions custom searches to using datepicker rather than jcalendar

5 years agoMake 'overdue' function robust by using strtotime comparisons
eileen [Sun, 2 Dec 2018 20:39:17 +0000 (09:39 +1300)]
Make 'overdue' function robust by using strtotime comparisons

5 years agoMerge pull request #13203 from seamuslee001/activity_search_core_561
Eileen McNaughton [Sun, 2 Dec 2018 20:22:50 +0000 (09:22 +1300)]
Merge pull request #13203 from seamuslee001/activity_search_core_561

dev/core#561 Convert Activity Custom Search from jcalendar to datepic…

5 years agoMerge pull request #13196 from seamuslee001/price_lab_core_561
Seamus Lee [Sun, 2 Dec 2018 10:10:00 +0000 (21:10 +1100)]
Merge pull request #13196 from seamuslee001/price_lab_core_561

dev/core#561 Replace jacalendar with datepicker in Price Field Form

5 years agoMerge pull request #13200 from JMAConsulting/mail-23
Seamus Lee [Sun, 2 Dec 2018 09:43:16 +0000 (20:43 +1100)]
Merge pull request #13200 from JMAConsulting/mail-23

dev/mail#23: Bounce processing doesn't catch pattern 'user doesn't exist'

5 years agodev/core#561 Replace jacalendar with datepicker in Price Field Form
Seamus Lee [Fri, 30 Nov 2018 22:39:25 +0000 (22:39 +0000)]
dev/core#561 Replace jacalendar with datepicker in Price Field Form

Update Display of Field dates as well

5 years agodev/mail#23: Bounce processing doesn't catch pattern 'user doesn't exis'
Monish Deb [Sat, 1 Dec 2018 18:59:01 +0000 (00:29 +0530)]
dev/mail#23: Bounce processing doesn't catch pattern 'user doesn't exis'

5 years agoMerge pull request #13173 from christianwach/issue-557
colemanw [Sun, 2 Dec 2018 04:20:47 +0000 (23:20 -0500)]
Merge pull request #13173 from christianwach/issue-557

Prevent viewport jump when toggling help on "Administer CiviCRM" screen

5 years agoMerge pull request #13190 from JMAConsulting/core-565
colemanw [Sun, 2 Dec 2018 04:15:02 +0000 (23:15 -0500)]
Merge pull request #13190 from JMAConsulting/core-565

dev-core#565: Make subject field of Note, inline editable in contact summary page

5 years agodev/core#561 Convert Pledge Payment form to use datepicker rather than jcalendar
Seamus Lee [Sun, 2 Dec 2018 01:07:26 +0000 (12:07 +1100)]
dev/core#561 Convert Pledge Payment form to use datepicker rather than jcalendar

5 years agoMerge pull request #13194 from seamuslee001/lab_core_498
Eileen McNaughton [Sun, 2 Dec 2018 02:25:04 +0000 (15:25 +1300)]
Merge pull request #13194 from seamuslee001/lab_core_498

dev/core#498 Update Mailing Report to fix undefined property error

5 years agoMerge pull request #13201 from seamuslee001/event_template_cleanup
Eileen McNaughton [Sun, 2 Dec 2018 02:21:43 +0000 (15:21 +1300)]
Merge pull request #13201 from seamuslee001/event_template_cleanup

Remove Defunct Templates from CiviMail

5 years agoMerge pull request #13204 from seamuslee001/nfc_checksum_dao
Eileen McNaughton [Sun, 2 Dec 2018 01:55:37 +0000 (14:55 +1300)]
Merge pull request #13204 from seamuslee001/nfc_checksum_dao

(NFC) Regenerate DAO Checksums after changes to codegen

5 years ago(NFC) Regenerate DAO Checksums after changes to codegen
Seamus Lee [Sat, 1 Dec 2018 23:58:09 +0000 (10:58 +1100)]
(NFC) Regenerate DAO Checksums after changes to codegen

5 years agoMerge pull request #13198 from seamuslee001/event_search_561
Seamus Lee [Sat, 1 Dec 2018 21:48:59 +0000 (08:48 +1100)]
Merge pull request #13198 from seamuslee001/event_search_561

dev/core#561 Remove jcalendar from the Event Aggregate Custom Search

5 years agoMerge pull request #13195 from seamuslee001/npm_update
Eileen McNaughton [Sat, 1 Dec 2018 21:45:28 +0000 (10:45 +1300)]
Merge pull request #13195 from seamuslee001/npm_update

Update npm dependencies to fix audit issues

5 years agoMerge pull request #13176 from aydun/flatten_fix
Eileen McNaughton [Sat, 1 Dec 2018 21:42:46 +0000 (10:42 +1300)]
Merge pull request #13176 from aydun/flatten_fix

Flatten fix

5 years agodev/core#561 Convert Activtiy Custom Search from jcalendar to datepicker and fix...
Seamus Lee [Sat, 1 Dec 2018 21:40:27 +0000 (08:40 +1100)]
dev/core#561 Convert Activtiy Custom Search from jcalendar to datepicker and fix indenting in tpl file

5 years agoMerge pull request #13199 from seamuslee001/lab_core_125
Eileen McNaughton [Sat, 1 Dec 2018 21:40:56 +0000 (10:40 +1300)]
Merge pull request #13199 from seamuslee001/lab_core_125

dev/core#125 Fix Doc url to custom fields user documentation

5 years agoMerge pull request #13186 from aydun/override_active_tokens
Eileen McNaughton [Sat, 1 Dec 2018 21:28:06 +0000 (10:28 +1300)]
Merge pull request #13186 from aydun/override_active_tokens

(REF) Allow subclasses of AbstractTokenSubscriber to override the determination of active tokens.

5 years agoRemove Defunct Templates from CiviMail
Seamus Lee [Sat, 1 Dec 2018 20:32:53 +0000 (20:32 +0000)]
Remove Defunct Templates from CiviMail

5 years agodev/core#561 Remove jcalendar from the Event Aggregate Custom Search
Seamus Lee [Sat, 1 Dec 2018 05:56:19 +0000 (05:56 +0000)]
dev/core#561 Remove jcalendar from the Event Aggregate Custom Search

5 years agodev/core#125 Fix Doc url to custom fields user documentation
Seamus Lee [Sat, 1 Dec 2018 08:26:17 +0000 (08:26 +0000)]
dev/core#125 Fix Doc url to custom fields user documentation

5 years agoMerge pull request #13193 from civicrm/5.8
Seamus Lee [Fri, 30 Nov 2018 23:24:18 +0000 (10:24 +1100)]
Merge pull request #13193 from civicrm/5.8

5.8

5 years agoUpdate npm dependancies to fix audit issues
Seamus Lee [Fri, 30 Nov 2018 22:17:23 +0000 (22:17 +0000)]
Update npm dependancies to fix audit issues

5 years agodev/core#498 Update Mailing Report to fix undefined property error
Seamus Lee [Fri, 30 Nov 2018 21:57:55 +0000 (21:57 +0000)]
dev/core#498 Update Mailing Report to fix undefined property error

5 years agoMerge pull request #13172 from mattwire/events_tabheader_fixselectedchild
Seamus Lee [Fri, 30 Nov 2018 21:53:47 +0000 (08:53 +1100)]
Merge pull request #13172 from mattwire/events_tabheader_fixselectedchild

Fix links for tabs on manage event

5 years agoFix test now that flatten does not suppress 0 values
Aidan Saunders [Fri, 30 Nov 2018 13:39:38 +0000 (13:39 +0000)]
Fix test now that flatten does not suppress 0 values

5 years agodev-core#565: Make subject field of Note, inline editable in contact summary page
Monish Deb [Fri, 30 Nov 2018 12:35:54 +0000 (18:05 +0530)]
dev-core#565: Make subject field of Note, inline editable in contact summary page

5 years agoFix links for tabs on manage event (events use separate URLs for each tab but need...
Matthew Wire (MJW Consulting) [Thu, 29 Nov 2018 10:20:25 +0000 (10:20 +0000)]
Fix links for tabs on manage event (events use separate URLs for each tab but need selectedChild to be specified or the default tab is loaded

5 years agoAvoid any unintended consequences of flatten preserving keys with empty values (PR...
Aidan Saunders [Fri, 30 Nov 2018 09:59:43 +0000 (09:59 +0000)]
Avoid any unintended consequences of flatten preserving keys with empty values (PR #13176)

5 years agoAllow subclasses to override the determination of active tokens.
Aidan Saunders [Mon, 5 Nov 2018 18:16:09 +0000 (18:16 +0000)]
Allow subclasses to override the determination of active tokens.
This enables variable named tokens.

5 years agoMerge pull request #13151 from eileenmcnaughton/payment_function
Monish Deb [Fri, 30 Nov 2018 08:48:30 +0000 (14:18 +0530)]
Merge pull request #13151 from eileenmcnaughton/payment_function

Extract getContributionBalance function, use that rather than wrapper…

5 years agoMerge pull request #13179 from eileenmcnaughton/dedupe_rule
Seamus Lee [Fri, 30 Nov 2018 05:00:09 +0000 (16:00 +1100)]
Merge pull request #13179 from eileenmcnaughton/dedupe_rule

Test support for fixing dev/core#397 including adding Rule api

5 years agoMerge pull request #13184 from civicrm/5.8
Eileen McNaughton [Fri, 30 Nov 2018 04:51:44 +0000 (17:51 +1300)]
Merge pull request #13184 from civicrm/5.8

5.8

5 years agoMerge pull request #13177 from eileenmcnaughton/net_amount
Seamus Lee [Fri, 30 Nov 2018 04:50:04 +0000 (15:50 +1100)]
Merge pull request #13177 from eileenmcnaughton/net_amount

Fix failure to calculate net_amount correctly on update when fee_amount is not in the parameters.

5 years agoMerge pull request #13182 from civicrm/5.8
Eileen McNaughton [Fri, 30 Nov 2018 04:48:42 +0000 (17:48 +1300)]
Merge pull request #13182 from civicrm/5.8

5.8

5 years agoMerge pull request #13178 from eileenmcnaughton/net_amount_form
Seamus Lee [Fri, 30 Nov 2018 04:43:47 +0000 (15:43 +1100)]
Merge pull request #13178 from eileenmcnaughton/net_amount_form

dev/core#552 Fix missaving of net_amount

5 years agoAdd Dedupe Rule api
eileen [Thu, 29 Nov 2018 23:34:20 +0000 (12:34 +1300)]
Add Dedupe Rule api

5 years agoMerge pull request #13180 from GinkgoFJG/dev/core#559
Tim Otten [Fri, 30 Nov 2018 01:00:06 +0000 (17:00 -0800)]
Merge pull request #13180 from GinkgoFJG/dev/core#559

(dev/core#559) Declare crmUi's dependency on ui.utils.

5 years ago(dev/core#559) Declare crmUi's dependency on ui.utils.
Frank J. Gómez [Thu, 29 Nov 2018 23:19:14 +0000 (18:19 -0500)]
(dev/core#559) Declare crmUi's dependency on ui.utils.

5 years agoAdd unit test improvements to support testing dev/core#397
eileen [Thu, 29 Nov 2018 23:14:32 +0000 (12:14 +1300)]
Add unit test improvements to support testing dev/core#397

I have marked the test incomplete as we get a fatal error on the actual test for #397
(with or without the proposed fix) but I think if we merge this it makes it easy to complete
#397

5 years agoAdd Rule api for dedupe rule & fix tests to use it.
eileen [Thu, 29 Nov 2018 22:17:55 +0000 (11:17 +1300)]
Add Rule api for dedupe rule & fix tests to use it.

Tests seem to be languishing on the painfulness of creating Reules without an api so adding one.

Note that there is good automatic test coverage under SyntaxConformance for this.

I also removed a pointless piece of code

5 years agoMerge pull request #13175 from aydun/displayvalue_fixes
Eileen McNaughton [Thu, 29 Nov 2018 21:52:00 +0000 (10:52 +1300)]
Merge pull request #13175 from aydun/displayvalue_fixes

Displayvalue fixes

5 years agoFix missaving of net_amount
eileen [Thu, 29 Nov 2018 21:49:32 +0000 (10:49 +1300)]
Fix missaving of net_amount

dev/core#552 it seems net_amount was removed incompletely
from the additional info form - causing it to block updating of the value when it should have been updated

5 years agoFix failure to calculate net_amount correctly on update when fee_amount is not in...
eileen [Thu, 29 Nov 2018 21:36:26 +0000 (10:36 +1300)]
Fix failure to calculate net_amount correctly on update when fee_amount is not in the parameters.

5 years agoTest for CRM_Core_BAO_CustomField::displayValue() contact ref
Aidan Saunders [Wed, 28 Nov 2018 15:37:23 +0000 (15:37 +0000)]
Test for CRM_Core_BAO_CustomField::displayValue() contact ref

5 years agoFix bug if string value is passed to CRM_Core_BAO_CustomField::displayValue() for...
Aidan Saunders [Wed, 28 Nov 2018 14:51:04 +0000 (14:51 +0000)]
Fix bug if string value is passed to CRM_Core_BAO_CustomField::displayValue() for a contact ref

5 years agoAdd test for CRM_Utils_Array::flatten()
Aidan Saunders [Wed, 31 Oct 2018 19:07:09 +0000 (19:07 +0000)]
Add test for CRM_Utils_Array::flatten()

5 years agoDon't lose keys with empty values when flattening array
Aidan Saunders [Wed, 15 Aug 2018 19:24:36 +0000 (20:24 +0100)]
Don't lose keys with empty values when flattening array

5 years agoPrevent viewport jump when toggling help on "Administer CiviCRM" screen
Christian Wach [Thu, 29 Nov 2018 11:23:43 +0000 (11:23 +0000)]
Prevent viewport jump when toggling help on "Administer CiviCRM" screen

5 years agoMerge pull request #13059 from seamuslee001/lab_core_505
Eileen McNaughton [Thu, 29 Nov 2018 05:45:55 +0000 (18:45 +1300)]
Merge pull request #13059 from seamuslee001/lab_core_505

dev/core#505 Allow Extensions to specify crmType and phpType when dea…

5 years agoMerge pull request #13147 from eileenmcnaughton/dash_fix
Eileen McNaughton [Thu, 29 Nov 2018 04:14:29 +0000 (17:14 +1300)]
Merge pull request #13147 from eileenmcnaughton/dash_fix

Fixes to enable UserDashboard tests to all run

5 years agoMerge pull request #13168 from totten/master-prevnext-metadata
Seamus Lee [Wed, 28 Nov 2018 22:41:18 +0000 (09:41 +1100)]
Merge pull request #13168 from totten/master-prevnext-metadata

(dev/core#217) Search.setting.php - Fix mismatched metadata

5 years ago(dev/core#217) Search.setting.php - Fix mismatched metadata
Tim Otten [Wed, 28 Nov 2018 21:08:47 +0000 (13:08 -0800)]
(dev/core#217) Search.setting.php - Fix mismatched metadata

The setting `prevNextBackend` was introduced in PR #12665.  The PR was
originally written for an earlier version (circa 5.6) and eventually
merged in a later version (circa 5.9). The metadata should match
the version-number of the actual release.

5 years agoMerge pull request #13157 from eileenmcnaughton/currency
Eileen McNaughton [Wed, 28 Nov 2018 20:23:59 +0000 (09:23 +1300)]
Merge pull request #13157 from eileenmcnaughton/currency

Set currency template variable from contribution pages

5 years agoMerge pull request #13161 from colemanw/Api3
Eileen McNaughton [Wed, 28 Nov 2018 20:19:09 +0000 (09:19 +1300)]
Merge pull request #13161 from colemanw/Api3

Api3 profile:submit - fix handling of greeting fields

5 years agoFixes to enable UserDashboard tests to all run
eileen [Wed, 28 Nov 2018 02:11:53 +0000 (15:11 +1300)]
Fixes to enable UserDashboard tests to all run

5 years agoMerge pull request #13162 from francescbassas/patch-16
Joe Murray [Wed, 28 Nov 2018 19:58:53 +0000 (14:58 -0500)]
Merge pull request #13162 from francescbassas/patch-16

Avoid permission checking on getOrganizationNames

5 years agoApi3 profile:submit - fix handling of greeting fields
Coleman Watts [Tue, 27 Nov 2018 19:23:17 +0000 (14:23 -0500)]
Api3 profile:submit - fix handling of greeting fields

5 years agoMerge pull request #13166 from eileenmcnaughton/misc
colemanw [Wed, 28 Nov 2018 13:04:29 +0000 (08:04 -0500)]
Merge pull request #13166 from eileenmcnaughton/misc

Trivial code cleanup

5 years agoMerge pull request #13167 from eileenmcnaughton/checksum
Seamus Lee [Wed, 28 Nov 2018 11:48:41 +0000 (22:48 +1100)]
Merge pull request #13167 from eileenmcnaughton/checksum

[NFC] Extract getUserCheckSum function

5 years ago[NFC] Extract getUserCheckSum function
eileen [Wed, 28 Nov 2018 04:28:34 +0000 (17:28 +1300)]
[NFC] Extract getUserCheckSum function

5 years agoMinor code cleanups.
eileen [Wed, 28 Nov 2018 04:13:17 +0000 (17:13 +1300)]
Minor code cleanups.

Removes an instance where  is instantiated using the old & pattern and
fixes a non-quoted word in a template which causes notices under some configs

5 years ago(dev/core#217) PrevNext - More conservative transition (5.7=>5.8=>5.9)
Tim Otten [Tue, 27 Nov 2018 23:34:13 +0000 (15:34 -0800)]
(dev/core#217) PrevNext - More conservative transition (5.7=>5.8=>5.9)

This revision sets up more conservative transition process for adopting PrevNext drivers.

Before
------

* 5.7.x - Hard-coded to SQL driver.
* 5.8.x - Allow setting to pick driver. If left as `default`, then choose best-available (based on configured services).

After
------

* 5.7.x - Hard-coded to SQL driver.
* 5.8.x - Allow setting to pick driver. If left as `default`, then use SQL driver.
* 5.9.x - Allow setting to pick driver. If left as `default`, then choose best-available (based on configured services).

This essentially mitigates the risk that bugs in the new Redis driver cause regreessions for sites already running Redis.

5 years agoMerge pull request #12665 from totten/master-prevnext-redis
Eileen McNaughton [Wed, 28 Nov 2018 04:03:46 +0000 (17:03 +1300)]
Merge pull request #12665 from totten/master-prevnext-redis

(dev/core#217) PrevNext - Implement Redis. Decouple Query::getCachedContacts().

5 years ago(dev/core#217) PrevNext - Add settings for admin to choose backend
Tim Otten [Tue, 14 Aug 2018 23:08:16 +0000 (16:08 -0700)]
(dev/core#217) PrevNext - Add settings for admin to choose backend

The auto-detection is a good default policy.  However, this is new
functionality.  If some bug gets through the review/RC cycles, then this
option provides an escape path.

5 years ago(dev/core#217) PrevNext - Cleanup parameter name in Sql::markSelection
Tim Otten [Thu, 26 Jul 2018 23:00:54 +0000 (16:00 -0700)]
(dev/core#217) PrevNext - Cleanup parameter name in Sql::markSelection

The new name is prettier and matches the names in `CRM_Core_PrevNextCache_{Interface,Redis}`.

5 years ago(dev/core#217) Implement Redis driver for PrevNext handling
Tim Otten [Mon, 9 Jul 2018 01:02:01 +0000 (18:02 -0700)]
(dev/core#217) Implement Redis driver for PrevNext handling

5 years ago(dev/core#217) Query::getCachedContacts - Use swappable fetch() instead of SQL JOIN
Tim Otten [Tue, 14 Aug 2018 22:12:57 +0000 (15:12 -0700)]
(dev/core#217) Query::getCachedContacts - Use swappable fetch() instead of SQL JOIN

The general context of this code is roughly as follows:

* We've already filled up the prevnext cache with a bunch of contact-IDs.
* The user wants to view a page of 50 contacts.
* We want to lookup full information about 50 specific contacts for this page.

It does makes sense to use `CRM_Contact_BAO_Query` for looking up the "full information"
about contacts. However, the function `Query::getCachedContacts()` is hard-coded to
read from the SQL-based prevnext cache.

Before
------

* In `getCachedContacts()`, it grabbed the full SQL for `CRM_Contact_BAO_Query`
  and munged the query to:
    * Add an extra JOIN on `civicrm_prevnext_cache` (with a constraint on `cacheKey`)
    * Respect pagination (LIMIT/OFFSET)
    * Order results based on their position in the prevnext cache

After
-----

* In `CRM_Core_PrevNextCache_Interface`, the `fetch()` function provides one page-worth
  of contact IDs (in order). The `fetch()` function is tested by `E2E_Core_PrevNextTest`.
* In `getCachedContacts()`, it doesn't know anything about `civicrm_prevnext_cache`
  or `cacheKey` or pagination.  Instead, it just accepts CIDs for one page-worth of
  contacts.  It returns contacts in the same order that was given.

5 years agoAvoid permission checking on getOrganizationNames
francescbassas [Tue, 27 Nov 2018 21:02:47 +0000 (22:02 +0100)]
Avoid permission checking on getOrganizationNames

[Bookkeeping Transactions Report insufficient permissions](https://lab.civicrm.org/dev/core/issues/551)

5 years agoSet currency template variable from contribution pages
eileen [Mon, 26 Nov 2018 08:58:23 +0000 (21:58 +1300)]
Set currency template variable from contribution pages

When we load the PaymentForm the currency is set there and assigned to the template.

However, if the form doesn't load by default (ie because there is no payment processor selected by
default) the currency variable is not assigned to the template.

When the payment form is loaded by
      var dataUrl = '{crmURL p='civicrm/payment/form' h=0 q=formName=

5 years agoMerge pull request #13156 from eileenmcnaughton/please_print
colemanw [Mon, 26 Nov 2018 02:02:27 +0000 (21:02 -0500)]
Merge pull request #13156 from eileenmcnaughton/please_print

dev/core#371 remove please print this page text

5 years agodev/core#371 remove please print this page text
eileen [Sun, 25 Nov 2018 20:42:22 +0000 (09:42 +1300)]
dev/core#371 remove please print this page text

5 years agoMerge pull request #13154 from civicrm/5.8
Eileen McNaughton [Sun, 25 Nov 2018 20:03:36 +0000 (09:03 +1300)]
Merge pull request #13154 from civicrm/5.8

5.8 to master

5 years agoMerge pull request #13153 from colemanw/removejstree
Eileen McNaughton [Sun, 25 Nov 2018 20:03:13 +0000 (09:03 +1300)]
Merge pull request #13153 from colemanw/removejstree

Remove redundant jstree script from search form

5 years agoRemove redundant jstree script from search form
Coleman Watts [Sun, 25 Nov 2018 19:06:04 +0000 (14:06 -0500)]
Remove redundant jstree script from search form

5 years agoMerge pull request #13152 from civicrm/5.8
Eileen McNaughton [Sat, 24 Nov 2018 22:16:53 +0000 (11:16 +1300)]
Merge pull request #13152 from civicrm/5.8

5.8 to master

5 years agoMerge pull request #13150 from eileenmcnaughton/acl
Eileen McNaughton [Sat, 24 Nov 2018 22:16:24 +0000 (11:16 +1300)]
Merge pull request #13150 from eileenmcnaughton/acl

Fix check for financial acls to look for setting rather than sub-key of non-standard civicontribute_settings' setting

5 years agoMerge pull request #13133 from eileenmcnaughton/php72import
Monish Deb [Sat, 24 Nov 2018 10:01:44 +0000 (15:31 +0530)]
Merge pull request #13133 from eileenmcnaughton/php72import

dev/core#406 fix warnings under php 7.2 when importing

5 years agoExtract getContributionBalance function, use that rather than wrapper function from...
eileen [Thu, 22 Nov 2018 21:34:42 +0000 (10:34 +1300)]
Extract getContributionBalance function, use that rather than wrapper function from Contribution Main class

5 years agoMerge pull request #13149 from eileenmcnaughton/no_double_contribution
colemanw [Fri, 23 Nov 2018 00:40:30 +0000 (19:40 -0500)]
Merge pull request #13149 from eileenmcnaughton/no_double_contribution

dev/core#536 Remove duplicate call to contribution summary

5 years agoMerge pull request #13143 from eileenmcnaughton/importtest
Eileen McNaughton [Thu, 22 Nov 2018 21:56:05 +0000 (10:56 +1300)]
Merge pull request #13143 from eileenmcnaughton/importtest

Fix test name because it is not running & doesn't pass :-(

5 years agoFix test name because it is not running & doesn't pass :-(
eileen [Wed, 21 Nov 2018 11:23:16 +0000 (00:23 +1300)]
Fix test name because it is not running & doesn't pass :-(

5 years agoFix check for financial acls to look for setting rather than sub-key of non-standard...
eileen [Thu, 22 Nov 2018 02:25:46 +0000 (15:25 +1300)]
Fix check for financial acls to look for setting rather than sub-key of non-standard civicontribute_settings' setting

5 years agoMerge pull request #13066 from ejegg/php73
Eileen McNaughton [Thu, 22 Nov 2018 04:00:04 +0000 (17:00 +1300)]
Merge pull request #13066 from ejegg/php73

Fix continue / break PHP 7.3 warnings

5 years agoMerge pull request #13146 from eileenmcnaughton/cont_test
Eileen McNaughton [Thu, 22 Nov 2018 02:30:56 +0000 (15:30 +1300)]
Merge pull request #13146 from eileenmcnaughton/cont_test

Unit test set up tweak - Set trxn_id & invoice_id in tests as needed rather than by default.

5 years agoRemove duplicate call to contribution summary
eileen [Tue, 20 Nov 2018 07:31:14 +0000 (20:31 +1300)]
Remove duplicate call to contribution summary

This is an expensive call (we get it at over 10 seconds for high
giving contacts in a large database) and it is quite simply called twice.

Removing these few lines knock out several expensive queries but I have checked
contribution tab, user dashboard, contribution search and advanced search displayed
as contributions and can find no instances where less info is shown.

(in the case of advanced search displayed as contributions it doesn't show before or
after)

5 years agoMerge pull request #13140 from jitendrapurohit/core-540
Eileen McNaughton [Thu, 22 Nov 2018 01:29:45 +0000 (14:29 +1300)]
Merge pull request #13140 from jitendrapurohit/core-540

dev/core#540 - Civicrm Contact Dashboard returns fatal error

5 years agoSet trxn_id & invoice_id in tests as needed rather than by default.
eileen [Wed, 21 Nov 2018 21:22:44 +0000 (10:22 +1300)]
Set trxn_id & invoice_id in tests as needed rather than by default.

This causes work-arounds & flakiness by tests using this fn.
Better to add as required.

5 years agoMerge pull request #13126 from eileenmcnaughton/export_more
Eileen McNaughton [Wed, 21 Nov 2018 21:28:24 +0000 (10:28 +1300)]
Merge pull request #13126 from eileenmcnaughton/export_more

Export code cleanup - only construct one metadata array with all types of metadata

5 years agoMerge pull request #13145 from civicrm/5.8
Eileen McNaughton [Wed, 21 Nov 2018 19:54:13 +0000 (08:54 +1300)]
Merge pull request #13145 from civicrm/5.8

5.8 to master

5 years agoMerge pull request #13137 from eileenmcnaughton/user58
Eileen McNaughton [Wed, 21 Nov 2018 19:52:18 +0000 (08:52 +1300)]
Merge pull request #13137 from eileenmcnaughton/user58

dev/core#534 fix failure of print invoice to display on settings page

5 years agoFix missing Pay now link
eileen [Wed, 21 Nov 2018 10:08:56 +0000 (23:08 +1300)]
Fix missing Pay now link

5 years agoDisable function that doesn't work on jenkins (but does locally) for not
eileen [Wed, 21 Nov 2018 09:52:53 +0000 (22:52 +1300)]
Disable function that doesn't work on jenkins (but does locally) for not