colemanw [Fri, 11 Sep 2020 22:24:23 +0000 (18:24 -0400)]
Merge pull request #18433 from eileenmcnaughton/memstatus
dev/core#2017 Remove unused property, override function that just calls parent
eileen [Fri, 11 Sep 2020 20:43:55 +0000 (08:43 +1200)]
Remove unused property, null constructor
Eileen McNaughton [Fri, 11 Sep 2020 20:29:08 +0000 (08:29 +1200)]
Merge pull request #18419 from colemanw/improveCustomFieldForm
Custom field form reform
Eileen McNaughton [Fri, 11 Sep 2020 19:05:05 +0000 (07:05 +1200)]
Merge pull request #18405 from pradpnayak/lineItemFix
Replace & to and in button label
Coleman Watts [Wed, 9 Sep 2020 13:47:23 +0000 (09:47 -0400)]
Custom field admin form reform
This overhauls the custom field administration form:
- Gets rid of the difficult-to-use hierarchcal select
- Removes changeFieldType as a separate form
- Allows changing field type on the main form, with improved validation
- Fixes up some metadata
- Improves choosing default values
Coleman Watts [Tue, 8 Sep 2020 15:27:32 +0000 (11:27 -0400)]
Custom Field Form - Cleanup country/state leftover cruft
Coleman Watts [Thu, 3 Sep 2020 21:50:07 +0000 (17:50 -0400)]
CustomField - Reformat data when modifying field serialize property.
Adds or removes CRM_Core_DAO::VALUE_SEPARATOR from custom values when switching a field from single to muti-valued.
Eileen McNaughton [Fri, 11 Sep 2020 18:24:59 +0000 (06:24 +1200)]
Merge pull request #18429 from artfulrobot/fixpropertybagsetamount
property bag's setAmount should ensure dot decimal point
Pradeep Nayak [Tue, 8 Sep 2020 11:42:58 +0000 (12:42 +0100)]
Replace & to and in button label
Rich Lott / Artful Robot [Fri, 11 Sep 2020 13:30:33 +0000 (14:30 +0100)]
Add tests for PropertyBag::setAmount()
Eileen McNaughton [Thu, 10 Sep 2020 21:47:11 +0000 (09:47 +1200)]
Merge pull request #18428 from lcdservices/dev-core-2009
dev/core#2009 filter grant dashboard to exclude trashed contacts
Brian Shaughnessy [Thu, 10 Sep 2020 19:10:09 +0000 (15:10 -0400)]
dev/core#2009 filter grant dashboard to exclude trashed contacts
Seamus Lee [Thu, 10 Sep 2020 12:05:09 +0000 (22:05 +1000)]
Merge pull request #18425 from seamuslee001/revert_credit_card_getter
Revert "PropertyBag - add cardNumber to getters"
Seamus Lee [Thu, 10 Sep 2020 11:51:02 +0000 (21:51 +1000)]
Merge pull request #18426 from mattwire/clarifygetmembershipcount
NFC Clarify what CRM_Price_BAO_Priceset::getMembershipCount does
colemanw [Thu, 10 Sep 2020 11:32:12 +0000 (07:32 -0400)]
Merge pull request #18388 from eileenmcnaughton/line4
dev/core#1980 Add v4 api LineItem entity
eileen [Fri, 12 Jun 2020 22:50:44 +0000 (10:50 +1200)]
Revert "PropertyBag - add cardNumber to getters"
This reverts commit
194ae0f4206d0de00dea44553ac8a679cd771ea4.
Matthew Wire [Mon, 7 Sep 2020 15:32:18 +0000 (16:32 +0100)]
Clarify what getMembershipCount does
Eileen McNaughton [Thu, 10 Sep 2020 09:41:51 +0000 (21:41 +1200)]
Merge pull request #18404 from mattwire/membershipfrontenddep
Switch frontend contribution form to cached/non-deprecated functions for membershipTypes
Seamus Lee [Thu, 10 Sep 2020 08:38:12 +0000 (18:38 +1000)]
Merge pull request #17595 from eileenmcnaughton/settings
PropertyBag - add cardNumber to getters
eileen [Sun, 6 Sep 2020 20:25:44 +0000 (08:25 +1200)]
Add v4 api LineItem entity
Seamus Lee [Thu, 10 Sep 2020 01:48:36 +0000 (11:48 +1000)]
Merge pull request #18395 from eileenmcnaughton/memtype
Make period_type mandatory for MembershipType
Eileen McNaughton [Thu, 10 Sep 2020 01:23:46 +0000 (13:23 +1200)]
Merge pull request #17742 from MiyaNoctem/dev-core-1854-fix-resetting-overridden-status-of-related-memberships
dev/core#1854: Fix Calculation of Overridden Membership Status
Eileen McNaughton [Thu, 10 Sep 2020 01:19:24 +0000 (13:19 +1200)]
Merge pull request #18406 from pradpnayak/MessageChange
Use title instead name in status message
Seamus Lee [Thu, 10 Sep 2020 01:02:21 +0000 (11:02 +1000)]
Merge pull request #18393 from eileenmcnaughton/just_load
Remove error handling from loadObjects
Seamus Lee [Thu, 10 Sep 2020 00:57:08 +0000 (10:57 +1000)]
Merge pull request #18421 from eileenmcnaughton/calc
Minor code simplification on date handling in getMembershipStatusByDate
eileen [Wed, 9 Sep 2020 20:24:40 +0000 (08:24 +1200)]
Minor code simplification on date handling in getMembershipStatusByDate
This deprecates 'today' as a synonym for 'now' as the latter is more standard and slightly simplifies the date handling
Seamus Lee [Wed, 9 Sep 2020 23:20:29 +0000 (09:20 +1000)]
Merge pull request #18424 from eileenmcnaughton/dep
Remove CRM_Contact_BAO_Contact::getPrimaryOpenId
Seamus Lee [Wed, 9 Sep 2020 22:13:27 +0000 (08:13 +1000)]
Merge pull request #18422 from eileenmcnaughton/iso
dev/core#1921 Remove more instances of civi 4.2 date handling
Seamus Lee [Wed, 9 Sep 2020 22:12:43 +0000 (08:12 +1000)]
Merge pull request #18420 from MegaphoneJon/membership-detail-custom-fields
report#49: add contact type custom fields to contribution details
eileen [Wed, 9 Sep 2020 21:48:59 +0000 (09:48 +1200)]
Remove CRM_Contact_BAO_Contact::getPrimaryOpenId
It seems it's only ever called from aa test now
eileen [Wed, 9 Sep 2020 20:53:26 +0000 (08:53 +1200)]
dev/core#1921 Remove more instances of civi 4.2 date handling
Per https://lab.civicrm.org/dev/core/-/issues/1921
Seamus Lee [Wed, 9 Sep 2020 20:49:50 +0000 (06:49 +1000)]
Merge pull request #18146 from eileenmcnaughton/export_custom
Export fix on long custom fields
eileen [Mon, 7 Sep 2020 02:03:50 +0000 (14:03 +1200)]
Make period_type mandatory for MembershipType
We have a test ensuring period_type is mandatory at the api level. However, it isn't for api
v4 - the error is a different issue (handling of pseudoconstants when mapping v3 to v4). This
fixes that separate issue & declares required to re-fix for v4
Eileen McNaughton [Wed, 9 Sep 2020 19:50:12 +0000 (07:50 +1200)]
Merge pull request #18418 from eileenmcnaughton/ref
[ref] Extract failContribution code
Jon Goldberg [Wed, 9 Sep 2020 19:48:32 +0000 (15:48 -0400)]
add custom fields to contribution details
colemanw [Wed, 9 Sep 2020 13:46:48 +0000 (09:46 -0400)]
Merge pull request #18410 from agh1/buttonrama
Buttonrama
Seamus Lee [Wed, 9 Sep 2020 10:24:31 +0000 (20:24 +1000)]
Merge pull request #16482 from eileenmcnaughton/super-perm
Implement more nuanced 'Administer CiviCRM permisions
eileen [Wed, 9 Sep 2020 07:24:52 +0000 (19:24 +1200)]
Extract failContribution code
Basic extraction
Eileen McNaughton [Wed, 9 Sep 2020 08:47:27 +0000 (20:47 +1200)]
Merge pull request #17641 from MegaphoneJon/core-1590
dev/core#1590: Don't send reminders on deleted events
Eileen McNaughton [Wed, 9 Sep 2020 08:06:07 +0000 (20:06 +1200)]
Merge pull request #18232 from sunilpawar/dev_1942_new
dev/core#1942 handle multiple membership of same membership type to u…
Seamus Lee [Wed, 9 Sep 2020 07:39:31 +0000 (17:39 +1000)]
Merge pull request #18413 from eileenmcnaughton/memtest
Membership form test cleanup, date cleanup on form
Seamus Lee [Wed, 9 Sep 2020 07:28:30 +0000 (17:28 +1000)]
Merge pull request #18414 from seamuslee001/jaap_test
[REF] Refactor price field form to allow for unit testing of the form
Seamus Lee [Wed, 9 Sep 2020 03:08:52 +0000 (13:08 +1000)]
[REF] Refactor price field form to allow for unit testing of the form
Set the assert equals to be an actual float number
Seamus Lee [Wed, 9 Sep 2020 06:03:48 +0000 (16:03 +1000)]
Merge pull request #18415 from eileenmcnaughton/acl
[REF] Minor readability fix
Eileen McNaughton [Wed, 9 Sep 2020 05:39:14 +0000 (17:39 +1200)]
Merge pull request #18076 from MegaphoneJon/better-on-behalf-of-2
[REF] change deprecated function to API4 call
Seamus Lee [Wed, 9 Sep 2020 05:28:25 +0000 (15:28 +1000)]
Merge pull request #18297 from eileenmcnaughton/jaap
dev/core#2003 Civicrm_price_field_value.amount truncation when localisation in play
eileen [Wed, 9 Sep 2020 02:29:47 +0000 (14:29 +1200)]
Membership form test cleanup, date cleanup on form
This converts the test set up to use the api and also does some mild date clean up on the form.
Supports https://github.com/civicrm/civicrm-core/pull/18395
eileen [Wed, 9 Sep 2020 04:18:45 +0000 (16:18 +1200)]
[REF] Minor readability fix
None of the table names in this query are localisable so we don't need to use variables
to refer to them.
Note the legacy dao->query() would require it if they were localisable whereas CRM_Core_DAO::executeQuery()
does not
Jon Goldberg [Thu, 18 Jun 2020 18:27:17 +0000 (14:27 -0400)]
core#1590: Don't send reminders to add'l recipients on deleted/inactive/template events
support reminders with event types/templates and multiple event/type/template IDs
fix
Seamus Lee [Wed, 9 Sep 2020 03:50:06 +0000 (13:50 +1000)]
Merge pull request #18317 from eileenmcnaughton/bug_test
Add postAssert to check payments and contributions are valid on all tests.
Seamus Lee [Tue, 8 Sep 2020 23:21:31 +0000 (09:21 +1000)]
Merge pull request #18412 from civicrm/5.30
5.30
Seamus Lee [Tue, 8 Sep 2020 22:52:11 +0000 (08:52 +1000)]
Merge pull request #18409 from eileenmcnaughton/j
Fix formatLocaleNumericRoundedByCurrency
Seamus Lee [Tue, 8 Sep 2020 20:58:02 +0000 (06:58 +1000)]
Merge pull request #18402 from eileenmcnaughton/5.30
Fix search extension excluded from tarball
Seamus Lee [Tue, 8 Sep 2020 20:57:19 +0000 (06:57 +1000)]
Merge pull request #18408 from alifrumin/5.30rn
[NFC] 5.30 release-notes: first stab at annotating and sorting release notes
eileen [Mon, 31 Aug 2020 06:28:20 +0000 (18:28 +1200)]
dev/core#1603 fix tangental bug on form handling of long options
This fixes the bug that derailed the fix for https://lab.civicrm.org/dev/core/-/issues/1603
On further testing I agree with Jitendra that the price field form was mis-saving the longer values (I only
tested with Euro style decimal separators but maybe on both) and it was bad data caused by this
that made the merged fix look like a regression.
I also observed that the Money functions intended to round only appeared to since it was rounding
just fine to 2 places, as tested, but it was still rounding to 2 places when we wanted more.
This fixes both the New Price field screen (when options are entered) and the edit options screen
Andrew Hunt [Tue, 8 Sep 2020 19:59:23 +0000 (15:59 -0400)]
Remove obsolete OFC flash-to-image code
eileen [Tue, 8 Sep 2020 19:36:32 +0000 (07:36 +1200)]
Fix formatLocaleNumericRoundedByCurrency
The function was rounding by a max of 2 regardless of the number of places passed - it
was only tested for 2 so seemed to work
Andrew Hunt [Thu, 6 Aug 2020 22:17:31 +0000 (18:17 -0400)]
More radical cleanup of button CSS
Andrew Hunt [Thu, 6 Aug 2020 22:00:58 +0000 (18:00 -0400)]
Fix CSS for new buttons
Andrew Hunt [Thu, 6 Aug 2020 20:06:56 +0000 (16:06 -0400)]
Fix JS for input buttons that are now button buttons
Andrew Hunt [Thu, 6 Aug 2020 19:36:47 +0000 (15:36 -0400)]
Remove deprecated submitOnce js function
Andrew Hunt [Thu, 6 Aug 2020 18:57:11 +0000 (14:57 -0400)]
No need for crm-button wrappers for real buttons
Andrew Hunt [Thu, 6 Aug 2020 17:55:52 +0000 (13:55 -0400)]
Give buttons a value when the submitted value is used to identify them
Andrew Hunt [Thu, 6 Aug 2020 17:12:36 +0000 (13:12 -0400)]
Put icons inside of button elements
Andrew Hunt [Thu, 6 Aug 2020 15:19:56 +0000 (11:19 -0400)]
Swap out button/submit inputs for button elements
Andrew Hunt [Thu, 30 Jul 2020 19:32:13 +0000 (15:32 -0400)]
Reset button height in the WP backend
Andrew Hunt [Thu, 30 Jul 2020 18:55:51 +0000 (14:55 -0400)]
Simplify button padding and set consistent line height
Andrew Hunt [Mon, 3 Aug 2020 23:19:01 +0000 (19:19 -0400)]
remove IE6-only CSS
Andrew Hunt [Thu, 30 Jul 2020 18:48:48 +0000 (14:48 -0400)]
Remove unused button-crm-i CSS
Andrew Hunt [Thu, 30 Jul 2020 18:46:48 +0000 (14:46 -0400)]
Remove weird styling for "Configure CKEditor" button
Andrew Hunt [Thu, 30 Jul 2020 18:36:13 +0000 (14:36 -0400)]
Standardize single space (not nbsp) between icon and text
Andrew Hunt [Thu, 30 Jul 2020 18:24:45 +0000 (14:24 -0400)]
Eliminate support for old jQuery UI based crm-button-icon icon buttons
Andrew Hunt [Thu, 30 Jul 2020 18:15:02 +0000 (14:15 -0400)]
No need for crm-i-button class
Andrew Hunt [Thu, 30 Jul 2020 18:04:39 +0000 (14:04 -0400)]
Icons on buttons positioned inline, not absolute
Alice Frumin [Thu, 3 Sep 2020 20:41:49 +0000 (16:41 -0400)]
5.30 release-notes: first stab at release notes
Pradeep Nayak [Tue, 8 Sep 2020 14:44:56 +0000 (15:44 +0100)]
Use title instead name in status message
colemanw [Tue, 8 Sep 2020 11:31:21 +0000 (07:31 -0400)]
Merge pull request #18365 from eileenmcnaughton/member
[REF] Code cleanup on membership renewal & test
Matthew Wire [Mon, 7 Sep 2020 15:28:58 +0000 (16:28 +0100)]
Switch frontend contribution form to cached/non-deprecated functions for membershipTypes
eileen [Sun, 6 Sep 2020 23:14:42 +0000 (11:14 +1200)]
Remove error handling from loadObjects
The processors now have their own try->catch so we don't need to catch here.
I wasn't sure about the debug_log_message part so I copied it into the processors
, at risk of duplicating
eileen [Tue, 8 Sep 2020 00:14:12 +0000 (12:14 +1200)]
Comment out implied permissions for administer CiviCRM system per discussion
eileen [Tue, 8 Sep 2020 00:37:25 +0000 (12:37 +1200)]
Fix search extension excluded from tarball
eileen [Thu, 6 Feb 2020 04:07:11 +0000 (17:07 +1300)]
Implement 'super permissions' as described by @totten
This picks up on an idea Tim has pushed several times - ie that instead of giving out 'Administer CiviCRM' willy nilly
we could deprioritise it in favour of 2 more granular permission bundles - ie Administer CiviCRM data & administe CiviCRM system.
This allows us to make some permissions more 'locked away' without endlessly adding new 'administer Payment Processors'
because we've realised not everyone who can create profiles needs to be able to see payment processor credentials.
It also allows us to make system checks less broadly visible where they are not appropriate.
Note that to proceed with this we would need to go through all places that check Administer CiviCRM & put in one
or both of the 2 new permissions. Having Administer CiviCRM implicitly includes anything granted to the existing
permissions so the implementation is smooth-ish there. However, I can imagine we would need a hook allowing people
to categorise themselves or we would find ourselves litigating all sorts
Seamus Lee [Tue, 8 Sep 2020 00:09:24 +0000 (10:09 +1000)]
Merge pull request #18401 from seamuslee001/update_eway_upgrade
[REF] Improve the human readable name of the eway upgrade step to be …
Seamus Lee [Mon, 7 Sep 2020 22:40:54 +0000 (08:40 +1000)]
[REF] Improve the human readable name of the eway upgrade step to be clearer about what it is doing and also fix issue with a hard fault if the eway single currency payment processor type has been already removed
Seamus Lee [Mon, 7 Sep 2020 22:24:15 +0000 (08:24 +1000)]
Merge pull request #18378 from colemanw/noMoreStupidHTMLTypes
Remove redundant custom field types
Seamus Lee [Mon, 7 Sep 2020 22:12:53 +0000 (08:12 +1000)]
Merge pull request #18399 from megaphonetech-dennis/contact-form-task_delete-php_spelling-fix
Contact form task delete php spelling fix
Seamus Lee [Mon, 7 Sep 2020 20:46:26 +0000 (06:46 +1000)]
Merge pull request #18245 from eileenmcnaughton/loop
Fix for ongoing issues with static upsetting the apple cart
Eileen McNaughton [Mon, 7 Sep 2020 20:37:47 +0000 (08:37 +1200)]
Merge pull request #18396 from swastikpareek/issue-1987-fix-template
dev/core#1987: Enable frontend and backend theme configuration in display preference page for Drupal CMS
Camilo Rodriguez [Mon, 7 Sep 2020 17:27:20 +0000 (18:27 +0100)]
dev/core#1854: Add Test to Check Bug Remains Fixed
Added test to check updating a membership's status doesn't cause the wrongful
deletion of related memberships.
Dennis P Osorio [Mon, 7 Sep 2020 16:22:21 +0000 (12:22 -0400)]
fixed spelling of address on lines 122 and 247
fixed capitalization on line 247
fix capitalization fix on line 122
Yashodha Chaku [Mon, 7 Sep 2020 13:20:46 +0000 (18:50 +0530)]
Merge pull request #18309 from demeritcowboy/link-cases-change-status
dev/core#1979 - Incorrect comparison of status_id when changing status of linked cases
Matthew Wire [Mon, 7 Sep 2020 09:42:54 +0000 (10:42 +0100)]
Merge pull request #18381 from eileenmcnaughton/depcom
Finish deprecating BaseIPN->completeTransaction
Matthew Wire [Mon, 7 Sep 2020 09:41:47 +0000 (10:41 +0100)]
Merge pull request #18372 from eileenmcnaughton/inv
Fix Invoice class to not call validateData
Matthew Wire [Mon, 7 Sep 2020 09:41:03 +0000 (10:41 +0100)]
Merge pull request #18373 from eileenmcnaughton/trans
[REF] Simplify loading of related objects in transition components
Matthew Wire [Mon, 7 Sep 2020 09:40:08 +0000 (10:40 +0100)]
Merge pull request #18385 from eileenmcnaughton/pay
[REF] simplify interaction with objects in complete order
Matthew Wire [Mon, 7 Sep 2020 09:38:56 +0000 (10:38 +0100)]
Merge pull request #18367 from eileenmcnaughton/validate
Remove unnecessary call to 'validateData' from pdf generator
Swastik Pareek [Wed, 2 Sep 2020 12:41:19 +0000 (13:41 +0100)]
dev/core#1987 Enable frontend and backend theme configuration in display preferences
Seamus Lee [Mon, 7 Sep 2020 01:44:55 +0000 (11:44 +1000)]
Merge pull request #18338 from agileware/CIVICRM-1555
Change wording on the Opt Out and Unsubscribe pages
Eileen McNaughton [Mon, 7 Sep 2020 01:27:01 +0000 (13:27 +1200)]
Merge pull request #18387 from seamuslee001/format_amount_deprecated
[REF] Mark CRM_Contribute_BAO_Contribution_Utils::formatAmount deprec…
Eileen McNaughton [Mon, 7 Sep 2020 01:25:03 +0000 (13:25 +1200)]
Merge pull request #18394 from seamuslee001/ref_memory_usage_create_single_value_alter
[NFC] Aim to reduce memory usage in create single value alter test by…