civicrm-core.git
3 years agodev/core#2027 Add/update to UK county list
John Kingsnorth [Wed, 16 Sep 2020 11:11:06 +0000 (12:11 +0100)]
dev/core#2027 Add/update to UK county list

3 years agoMerge pull request #18486 from eileenmcnaughton/part
Monish Deb [Wed, 16 Sep 2020 07:29:11 +0000 (12:59 +0530)]
Merge pull request #18486 from eileenmcnaughton/part

dev/event#42 [Ref] Separate url path calculation into the relevant classes

3 years agoMerge pull request #18480 from eileenmcnaughton/dom_org
Seamus Lee [Wed, 16 Sep 2020 05:57:44 +0000 (15:57 +1000)]
Merge pull request #18480 from eileenmcnaughton/dom_org

dev/core#2039 Set is_primary to 1 on email, address for domain contacts

3 years agoMerge pull request #18487 from civicrm/5.30
Seamus Lee [Wed, 16 Sep 2020 05:51:04 +0000 (15:51 +1000)]
Merge pull request #18487 from civicrm/5.30

5.30

3 years ago[Ref] Separate url path calculation into the relevant classes
eileen [Wed, 16 Sep 2020 03:53:39 +0000 (15:53 +1200)]
[Ref] Separate url path calculation into the relevant classes

3 years agoMerge pull request #18482 from seamuslee001/5.30
Eileen McNaughton [Wed, 16 Sep 2020 04:17:47 +0000 (16:17 +1200)]
Merge pull request #18482 from seamuslee001/5.30

release-notes/5.29.1.md

3 years agoMerge pull request #18478 from seamuslee001/api_v4_fin_acl_test
Eileen McNaughton [Wed, 16 Sep 2020 04:17:04 +0000 (16:17 +1200)]
Merge pull request #18478 from seamuslee001/api_v4_fin_acl_test

[NFC] Enable APIv4 testing on the Fin ACL Extension Line Item test

3 years agoMerge pull request #18464 from eileenmcnaughton/urlparamms
Monish Deb [Wed, 16 Sep 2020 03:41:41 +0000 (09:11 +0530)]
Merge pull request #18464 from eileenmcnaughton/urlparamms

[REF] Start the process of separating the search action from the participant form

3 years agoMerge pull request #18463 from eileenmcnaughton/searchhhook
Monish Deb [Wed, 16 Sep 2020 03:11:10 +0000 (08:41 +0530)]
Merge pull request #18463 from eileenmcnaughton/searchhhook

dev/core#2017 remove unused SearchTaskHookSample.php

3 years agoRegenerate sql
eileen [Wed, 16 Sep 2020 02:03:04 +0000 (14:03 +1200)]
Regenerate sql

3 years agodev/core#2039 Set is_primary to 1 on email, address for domain contacts
eileen [Wed, 16 Sep 2020 00:52:52 +0000 (12:52 +1200)]
dev/core#2039 Set is_primary to 1 on email, address for domain contacts

I'm digging into the places where the code handles is_primary due to duplicate handling/ queries
- see https://lab.civicrm.org/dev/core/-/issues/2039

One distraction is that the domain contact's address & email are not marked is_primary. This
doesn't make sense to me as they ARE a contact in the DB

3 years agoMerge pull request #18403 from seamuslee001/dev_core_1486
Seamus Lee [Wed, 16 Sep 2020 01:50:38 +0000 (11:50 +1000)]
Merge pull request #18403 from seamuslee001/dev_core_1486

dev/core#1486 Remove Foreign Keys from ACL Cache tables and replace o…

3 years agorelease-notes/5.29.1.md
Tim Otten [Wed, 16 Sep 2020 01:28:47 +0000 (18:28 -0700)]
release-notes/5.29.1.md

3 years ago[NFC] Enable APIv4 testing on the Fin ACL Extension Line Item test
Seamus Lee [Wed, 16 Sep 2020 00:16:03 +0000 (10:16 +1000)]
[NFC] Enable APIv4 testing on the Fin ACL Extension Line Item test

3 years agoMerge pull request #18445 from eileenmcnaughton/activity
Seamus Lee [Wed, 16 Sep 2020 00:44:07 +0000 (10:44 +1000)]
Merge pull request #18445 from eileenmcnaughton/activity

