civicrm-core.git
5 years agoAdd upgrade routine
eileen [Sun, 3 Mar 2019 20:09:50 +0000 (09:09 +1300)]
Add upgrade routine

5 years agoConvert activity_date_time field to datepicker and add support for url input
eileen [Sat, 2 Mar 2019 05:48:47 +0000 (18:48 +1300)]
Convert activity_date_time field to datepicker and add support for url input

This converts the form to being a metadata defined field & a date-picker field as well
as adding standardised url support for input.

The input format is
activity_date_time_high=20100101

I stripped out the complex and probably broken based on feedback  & not used in core
existing hard-coded url support.

Note that there are some outstanding items
1) the upgrade script item needs to be added - this includes dealing with renaming of the field
since I made it more consistent
2) I stripped out the check to ensure the high date is greater than the low date
- if we still want this we should re-add as a generic thing. My guess is it's a bit optional

5 years agoMerge pull request #13720 from eileenmcnaughton/extract_2
Eileen McNaughton [Mon, 4 Mar 2019 23:32:29 +0000 (12:32 +1300)]
Merge pull request #13720 from eileenmcnaughton/extract_2

Speed up contribution results by removing join on civicrm_financial_type table when rendering search results.

5 years agoMerge pull request #13765 from seamuslee001/test_empty_on_hold
Eileen McNaughton [Mon, 4 Mar 2019 23:31:53 +0000 (12:31 +1300)]
Merge pull request #13765 from seamuslee001/test_empty_on_hold

Try and add data set example where email_on_hold / on_hold is NULL in…

5 years agoEliminate unnecessary join to civicrm_financial_type table to improve performance
eileen [Thu, 28 Feb 2019 03:55:21 +0000 (16:55 +1300)]
Eliminate unnecessary join to civicrm_financial_type table to improve performance

Although this join is indexed it affects index choice, often causing the right index not to
be used and slowing performance. I got subtantial speed improvement by eliminating this join

5 years agoAdd hack for qill
eileen [Thu, 28 Feb 2019 05:06:14 +0000 (18:06 +1300)]
Add hack for qill

This is a very minor extension of an existing hack but we should de-hack at some point.

Before this the qill is broken on payment instrument & contribution page too

5 years agoUse generic pseudoconstant declaration methodology to add financial_type to pseudocon...
eileen [Thu, 28 Feb 2019 01:21:59 +0000 (14:21 +1300)]
Use generic pseudoconstant declaration methodology to add financial_type to pseudoconstants

Getting away from the hard-hack allows us to have more consistent metadata for generic fields

5 years agoMerge pull request #13751 from seamuslee001/upgrade_karma
Seamus Lee [Mon, 4 Mar 2019 21:35:32 +0000 (08:35 +1100)]
Merge pull request #13751 from seamuslee001/upgrade_karma

Upgrade Karma version to latest version

5 years agoTry and add data set eaxmple where email_on_hold / on_hold is NULL in the formValues
Seamus Lee [Mon, 4 Mar 2019 21:31:20 +0000 (08:31 +1100)]
Try and add data set eaxmple where email_on_hold / on_hold is NULL in the formValues

5 years agoMerge pull request #13664 from eileenmcnaughton/activity_perms
colemanw [Mon, 4 Mar 2019 20:38:13 +0000 (15:38 -0500)]
Merge pull request #13664 from eileenmcnaughton/activity_perms

Rationalise Activity api ACLs for consistency, to respect the hook & improve performance

5 years agoMerge pull request #13761 from yashodha/reports
Eileen McNaughton [Mon, 4 Mar 2019 20:12:01 +0000 (09:12 +1300)]
Merge pull request #13761 from yashodha/reports

report clean up - remove redundant code

5 years agoMerge pull request #13726 from avall-llovera/patch-1
Yashodha Chaku [Mon, 4 Mar 2019 13:35:04 +0000 (19:05 +0530)]
Merge pull request #13726 from avall-llovera/patch-1

dev/core#767 Add 'Cancelled / Refunded Date' and 'Cancellation / Refund Reason'

5 years agoreport clean up - remove redundant code
yashodha [Mon, 4 Mar 2019 11:44:29 +0000 (17:14 +0530)]
report clean up - remove redundant code

5 years agoMerge pull request #13760 from civicrm/5.11
Eileen McNaughton [Mon, 4 Mar 2019 06:51:22 +0000 (19:51 +1300)]
Merge pull request #13760 from civicrm/5.11