[Ref] Code simplification - remove conditional chunk

3 years agoMerge pull request #18476 from eileenmcnaughton/location
Seamus Lee [Wed, 16 Sep 2020 00:27:28 +0000 (10:27 +1000)]
Merge pull request #18476 from eileenmcnaughton/location

[NFC] Remove trailing whitespace

3 years agodev/core#1486 Remove Foreign Keys relating to contacts from ACL Cache tables and...
Seamus Lee [Tue, 8 Sep 2020 01:35:40 +0000 (11:35 +1000)]
dev/core#1486 Remove Foreign Keys relating to contacts from ACL Cache tables and replace one with an index on contact_id

Create index on upgrade

3 years agoMerge pull request #18417 from eileenmcnaughton/pay_more
Seamus Lee [Wed, 16 Sep 2020 00:19:36 +0000 (10:19 +1000)]
Merge pull request #18417 from eileenmcnaughton/pay_more

dev/financial#86 Make 'Record Payment' & 'Record Refund' visible regardless of whether the balance 'requires' one

3 years ago[NFC] Remove trailing whitespace
eileen [Tue, 15 Sep 2020 23:08:24 +0000 (11:08 +1200)]
[NFC] Remove trailing whitespace

3 years agoMerge pull request #18468 from eileenmcnaughton/iso1
Seamus Lee [Tue, 15 Sep 2020 21:24:16 +0000 (07:24 +1000)]
Merge pull request #18468 from eileenmcnaughton/iso1

dev/core#1921 Remove iso convert

3 years agoMerge pull request #18474 from civicrm/5.30
Eileen McNaughton [Tue, 15 Sep 2020 21:12:30 +0000 (09:12 +1200)]
Merge pull request #18474 from civicrm/5.30

5.30

3 years agoMerge pull request #18473 from demeritcowboy/install-pear-db
Seamus Lee [Tue, 15 Sep 2020 21:04:16 +0000 (07:04 +1000)]
Merge pull request #18473 from demeritcowboy/install-pear-db

dev/core#2036 - PEAR::DB is no longer in packages, now autoloaded from vendor

3 years agoMerge pull request #18461 from demeritcowboy/entity-drupal-9
Seamus Lee [Tue, 15 Sep 2020 21:03:35 +0000 (07:03 +1000)]
Merge pull request #18461 from demeritcowboy/entity-drupal-9

dev/drupal#138 - Drupal 9 deprecations

3 years agoDB is no longer in packages, now autoloaded from vendor
demeritcowboy [Tue, 15 Sep 2020 17:57:24 +0000 (13:57 -0400)]
DB is no longer in packages, now autoloaded from vendor

3 years agoMerge pull request #18472 from totten/master-symlink
Eileen McNaughton [Tue, 15 Sep 2020 07:07:54 +0000 (19:07 +1200)]
Merge pull request #18472 from totten/master-symlink

dev/core#1393 - distmaker - Fix URL-based installation on D7/BD

3 years agodev/core#1393, dev/core#1990 - Exclude README.rst symlink
Tim Otten [Tue, 15 Sep 2020 02:58:36 +0000 (19:58 -0700)]
dev/core#1393, dev/core#1990 - Exclude README.rst symlink

3 years agodev/core#1393, dev/core#1990 - Assert that Drupal-style tarballs have no symlinks
Tim Otten [Tue, 15 Sep 2020 03:59:01 +0000 (20:59 -0700)]
dev/core#1393, dev/core#1990 - Assert that Drupal-style tarballs have no symlinks

3 years agoMerge pull request #18469 from eileenmcnaughton/iso2
Seamus Lee [Tue, 15 Sep 2020 00:25:30 +0000 (10:25 +1000)]
Merge pull request #18469 from eileenmcnaughton/iso2

dev/core#1921 Further removal of iso date handling

3 years agoMerge pull request #18431 from colemanw/searchUpdate
Seamus Lee [Mon, 14 Sep 2020 22:49:37 +0000 (08:49 +1000)]
Merge pull request #18431 from colemanw/searchUpdate

Search extension: edit smart groups

3 years agodev/core#1921 Further removal of iso date handling
eileen [Mon, 14 Sep 2020 20:55:42 +0000 (08:55 +1200)]
dev/core#1921 Further removal of iso date handling

Overview
----------------------------------------
Same deal as https://github.com/civicrm/civicrm-core/pull/18359

Before
----------------------------------------
Casting to ISO date to avoid 2014 bug

After
----------------------------------------
We are stuck in 2020

Technical Details
----------------------------------------

Comments
----------------------------------------
relevant tests
api_v3_CaseTest::testCaseMerge

3 years agodev/core#1921 Remove iso convert
eileen [Mon, 14 Sep 2020 20:49:07 +0000 (08:49 +1200)]
dev/core#1921 Remove iso convert

relevant tests
api_v3_CaseTest.testCaseActivityUpdate_Tracked
api_v3_CaseTest.testCaseActivityUpdateCustom

3 years agoMerge pull request #18467 from mattwire/membershiptestfix
Eileen McNaughton [Mon, 14 Sep 2020 20:00:12 +0000 (08:00 +1200)]
Merge pull request #18467 from mattwire/membershiptestfix

Fix parameters for MembershipTest

3 years agoAPIv4 Explorer: Only show result length if result is array
Coleman Watts [Fri, 11 Sep 2020 18:18:11 +0000 (14:18 -0400)]
APIv4 Explorer: Only show result length if result is array

3 years agoUpdate links to APIv4 smart groups to point to the new search ext
Coleman Watts [Fri, 11 Sep 2020 17:58:43 +0000 (13:58 -0400)]
Update links to APIv4 smart groups to point to the new search ext

3 years agoSearch ext: load saved searches
Coleman Watts [Fri, 11 Sep 2020 15:58:52 +0000 (11:58 -0400)]
Search ext: load saved searches

3 years agoSearch ext: improve debug output
Coleman Watts [Thu, 10 Sep 2020 15:39:25 +0000 (11:39 -0400)]
Search ext: improve debug output

3 years agoFix parameters for MembershipTest
Matthew Wire [Mon, 14 Sep 2020 16:03:08 +0000 (17:03 +0100)]
Fix parameters for MembershipTest

3 years ago[REF] Start the process of separating the search action from the participant form.
eileen [Mon, 14 Sep 2020 08:18:09 +0000 (20:18 +1200)]
[REF] Start the process of separating the search action from the participant form.

A lot code nastiness stems from the overloading of the participant registration form with the search task to register
multiples. A more logical structure would be some shared functionality but separate classes. This starts that
process, but with only the one property now separated to be a class property rather than a derived one. Later efforts
can disentangle which functionality belongs to which class

3 years agoMerge pull request #18460 from eileenmcnaughton/comment
Seamus Lee [Mon, 14 Sep 2020 06:33:59 +0000 (16:33 +1000)]
Merge pull request #18460 from eileenmcnaughton/comment

Update code comments

3 years agodev/core#2017 remove unused SearchTaskHookSample.php
eileen [Mon, 14 Sep 2020 04:44:43 +0000 (16:44 +1200)]
dev/core#2017 remove unused SearchTaskHookSample.php

This appears to be unused demo code. Interested to see if any intrepid sleuths can fix any
alternate explanation

3 years agoMerge pull request #18462 from civicrm/5.30
Eileen McNaughton [Mon, 14 Sep 2020 04:03:00 +0000 (16:03 +1200)]
Merge pull request #18462 from civicrm/5.30

5.30 to master

3 years agoMerge pull request #18459 from seamuslee001/dev_financial_147
Eileen McNaughton [Mon, 14 Sep 2020 04:02:26 +0000 (16:02 +1200)]
Merge pull request #18459 from seamuslee001/dev_financial_147

dev/financial#147 Ensure that jQuery Validation doesn't execute when …

3 years agoUpdate code comments
eileen [Mon, 14 Sep 2020 00:57:17 +0000 (12:57 +1200)]
Update code comments

Making these a little less paypal specific

3 years agodrupal 9 deprecations
demeritcowboy [Sun, 13 Sep 2020 03:48:03 +0000 (23:48 -0400)]
drupal 9 deprecations

3 years agoMerge pull request #18456 from eileenmcnaughton/iso1
Eileen McNaughton [Mon, 14 Sep 2020 01:46:14 +0000 (13:46 +1200)]
Merge pull request #18456 from eileenmcnaughton/iso1