5.11

5 years agoMerge pull request #13653 from MegaphoneJon/reporting-8
Yashodha Chaku [Mon, 4 Mar 2019 06:33:42 +0000 (12:03 +0530)]
Merge pull request #13653 from MegaphoneJon/reporting-8

reporting#8 - add thank-you dates to Contribution Summary/Detail reports

5 years agoMerge pull request #13757 from eileenmcnaughton/payment_extract
Eileen McNaughton [Mon, 4 Mar 2019 06:12:53 +0000 (19:12 +1300)]
Merge pull request #13757 from eileenmcnaughton/payment_extract

[REF] extract getToFinancialAccount from CRM_Contribute_PseudoConstantt::contributionStatus

5 years agoMerge pull request #13755 from eileenmcnaughton/event_fix
Seamus Lee [Mon, 4 Mar 2019 05:19:00 +0000 (16:19 +1100)]
Merge pull request #13755 from eileenmcnaughton/event_fix

dev/core#766 fix loss of custom fields when creating an event from template

5 years ago[REF] extract getToFinancialAccount from CRM_Contribute_PseudoConstant::contributionS...
eileen [Mon, 4 Mar 2019 02:31:17 +0000 (15:31 +1300)]
[REF] extract getToFinancialAccount from CRM_Contribute_PseudoConstant::contributionStatus

This makes the function much more readable. I felt that the is_payment logic should go but
resisted & just commented

5 years agoMerge pull request #13695 from eileenmcnaughton/extract_activity
Monish Deb [Mon, 4 Mar 2019 03:38:01 +0000 (09:08 +0530)]
Merge pull request #13695 from eileenmcnaughton/extract_activity

[ref] Extract activity payment creation

5 years agodev/core#766 fix loss of custom fields when creating an event from template
eileen [Mon, 4 Mar 2019 01:32:07 +0000 (14:32 +1300)]
dev/core#766 fix loss of custom fields when creating an event from template

5 years agoMerge pull request #13753 from seamuslee001/event_form_class_fix
Seamus Lee [Mon, 4 Mar 2019 01:07:49 +0000 (12:07 +1100)]
Merge pull request #13753 from seamuslee001/event_form_class_fix

Fix Custom post outer div class on event registration form

5 years agoFix Custom post outer div class on event registration form
Seamus Lee [Sun, 3 Mar 2019 23:49:33 +0000 (10:49 +1100)]
Fix Custom post outer div class on event registration form

5 years agoMerge pull request #13741 from jitendrapurohit/core-770
Eileen McNaughton [Sun, 3 Mar 2019 19:49:12 +0000 (08:49 +1300)]
Merge pull request #13741 from jitendrapurohit/core-770

dev/core#770 - View Case Activity page displays disabled custom fields

5 years agoMerge pull request #13690 from eileenmcnaughton/cleanup_payment_create
Monish Deb [Sun, 3 Mar 2019 08:11:07 +0000 (13:41 +0530)]
Merge pull request #13690 from eileenmcnaughton/cleanup_payment_create

Clean up Payment.create function

5 years agoMerge pull request #13400 from mfb/format-resource-url
Seamus Lee [Sun, 3 Mar 2019 04:37:17 +0000 (15:37 +1100)]
Merge pull request #13400 from mfb/format-resource-url

fix broken logic in CRM_Utils_System_DrupalBase::formatResourceUrl()

5 years agoUpgrade Karma version to latest version
Seamus Lee [Sun, 3 Mar 2019 01:19:18 +0000 (12:19 +1100)]
Upgrade Karma version to latest version

5 years agoMerge pull request #13750 from seamuslee001/master
Seamus Lee [Sun, 3 Mar 2019 00:40:12 +0000 (11:40 +1100)]
Merge pull request #13750 from seamuslee001/master

5.11

5 years agoMerge in 5.11
Seamus Lee [Sun, 3 Mar 2019 00:39:19 +0000 (11:39 +1100)]
Merge in 5.11

5 years agoMerge pull request #13747 from eileenmcnaughton/merge_master
Seamus Lee [Sun, 3 Mar 2019 00:34:12 +0000 (11:34 +1100)]
Merge pull request #13747 from eileenmcnaughton/merge_master

merge 5.11 to master

5 years agoCRM/Contact - Fix fatal error on tag search
Patrick Figel [Fri, 1 Mar 2019 18:28:27 +0000 (19:28 +0100)]
CRM/Contact - Fix fatal error on tag search