dev/core#1921 remove isoToMysql

3 years agoMerge pull request #18432 from eileenmcnaughton/mem
colemanw [Mon, 14 Sep 2020 01:13:27 +0000 (21:13 -0400)]
Merge pull request #18432 from eileenmcnaughton/mem

[REF] Simplify array construction

3 years agoMerge pull request #18457 from eileenmcnaughton/mailer
Seamus Lee [Mon, 14 Sep 2020 01:12:39 +0000 (11:12 +1000)]
Merge pull request #18457 from eileenmcnaughton/mailer

dev/core#1921 remove isoToMysql

3 years agoMerge pull request #18435 from eileenmcnaughton/ms
colemanw [Mon, 14 Sep 2020 01:11:19 +0000 (21:11 -0400)]
Merge pull request #18435 from eileenmcnaughton/ms

[REF] minor tidy up on membershipStatus::create & add

3 years agoMerge pull request #18450 from eileenmcnaughton/activity2
colemanw [Mon, 14 Sep 2020 01:04:37 +0000 (21:04 -0400)]
Merge pull request #18450 from eileenmcnaughton/activity2

Pass in activity type rather than calculate it

3 years agodev/financial#147 Ensure that jQuery Validation doesn't execute when we click the...
Seamus Lee [Mon, 14 Sep 2020 00:59:28 +0000 (10:59 +1000)]
dev/financial#147 Ensure that jQuery Validation doesn't execute when we click the paypal express button and ensure the style of the button doesn't change

3 years agoMerge pull request #18452 from eileenmcnaughton/user
Eileen McNaughton [Mon, 14 Sep 2020 00:58:15 +0000 (12:58 +1200)]
Merge pull request #18452 from eileenmcnaughton/user

Move definition of userName to where it is used and remove an unused parameter

3 years agoMerge pull request #18454 from eileenmcnaughton/pay
Eileen McNaughton [Mon, 14 Sep 2020 00:57:52 +0000 (12:57 +1200)]
Merge pull request #18454 from eileenmcnaughton/pay

dev/financial#149 Add permission = false to apiv4 call to address unreleased regression

3 years agodev/core#1921 remove isoToMysql
eileen [Mon, 14 Sep 2020 00:09:23 +0000 (12:09 +1200)]
dev/core#1921 remove isoToMysql

Overview
----------------------------------------
Remove unnecessary isoToDate function

Before
----------------------------------------
Code compatible with packages code of 6 years ago

After
----------------------------------------
will break if you revert 6 year old fix....

Technical Details
----------------------------------------
The test testMailerStats passes through this line of code - which
I think is probably about the most we can confirm testing wise as we expect there
to be no reason to cast to mysql anymore

Comments
----------------------------------------
https://lab.civicrm.org/dev/core/-/issues/1921

3 years agodev/core#1921 remove isoToMysql
eileen [Sun, 13 Sep 2020 23:57:50 +0000 (11:57 +1200)]
dev/core#1921 remove isoToMysql

The test testPaymentDontChangeReceiveDate passes through these 2 lines of code - which
I think is probably about the most we can confirm testing wise as we expect there
to be no reason to cast to mysql anymore

3 years agoMerge pull request #18455 from civicrm/5.30
Eileen McNaughton [Sun, 13 Sep 2020 23:54:54 +0000 (11:54 +1200)]
Merge pull request #18455 from civicrm/5.30

5.30 to master

3 years agoMerge pull request #18453 from demeritcowboy/receipt-from-email-5.30
Eileen McNaughton [Sun, 13 Sep 2020 23:53:54 +0000 (11:53 +1200)]
Merge pull request #18453 from demeritcowboy/receipt-from-email-5.30

E_NOTICE on contribution confirm page

3 years agoMove definition of userName to where it is used and remove an unused paramter
eileen [Sun, 13 Sep 2020 22:12:54 +0000 (10:12 +1200)]
Move definition of userName to where it is used and remove an unused paramter

3 years agodev/financial#149 Add permission = false to apiv4 call to address regression
eileen [Sun, 13 Sep 2020 23:14:54 +0000 (11:14 +1200)]
dev/financial#149 Add permission = false to apiv4 call to address regression

This retrieves payment processors using FALSE for get permissions. I was able to replicate the bug in the test.

I also updated one line that I passed through when stepping through the test that related to the addActivity.
It just passes in activityType rather than leaving addActivity to figure that out

3 years agomissing ?? when converted from Array::value
demeritcowboy [Sun, 13 Sep 2020 22:40:35 +0000 (18:40 -0400)]
missing ?? when converted from Array::value

3 years ago[Ref] Code simplification - remove conditional chunk
eileen [Sun, 13 Sep 2020 07:54:30 +0000 (19:54 +1200)]
[Ref] Code simplification - remove conditional chunk

All this calculation of component is only to insert it into an error messaage that we don't expect to see
(ie it's an 'unknown error' error message, not an anticipated one.

Given that, it's hard to see why we would use so many lines of code to calculate it

3 years agoPass in activity type rather than calculate it
eileen [Sun, 13 Sep 2020 21:30:05 +0000 (09:30 +1200)]
Pass in activity type rather than calculate it

This line is hit in CRM_Event_BAO_ParticipantTest.testCreate
api_v3_ContributionTest.testCompleteTransactionWithParticipantRecord

I think we should be moving the logic back to the calling functions in general - to the point of them
just callling the v4 api directly, but this just clarifies on tiny bit

3 years agoMerge pull request #18434 from agh1/titlesingular
colemanw [Sun, 13 Sep 2020 19:01:17 +0000 (15:01 -0400)]
Merge pull request #18434 from agh1/titlesingular

Offer singular entity titles

3 years agoSearch ext: update to plural entity titles
Coleman Watts [Sun, 13 Sep 2020 17:21:16 +0000 (13:21 -0400)]
Search ext: update to plural entity titles

3 years agoDAOs with singular/plural options for entity titles
Andrew Hunt [Fri, 11 Sep 2020 20:46:17 +0000 (16:46 -0400)]
DAOs with singular/plural options for entity titles

3 years agoMerge pull request #18446 from colemanw/noDebugInApi3Test
colemanw [Sun, 13 Sep 2020 16:44:33 +0000 (12:44 -0400)]
Merge pull request #18446 from colemanw/noDebugInApi3Test

Remove unnecessary debug from tests which messes up array output

3 years agoRemove unnecessary debug from tests which messes up array output
Coleman Watts [Sun, 13 Sep 2020 13:08:10 +0000 (09:08 -0400)]
Remove unnecessary debug from tests which messes up array output

GetValue and debug can't really be used together. If the output is scalar,
then there's no place for the debug info to go. If the output is an array of values,
the debug info will be injected into the values, messing up the test.

3 years agoMerge pull request #18443 from demeritcowboy/symfony-public-more
Seamus Lee [Sun, 13 Sep 2020 00:00:58 +0000 (10:00 +1000)]
Merge pull request #18443 from demeritcowboy/symfony-public-more

Make symfony aliased services public

3 years agomake service public like in symfony 2.x
demeritcowboy [Sat, 12 Sep 2020 22:42:49 +0000 (18:42 -0400)]
make service public like in symfony 2.x

3 years agoMerge pull request #18440 from civicrm/5.30
Eileen McNaughton [Sat, 12 Sep 2020 20:17:47 +0000 (08:17 +1200)]
Merge pull request #18440 from civicrm/5.30

5.30 to master

3 years agoMerge pull request #18437 from colemanw/api4Perms
Eileen McNaughton [Sat, 12 Sep 2020 20:17:19 +0000 (08:17 +1200)]
Merge pull request #18437 from colemanw/api4Perms

dev/core#2008 APIv4 - Map specific action names to more generic versions

3 years agoMerge pull request #18438 from eileenmcnaughton/line
colemanw [Sat, 12 Sep 2020 17:03:43 +0000 (13:03 -0400)]
Merge pull request #18438 from eileenmcnaughton/line

[REF] Folllow up cleanup - remove now unused param

3 years agoAPIv4 - Map specific action names to more generic versions
Coleman Watts [Sat, 12 Sep 2020 01:03:36 +0000 (21:03 -0400)]
APIv4 - Map specific action names to more generic versions

3 years ago[REF] Folllow up cleanup - remove now unused param
eileen [Sat, 12 Sep 2020 06:37:51 +0000 (18:37 +1200)]
[REF] Folllow up cleanup - remove now unused param

In a recent regression fix we stopped returning  from getLine. This fully removes the, now unused,
parameter. The functions that call getLine calculate the total now

3 years agoMerge pull request #18433 from eileenmcnaughton/memstatus
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

3 years ago[REF] minor tidy up on membershipStatus::create & add
eileen [Fri, 11 Sep 2020 22:02:12 +0000 (10:02 +1200)]
[REF] minor tidy up on membershipStatus::create & add

We have been deprecating & removing the  array from BAO create & add actions - this continues that
(long slow) process'

3 years agoRemove unused property, null constructor
eileen [Fri, 11 Sep 2020 20:43:55 +0000 (08:43 +1200)]
Remove unused property, null constructor

3 years agoMerge pull request #18419 from colemanw/improveCustomFieldForm
Eileen McNaughton [Fri, 11 Sep 2020 20:29:08 +0000 (08:29 +1200)]
Merge pull request #18419 from colemanw/improveCustomFieldForm

Custom field form reform

3 years ago[REF] Simplify array construction
Coleman Watts [Thu, 10 Sep 2020 15:39:25 +0000 (11:39 -0400)]
[REF] Simplify array construction

In trying to interpret https://github.com/civicrm/civicrm-core/pull/17992

I realised that the code copies values from the dao to an array, copies the array
to another array, unsets most of the variables and then uses that second array.

This simplifies.

The easiest way to work through this code is in a debugger running

testProcessMembershipUpdateStatus

3 years agoMerge pull request #18405 from pradpnayak/lineItemFix
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

3 years agoCustom field admin form reform
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

3 years agoCustom Field Form - Cleanup country/state leftover cruft
Coleman Watts [Tue, 8 Sep 2020 15:27:32 +0000 (11:27 -0400)]
Custom Field Form - Cleanup country/state leftover cruft

3 years agoCustomField - Reformat data when modifying field serialize property.
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.

3 years agoMerge pull request #18429 from artfulrobot/fixpropertybagsetamount
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

3 years agoReplace & to and in button label
Pradeep Nayak [Tue, 8 Sep 2020 11:42:58 +0000 (12:42 +0100)]
Replace & to and in button label

3 years agoAdd tests for PropertyBag::setAmount()
Rich Lott / Artful Robot [Fri, 11 Sep 2020 13:30:33 +0000 (14:30 +0100)]
Add tests for PropertyBag::setAmount()

3 years agoMerge pull request #18428 from lcdservices/dev-core-2009
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

3 years agodev/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

3 years agoMerge pull request #18425 from seamuslee001/revert_credit_card_getter
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"

3 years agoMerge pull request #18426 from mattwire/clarifygetmembershipcount
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

3 years agoMerge pull request #18388 from eileenmcnaughton/line4
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

3 years agoRevert "PropertyBag - add cardNumber to getters"
eileen [Fri, 12 Jun 2020 22:50:44 +0000 (10:50 +1200)]
Revert "PropertyBag - add cardNumber to getters"

This reverts commit 194ae0f4206d0de00dea44553ac8a679cd771ea4.

3 years agoClarify what getMembershipCount does
Matthew Wire [Mon, 7 Sep 2020 15:32:18 +0000 (16:32 +0100)]
Clarify what getMembershipCount does

3 years agoMerge pull request #18404 from mattwire/membershipfrontenddep
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

3 years agoMerge pull request #17595 from eileenmcnaughton/settings
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

3 years agoAdd v4 api LineItem entity
eileen [Sun, 6 Sep 2020 20:25:44 +0000 (08:25 +1200)]
Add v4 api LineItem entity

3 years agoMerge pull request #18395 from eileenmcnaughton/memtype
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

3 years agoMerge pull request #17742 from MiyaNoctem/dev-core-1854-fix-resetting-overridden...
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

3 years agoMerge pull request #18406 from pradpnayak/MessageChange
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

3 years agoMerge pull request #18393 from eileenmcnaughton/just_load
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

3 years agoMerge pull request #18421 from eileenmcnaughton/calc
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