This fixes a fatal error caused by the CommaSeparatedIntegers not
accepting empty strings. This can be triggered by performing a
search with "Tag(s) IS NULL" using the search builder.

5 years agoAdd upgrade routine to convert on_hold to an array for sites with
eileen [Thu, 28 Feb 2019 21:44:22 +0000 (10:44 +1300)]
Add upgrade routine to convert on_hold to an array for sites with
civimail_multiple_bulk_emails set.

with that set we get a select box which needs an array rather than a checkbox.

Note from my testing there is problem loading the defaults due to the field name being
wrong - this aligns groups created before & after the 5.9 upgrade but does not resolve that.

    // preferred communication method
    if (Civi::settings()->get('civimail_multiple_bulk_emails')) {
      ->addSelect('email_on_hold',
        array('entity' => 'email', 'multiple' => 'multiple', 'label' => ts('Email On Hold'), 'options' => CRM_Core_PseudoConstant::emailOnHoldOptions()));
    }
    else {
      ->add('advcheckbox', 'email_on_hold', ts('Email On Hold')

5 years agodev/membership#10 fix incorrect validation error saying Start date must be the same...
eileen [Thu, 28 Feb 2019 22:33:13 +0000 (11:33 +1300)]
dev/membership#10 fix incorrect validation error saying Start date must be the same or later than Member since

This problem is because both dates exclude time but the default setting includes it - leading to a
comparison of a datetime with a date+midnight time

5 years agodev/core#770 - View Case Activity page displays disabled custom fields
Jitendra Purohit [Fri, 1 Mar 2019 07:09:41 +0000 (12:39 +0530)]
dev/core#770 - View Case Activity page displays disabled custom fields

5 years agoMerge pull request #13731 from eileenmcnaughton/5.11
Eileen McNaughton [Sat, 2 Mar 2019 06:20:28 +0000 (19:20 +1300)]
Merge pull request #13731 from eileenmcnaughton/5.11

dev/core#731 Add upgrade routine to convert on_hold to an array for sites with

5 years agoMerge pull request #13745 from mattwire/viewcancelledrecur
Eileen McNaughton [Sat, 2 Mar 2019 05:06:47 +0000 (18:06 +1300)]
Merge pull request #13745 from mattwire/viewcancelledrecur

Allow viewing of cancelled recurring contributions

5 years agoMerge pull request #13743 from greenpeace-cee/fix-tag-search
Eileen McNaughton [Sat, 2 Mar 2019 01:07:50 +0000 (14:07 +1300)]
Merge pull request #13743 from greenpeace-cee/fix-tag-search

CRM/Contact - Fix fatal error on tag search

5 years agoAllow viewing of cancelled recurring contributions
Matthew Wire (MJW Consulting) [Mon, 11 Feb 2019 18:26:42 +0000 (18:26 +0000)]
Allow viewing of cancelled recurring contributions

5 years agoMerge pull request #13744 from mattwire/upgrader_fix
Eileen McNaughton [Fri, 1 Mar 2019 21:19:46 +0000 (10:19 +1300)]
Merge pull request #13744 from mattwire/upgrader_fix

Upgrader: Don't abort if state_province already exists

5 years agoDon't abort if state_province already exists when upgrading
Matthew Wire (MJW Consulting) [Fri, 1 Mar 2019 19:39:33 +0000 (19:39 +0000)]
Don't abort if state_province already exists when upgrading

5 years agoCRM/Contact - Fix fatal error on tag search
Patrick Figel [Fri, 1 Mar 2019 18:28:27 +0000 (19:28 +0100)]
CRM/Contact - Fix fatal error on tag search

This fixes a fatal error caused by the CommaSeparatedIntegers not
accepting empty strings. This can be triggered by performing a
search with "Tag(s) IS NULL" using the search builder.

5 years agoMerge pull request #13566 from pradpnayak/ModifiedBy
Monish Deb [Fri, 1 Mar 2019 13:56:38 +0000 (19:26 +0530)]
Merge pull request #13566 from pradpnayak/ModifiedBy

dev/core#708, Fix Qill for Added by and Modified By

5 years agoMinor Payment.create tidy up.
eileen [Fri, 1 Mar 2019 07:17:50 +0000 (20:17 +1300)]
Minor Payment.create tidy up.

Rationalise methodology to decide if payment creates the contribution

5 years agoMerge pull request #13739 from seamuslee001/participant_payment_hook_correct
Eileen McNaughton [Fri, 1 Mar 2019 07:46:20 +0000 (20:46 +1300)]
Merge pull request #13739 from seamuslee001/participant_payment_hook_correct

Fix the invocation of post hook for ParticipantPayment ensuring that …

5 years agoMerge pull request #13734 from eileenmcnaughton/mem
Eileen McNaughton [Fri, 1 Mar 2019 06:50:26 +0000 (19:50 +1300)]
Merge pull request #13734 from eileenmcnaughton/mem

dev/membership#10 fix incorrect validation error saying Start date must be the same or later than Member since

5 years agoMerge pull request #13718 from eileenmcnaughton/payment_ref
Monish Deb [Fri, 1 Mar 2019 04:42:37 +0000 (10:12 +0530)]
Merge pull request #13718 from eileenmcnaughton/payment_ref

Decommision getPartialPaymentTrxn function

5 years agoMerge pull request #13740 from civicrm/5.11
Eileen McNaughton [Fri, 1 Mar 2019 04:20:00 +0000 (17:20 +1300)]
Merge pull request #13740 from civicrm/5.11

5.11

5 years agoMerge pull request #13738 from jitendrapurohit/core-768-rc
Seamus Lee [Fri, 1 Mar 2019 04:03:01 +0000 (15:03 +1100)]
Merge pull request #13738 from jitendrapurohit/core-768-rc

dev/core#768 - Fix fatal error on group search

5 years agoMerge pull request #13737 from seamuslee001/pdf_receipts_fix_enotice
Eileen McNaughton [Fri, 1 Mar 2019 03:43:21 +0000 (16:43 +1300)]
Merge pull request #13737 from seamuslee001/pdf_receipts_fix_enotice

Fix up e-notice error when using a user from email address same issue…

5 years agoFix the invocation of post hook for ParticipantPayment ensuring that an id is passed...
Seamus Lee [Fri, 1 Mar 2019 02:46:22 +0000 (13:46 +1100)]
Fix the invocation of post hook for ParticipantPayment ensuring that an id is passed in post hook

5 years agodev/core#768 - Fix fatal error on group search
Jitendra Purohit [Fri, 1 Mar 2019 02:39:31 +0000 (08:09 +0530)]
dev/core#768 - Fix fatal error on group search

5 years agoMerge pull request #13724 from agileware/CIVIEWAY-42
Eileen McNaughton [Fri, 1 Mar 2019 02:27:35 +0000 (15:27 +1300)]
Merge pull request #13724 from agileware/CIVIEWAY-42

Status of test contribution is not fetched on ThankYou page.

5 years agoFix up e-notice error when using a user from email address same issue as dev/core#644
Seamus Lee [Fri, 1 Mar 2019 00:28:00 +0000 (11:28 +1100)]
Fix up e-notice error when using a user from email address same issue as dev/core#644

5 years agoAdd upgrade routine to convert on_hold to an array for sites with
eileen [Thu, 28 Feb 2019 21:44:22 +0000 (10:44 +1300)]
Add upgrade routine to convert on_hold to an array for sites with
civimail_multiple_bulk_emails set.

with that set we get a select box which needs an array rather than a checkbox.

Note from my testing there is problem loading the defaults due to the field name being
wrong - this aligns groups created before & after the 5.9 upgrade but does not resolve that.

    // preferred communication method
    if (Civi::settings()->get('civimail_multiple_bulk_emails')) {
      ->addSelect('email_on_hold',
        array('entity' => 'email', 'multiple' => 'multiple', 'label' => ts('Email On Hold'), 'options' => CRM_Core_PseudoConstant::emailOnHoldOptions()));
    }
    else {
      ->add('advcheckbox', 'email_on_hold', ts('Email On Hold')

5 years agoMerge pull request #13736 from agileware/CIVICRM-1149
Eileen McNaughton [Fri, 1 Mar 2019 00:57:10 +0000 (13:57 +1300)]
Merge pull request #13736 from agileware/CIVICRM-1149

CiviCRM Membership Detail report, add column to display if membership is Primary or Inherited

5 years agoMerge pull request #13728 from JMAConsulting/dev/core#769
Eileen McNaughton [Fri, 1 Mar 2019 00:14:54 +0000 (13:14 +1300)]
Merge pull request #13728 from JMAConsulting/dev/core#769

dev/core#769 - Fix for ZipArchive->open() PHP bug

5 years agoMerge pull request #13732 from mattwire/refactor_smartgroupquery_upper1
Seamus Lee [Thu, 28 Feb 2019 23:43:03 +0000 (10:43 +1100)]
Merge pull request #13732 from mattwire/refactor_smartgroupquery_upper1

dev/core#748 Move UPPER() from sql to php domain

5 years agodev/membership#10 fix incorrect validation error saying Start date must be the same...
eileen [Thu, 28 Feb 2019 22:33:13 +0000 (11:33 +1300)]
dev/membership#10 fix incorrect validation error saying Start date must be the same or later than Member since

This problem is because both dates exclude time but the default setting includes it - leading to a
comparison of a datetime with a date+midnight time

5 years agoMerge pull request #13730 from civicrm/5.11
Seamus Lee [Thu, 28 Feb 2019 22:35:56 +0000 (09:35 +1100)]
Merge pull request #13730 from civicrm/5.11

5.11

5 years agoMove UPPER() from sql to php domain
Matthew Wire (MJW Consulting) [Thu, 28 Feb 2019 21:25:17 +0000 (21:25 +0000)]
Move UPPER() from sql to php domain

5 years agoMerge pull request #13717 from eileenmcnaughton/extract
Eileen McNaughton [Thu, 28 Feb 2019 21:24:02 +0000 (10:24 +1300)]
Merge pull request #13717 from eileenmcnaughton/extract

[REF] Extract lines to add the pseudoconstant to the select

5 years agoMerge pull request #13723 from eileenmcnaughton/5.11
Eileen McNaughton [Thu, 28 Feb 2019 20:59:46 +0000 (09:59 +1300)]
Merge pull request #13723 from eileenmcnaughton/5.11

financial#46 - clean money format at form layer - Fix mistreatment of event fees > 1000 when saving

5 years agoMerge pull request #13729 from colemanw/recentitems
Eileen McNaughton [Thu, 28 Feb 2019 19:51:13 +0000 (08:51 +1300)]
Merge pull request #13729 from colemanw/recentitems

Mark de.systopia.recentitems obsolete

5 years agoMerge pull request #13725 from JMAConsulting/CRM-21754-rc
Eileen McNaughton [Thu, 28 Feb 2019 19:47:11 +0000 (08:47 +1300)]
Merge pull request #13725 from JMAConsulting/CRM-21754-rc

Don't break loop if address fields not found while formatting rows in Reports

5 years agoMark de.systopia.recentitems obsolete
Coleman Watts [Thu, 28 Feb 2019 15:47:55 +0000 (10:47 -0500)]
Mark de.systopia.recentitems obsolete

5 years agodev/core#769 - Fix for ZipArchive->open() PHP bug
Edsel [Thu, 28 Feb 2019 12:33:49 +0000 (18:03 +0530)]
dev/core#769 - Fix for ZipArchive->open() PHP bug

5 years agodev/core#767 Add 'Cancelled / Refunded Date' and 'Cancellation / Refund Reason'
avall-llovera [Thu, 28 Feb 2019 10:03:16 +0000 (11:03 +0100)]
dev/core#767 Add 'Cancelled / Refunded Date' and 'Cancellation / Refund Reason'

Add the fields and filters 'Cancelled / Refunded Date' and 'Cancellation / Refund Reason' in the Detail Contributions Report

5 years agoDon't break loop if address fields not found while formatting rows in Reports
Monish Deb [Thu, 28 Feb 2019 09:49:29 +0000 (15:19 +0530)]
Don't break loop if address fields not found while formatting rows in Reports

5 years agoFix mistreatment of event fees > 1000 when saving
eileen [Thu, 28 Feb 2019 06:01:39 +0000 (19:01 +1300)]
Fix mistreatment of event fees > 1000 when saving

5 years agoMerge pull request #13721 from MegaphoneJon/5.11
Eileen McNaughton [Thu, 28 Feb 2019 05:33:35 +0000 (18:33 +1300)]
Merge pull request #13721 from MegaphoneJon/5.11

financial#46 - clean money format at form layer

5 years agoMerge pull request #13722 from civicrm/5.11
Eileen McNaughton [Thu, 28 Feb 2019 05:25:15 +0000 (18:25 +1300)]
Merge pull request #13722 from civicrm/5.11

5.11 to master

5 years agoMerge pull request #13711 from greenpeace-cee/fix-multi-currency-soft-credit
Eileen McNaughton [Thu, 28 Feb 2019 05:23:20 +0000 (18:23 +1300)]
Merge pull request #13711 from greenpeace-cee/fix-multi-currency-soft-credit

dev/core#756 - CRM/Contribute - Fix multi-currency soft credit summary

5 years agoMerge pull request #13704 from colemanw/age_asof_date
Eileen McNaughton [Thu, 28 Feb 2019 05:15:56 +0000 (18:15 +1300)]
Merge pull request #13704 from colemanw/age_asof_date

dev/core#561 Upgrade age_asof_date to datepicker in search

5 years agofinancial#46 - clean money format at form layer
Jon Goldberg [Thu, 28 Feb 2019 03:24:40 +0000 (22:24 -0500)]
financial#46 - clean money format at form layer

5 years agoDecommision getPartialPaymentTrxn function
eileen [Thu, 28 Feb 2019 02:33:19 +0000 (15:33 +1300)]
Decommision getPartialPaymentTrxn function

This function is only called from one place in the code & also from a test.

It is misleading as it implies a 'get' when it actually does an update
and it groups functionality in a way that doesn't make sense from the calling code pov

In this commit the function is removed and the lines are directly copied to the calling
function, as preparation for cleaning up the calling function

5 years agoSpelling fix
eileen [Thu, 28 Feb 2019 01:19:43 +0000 (14:19 +1300)]
Spelling fix

5 years agoExtract lines to add the pseudoconstant to the select
eileen [Thu, 28 Feb 2019 01:13:23 +0000 (14:13 +1300)]
Extract lines to add the pseudoconstant to the select

5 years agoMerge pull request #13686 from seamuslee001/phpword_upgrade
Eileen McNaughton [Wed, 27 Feb 2019 20:58:30 +0000 (09:58 +1300)]
Merge pull request #13686 from seamuslee001/phpword_upgrade

Upgrade PHPWord

5 years agodev/core#756 - CRM/Contribute - Fix multi-currency soft credit summary
Patrick Figel [Tue, 26 Feb 2019 20:06:13 +0000 (21:06 +0100)]
dev/core#756 - CRM/Contribute - Fix multi-currency soft credit summary

This fixes an exception caused by multiple currencies being passed to
CRM_Utils_Money::format. It also resolves some inconsistencies in how
the summary table is rendered for soft credits.

5 years agoUpgrade age_asof_date to datepicker in search
Coleman Watts [Mon, 25 Feb 2019 23:55:44 +0000 (18:55 -0500)]
Upgrade age_asof_date to datepicker in search

5 years agoCIVIEWAY-42: Unit test to verify the correct outcome message on ThankYou Page.
Alok Patel [Wed, 27 Feb 2019 13:46:31 +0000 (19:16 +0530)]
CIVIEWAY-42: Unit test to verify the correct outcome message on ThankYou Page.

5 years agoMerge pull request #13715 from eileenmcnaughton/order_fix
Monish Deb [Wed, 27 Feb 2019 09:15:46 +0000 (14:45 +0530)]
Merge pull request #13715 from eileenmcnaughton/order_fix

[minor cleanup] reduce params passed to searchQuery

5 years agoMerge pull request #13701 from colemanw/changeCaseTypeDate
Eileen McNaughton [Wed, 27 Feb 2019 08:04:55 +0000 (21:04 +1300)]
Merge pull request #13701 from colemanw/changeCaseTypeDate

Migrate date field to datepicker on ChangeCaseType form

5 years ago[REF] extract activity payment.
eileen [Mon, 25 Feb 2019 06:35:50 +0000 (19:35 +1300)]
[REF] extract activity payment.

THis is likely not it's last resting place but it does make the functions involved a lot simpler now

5 years agoMerge pull request #13692 from eileenmcnaughton/extract_record
Monish Deb [Wed, 27 Feb 2019 07:36:29 +0000 (13:06 +0530)]
Merge pull request #13692 from eileenmcnaughton/extract_record

[REF] Extract recordPayment portion

5 years ago[minor cleanup] reduce params passed to searchQuery
eileen [Wed, 27 Feb 2019 03:48:40 +0000 (16:48 +1300)]
[minor cleanup] reduce params passed to searchQuery

Where we are retrieving the sql we can call the inner function rather than passing 'true'
in other cases we are passing default values through

5 years agoMerge pull request #13710 from civicrm/5.11
Eileen McNaughton [Tue, 26 Feb 2019 23:06:36 +0000 (12:06 +1300)]
Merge pull request #13710 from civicrm/5.11

Merge 5.11 to master

5 years agoMerge pull request #13696 from mattwire/entityform_13578_fix
Eileen McNaughton [Tue, 26 Feb 2019 20:55:36 +0000 (09:55 +1300)]
Merge pull request #13696 from mattwire/entityform_13578_fix

Move assign of currency for entityForm outside of foreach so order of fields don't matter

5 years agoMerge pull request #13705 from eileenmcnaughton/atest
colemanw [Tue, 26 Feb 2019 19:39:40 +0000 (14:39 -0500)]
Merge pull request #13705 from eileenmcnaughton/atest

[TEST FIX] Increase uniqueness in testSingleNowDates

5 years agoMerge pull request #13638 from eileenmcnaughton/squash_products
colemanw [Tue, 26 Feb 2019 18:41:24 +0000 (13:41 -0500)]
Merge pull request #13638 from eileenmcnaughton/squash_products

dev/core#735 Do not include product in search results if site has none

5 years agoMerge pull request #13645 from eileenmcnaughton/ft_acl_test
colemanw [Tue, 26 Feb 2019 18:34:41 +0000 (13:34 -0500)]
Merge pull request #13645 from eileenmcnaughton/ft_acl_test

Code cleanup - remove extraneous permissions clause

5 years agoMerge pull request #13709 from JMAConsulting/dev-core#757-rc
colemanw [Tue, 26 Feb 2019 17:44:48 +0000 (12:44 -0500)]
Merge pull request #13709 from JMAConsulting/dev-core#757-rc

Viewing Contact Note comments is broken in 5.10.4.

5 years agoMerge pull request #13680 from eileenmcnaughton/order_test
colemanw [Tue, 26 Feb 2019 17:35:42 +0000 (12:35 -0500)]
Merge pull request #13680 from eileenmcnaughton/order_test

Fix & test searchQuery order by to be less dependent on what is selected for search

5 years agoFix bug in test set up
eileen [Tue, 26 Feb 2019 16:28:08 +0000 (05:28 +1300)]
Fix bug in test set up

5 years agoExtract recordPayment portion
eileen [Mon, 25 Feb 2019 05:38:53 +0000 (18:38 +1300)]
Extract recordPayment portion

5 years agoViewing Contact Note comments is broken in 5.10.4.
Ken West [Tue, 26 Feb 2019 11:33:52 +0000 (22:33 +1100)]
Viewing Contact Note comments is broken in 5.10.4.
Update Javascript to use Note-NNNNN rather than cnote_NNNN as the ID of Note rows.
Completes change started in commit 57abcbbf5cf85b1266377e0ad9af4fb5865d5bc0.

5 years agoIncrease uniqueness in testSingleNowDates
eileen [Tue, 26 Feb 2019 06:43:11 +0000 (19:43 +1300)]
Increase uniqueness in testSingleNowDates

Reduce instances of
AuthorizeNet failed for unknown reason.E00012: You have submitted a duplicate of Subscription 5642898. A duplicate subscription will not be created

5 years agoMerge pull request #13702 from mattwire/contributionrecur_payprocid_pseudoconstant_schema
Seamus Lee [Tue, 26 Feb 2019 03:57:00 +0000 (14:57 +1100)]
Merge pull request #13702 from mattwire/contributionrecur_payprocid_pseudoconstant_schema

Add pseudoconstant for payment_processor_id to contributionrecur

5 years agoAdd pseudoconstant for payment_processor_id to contributionrecur
Matthew Wire (MJW Consulting) [Mon, 25 Feb 2019 21:40:05 +0000 (21:40 +0000)]
Add pseudoconstant for payment_processor_id to contributionrecur

5 years agoMerge pull request #13666 from eileenmcnaughton/case_fix
Seamus Lee [Mon, 25 Feb 2019 20:35:58 +0000 (07:35 +1100)]
Merge pull request #13666 from eileenmcnaughton/case_fix

dev/core#739 Fix case detail report breaking when sorted by case type.

5 years agoMerge pull request #13658 from mfb/temp-force-utf8
Eileen McNaughton [Mon, 25 Feb 2019 20:23:23 +0000 (09:23 +1300)]
Merge pull request #13658 from mfb/temp-force-utf8

Phase out CIVICRM_TEMP_FORCE_UTF8