civicrm-core.git
5 years agodev/core#1344 Fix logic for displaying BillingName and Credit Card Details in email...
Seamus Lee [Tue, 29 Oct 2019 19:24:06 +0000 (06:24 +1100)]
dev/core#1344 Fix logic for displaying BillingName and Credit Card Details in email Receipts

5 years agoMerge pull request #15682 from seamuslee001/dev_core_1344_aditional_if
Seamus Lee [Fri, 1 Nov 2019 04:44:02 +0000 (15:44 +1100)]
Merge pull request #15682 from seamuslee001/dev_core_1344_aditional_if

dev/core#1344 Re-work if statements and remove excess ifs

5 years agodev/core#1344 Re-work if statements and remove excess ifs
Seamus Lee [Thu, 31 Oct 2019 22:42:34 +0000 (09:42 +1100)]
dev/core#1344 Re-work if statements and remove excess ifs

5 years agoMerge pull request #15638 from eileenmcnaughton/vangelis
Eileen McNaughton [Fri, 1 Nov 2019 03:04:37 +0000 (16:04 +1300)]
Merge pull request #15638 from eileenmcnaughton/vangelis

dev/core#1282 unit test for bug

5 years agoMerge pull request #15683 from eileenmcnaughton/test
Eileen McNaughton [Fri, 1 Nov 2019 02:30:37 +0000 (15:30 +1300)]
Merge pull request #15683 from eileenmcnaughton/test

[NFC] test cleanup

5 years agoMerge pull request #15681 from eileenmcnaughton/nfc
colemanw [Fri, 1 Nov 2019 00:38:54 +0000 (20:38 -0400)]
Merge pull request #15681 from eileenmcnaughton/nfc

[NFC] define variable type

5 years ago[NFC] test cleanup
eileen [Fri, 1 Nov 2019 00:35:40 +0000 (13:35 +1300)]
[NFC] test cleanup

I failed to replicate what I was trying to replicate but   adding the test cleanup for now

5 years agoMerge pull request #15677 from seamuslee001/event_smart_group_upgrade
Seamus Lee [Fri, 1 Nov 2019 00:15:24 +0000 (11:15 +1100)]
Merge pull request #15677 from seamuslee001/event_smart_group_upgrade

Add in upgrade step for upgrading Event date and Relationship Active Date smart groups

5 years agoMerge pull request #15680 from seamuslee001/dev_core_1344_straightforward
Seamus Lee [Thu, 31 Oct 2019 23:54:43 +0000 (10:54 +1100)]
Merge pull request #15680 from seamuslee001/dev_core_1344_straightforward

dev/core#1344 Fix complicated logic on credit card and billing name s…

5 years agoAdd in upgrade step for upgrading Event date smart groups
Seamus Lee [Thu, 31 Oct 2019 21:08:33 +0000 (08:08 +1100)]
Add in upgrade step for upgrading Event date smart groups

Include relation_active_period_date field for upgrade

5 years agoMerge pull request #15671 from eileenmcnaughton/rel_action
Seamus Lee [Thu, 31 Oct 2019 22:51:58 +0000 (09:51 +1100)]
Merge pull request #15671 from eileenmcnaughton/rel_action

Jcalendar conversion on relation_active_period_date

5 years ago[NFC] define variable type
eileen [Thu, 31 Oct 2019 22:13:20 +0000 (11:13 +1300)]
[NFC] define variable type

5 years agodev/core#1344 Fix complicated logic on credit card and billing name sections as agree...
Seamus Lee [Thu, 31 Oct 2019 22:10:55 +0000 (09:10 +1100)]
dev/core#1344 Fix complicated logic on credit card and billing name sections as agreed in #15651

5 years agoMerge pull request #15674 from eileenmcnaughton/tpls
Seamus Lee [Thu, 31 Oct 2019 21:35:31 +0000 (08:35 +1100)]
Merge pull request #15674 from eileenmcnaughton/tpls

Simplify billingName logic on xml/templates/message_templates/members…

5 years agoRemove test on legacy relative dates handling
eileen [Thu, 31 Oct 2019 11:04:41 +0000 (00:04 +1300)]
Remove test on legacy relative dates handling

5 years agoJcalendar converstion on relation_active_period_date
eileen [Thu, 31 Oct 2019 07:35:00 +0000 (20:35 +1300)]
Jcalendar converstion on relation_active_period_date

Same as https://github.com/civicrm/civicrm-core/pull/15661

Conversion excluded for now

5 years agoMerge pull request #15362 from yashodha/edit
Eileen McNaughton [Thu, 31 Oct 2019 21:15:58 +0000 (10:15 +1300)]
Merge pull request #15362 from yashodha/edit

(dev/core#1065) Member in Edit mode needs to be shown consistently

5 years agoMerge pull request #15661 from eileenmcnaughton/event
Seamus Lee [Thu, 31 Oct 2019 20:01:15 +0000 (07:01 +1100)]
Merge pull request #15661 from eileenmcnaughton/event

Jcalendar replacement for event date

5 years agoMerge pull request #15673 from eileenmcnaughton/set
Matthew Wire [Thu, 31 Oct 2019 18:42:01 +0000 (18:42 +0000)]
Merge pull request #15673 from eileenmcnaughton/set

Ensure contributionRecurID is set on processor

5 years agoMerge pull request #15672 from eileenmcnaughton/unreachable
colemanw [Thu, 31 Oct 2019 11:51:58 +0000 (07:51 -0400)]
Merge pull request #15672 from eileenmcnaughton/unreachable

[NFC] Remove unreachable lines

5 years agoEnsure contributionRecurID is available to payment processors that need it in cancelS...
eileen [Thu, 31 Oct 2019 10:10:26 +0000 (23:10 +1300)]
Ensure contributionRecurID is available to payment processors that need it in cancelSubscription

Discussion starts here https://chat.civicrm.org/civicrm/pl/9m1goccmtpdy58cb7jyx791t7e

5 years agoSimplify billingName logic on xml/templates/message_templates/membership_online_recei...
eileen [Thu, 31 Oct 2019 09:54:15 +0000 (22:54 +1300)]
Simplify billingName logic on xml/templates/message_templates/membership_online_receipt_html.tpl

5 years agoRemove unreachable lines
eileen [Thu, 31 Oct 2019 08:55:30 +0000 (21:55 +1300)]
Remove unreachable lines

5 years agoMerge pull request #15669 from eileenmcnaughton/yesno
Yashodha Chaku [Thu, 31 Oct 2019 08:29:55 +0000 (13:59 +0530)]
Merge pull request #15669 from eileenmcnaughton/yesno

Use Yes-No radio instead of checkbox on search form.

5 years agoJcalendar replacement for event date
eileen [Wed, 30 Oct 2019 06:45:36 +0000 (19:45 +1300)]
Jcalendar replacement for event date

5 years agoMerge pull request #15662 from eileenmcnaughton/lines
Seamus Lee [Wed, 30 Oct 2019 20:11:55 +0000 (07:11 +1100)]
Merge pull request #15662 from eileenmcnaughton/lines

[NFC] Test cleanup -  switch to OrderApi in test setup, add throws, use sin…

5 years agoUse Yes-No radio instead of checkbox on search form.
eileen [Wed, 30 Oct 2019 19:29:05 +0000 (08:29 +1300)]
Use Yes-No radio instead of checkbox on search form.

When a field has an html type of 'Checkbox' it means that when editing it we want a checkbox for
'yes' or 'no'. However in the search forms there is a 3rd option 'don't care'.

This change takes the context into account for those forms

5 years agoMerge pull request #15650 from demeritcowboy/mode-value-missing
Eileen McNaughton [Wed, 30 Oct 2019 18:44:25 +0000 (07:44 +1300)]
Merge pull request #15650 from demeritcowboy/mode-value-missing

dev/core#1347 - Fix php warning in advanced search when opening some accordions

5 years agoMerge pull request #15667 from JMAConsulting/generalise-qill-1
Eileen McNaughton [Wed, 30 Oct 2019 18:41:11 +0000 (07:41 +1300)]
Merge pull request #15667 from JMAConsulting/generalise-qill-1

Add getQillValue fn to generalise qill string construct

5 years agoMerge pull request #15664 from eileenmcnaughton/odd_payment2
Eileen McNaughton [Wed, 30 Oct 2019 18:35:27 +0000 (07:35 +1300)]
Merge pull request #15664 from eileenmcnaughton/odd_payment2

dev/financial#94 fix eroneous payment creation when editing line items

5 years agoAdd CRM_Contact_BAO_Query::getQillValue fn
Monish Deb [Wed, 30 Oct 2019 12:22:40 +0000 (17:52 +0530)]
Add CRM_Contact_BAO_Query::getQillValue fn

5 years agodev/financial#94 fix eroneous payment creation when editing line items
eileen [Wed, 30 Oct 2019 10:49:23 +0000 (23:49 +1300)]
dev/financial#94 fix eroneous payment creation when editing line items

Per https://lab.civicrm.org/dev/financial/issues/94 an eroneous payment transaction is being created when an extra line is
added to an order. The code comments indicate that during the last refactoring the chunk of code
doing this was identified as highly suspect and on re-review of it I'm sure it should go
as we are altering the items purchases, not recording payment in this routine.

I think it dates back to an earlier concept of the flow where altering what was purchased implictly
altered the payments towards that purchase

5 years agoTest cleanup - switch to OrderApi in test setup, add throws, use single quotes
eileen [Wed, 30 Oct 2019 09:38:46 +0000 (22:38 +1300)]
Test cleanup -  switch to OrderApi in test setup, add throws, use single quotes

5 years ago[NFC] code cleanup on test class
eileen [Wed, 30 Oct 2019 10:14:01 +0000 (23:14 +1300)]
[NFC] code cleanup on test class

5 years agoMerge pull request #15660 from totten/master-no-persistent
Eileen McNaughton [Wed, 30 Oct 2019 05:52:34 +0000 (18:52 +1300)]
Merge pull request #15660 from totten/master-no-persistent

Remove unused, hidden subsystem for "persistent DB tpl strings"

5 years agoUpgrader - Drop table "civicrm_persistent" (unless it has data)
Tim Otten [Wed, 30 Oct 2019 00:34:40 +0000 (17:34 -0700)]
Upgrader - Drop table "civicrm_persistent" (unless it has data)

5 years agosql/civicrm_generated.mysql - Update
Tim Otten [Wed, 30 Oct 2019 00:45:54 +0000 (17:45 -0700)]
sql/civicrm_generated.mysql - Update

5 years agoDB Tpl Strings - Remove table "civicrm_persistent"
Tim Otten [Wed, 30 Oct 2019 00:34:20 +0000 (17:34 -0700)]
DB Tpl Strings - Remove table "civicrm_persistent"

5 years agoDB Tpl Strings - Remove unused form 'civicrm/admin/tplstrings'
Tim Otten [Wed, 30 Oct 2019 00:29:26 +0000 (17:29 -0700)]
DB Tpl Strings - Remove unused form 'civicrm/admin/tplstrings'

If you grep for this (in v3.2, v5.20, and universe), you will find that the
only usages are self-referential or pro-forma:

- There is / never been a navigation item pointing to the page.
- There is no codepath which *consumes* data produced here.

5 years agoDB Tpl Strings - Remove unused Smarty function crmDBTpl
Tim Otten [Wed, 30 Oct 2019 00:24:05 +0000 (17:24 -0700)]
DB Tpl Strings - Remove unused Smarty function crmDBTpl

I've searched `universe` and haven't found any references to this.  This
appears to be the only code-path which consumes information from
`civicrm_persistent`.

I also went back to spot-check a few SVN branches of CiviCRM (v3.2, v3.3).
It appears that this was added in v3.2 *but never used or documented*.

5 years agoCRM_Upgrade_Incremental_Base - Add helper dropTableIfEmpty()
Tim Otten [Wed, 30 Oct 2019 00:20:46 +0000 (17:20 -0700)]
CRM_Upgrade_Incremental_Base - Add helper dropTableIfEmpty()

5 years agoCRM_Core_DAO - Add helper checkTableHasData()
Tim Otten [Wed, 30 Oct 2019 00:20:18 +0000 (17:20 -0700)]
CRM_Core_DAO - Add helper checkTableHasData()

5 years agoMerge pull request #15653 from eileenmcnaughton/billin_name
Seamus Lee [Tue, 29 Oct 2019 23:37:12 +0000 (10:37 +1100)]
Merge pull request #15653 from eileenmcnaughton/billin_name

dev/core#1344 Simplify email template logic on displaying card inform…

5 years agoMerge pull request #15659 from civicrm/5.19
Eileen McNaughton [Tue, 29 Oct 2019 23:36:07 +0000 (12:36 +1300)]
Merge pull request #15659 from civicrm/5.19

5.19

5 years agoMerge pull request #15657 from demeritcowboy/pledge-search-backport
Eileen McNaughton [Tue, 29 Oct 2019 23:35:51 +0000 (12:35 +1300)]
Merge pull request #15657 from demeritcowboy/pledge-search-backport

dev/core#1348 - pledge search not working backport of 15656

5 years agoMerge pull request #15658 from MikeyMJCO/patch-1
Eileen McNaughton [Tue, 29 Oct 2019 23:35:18 +0000 (12:35 +1300)]
Merge pull request #15658 from MikeyMJCO/patch-1

Delete mkdocs.yml

5 years agoMerge pull request #15655 from demeritcowboy/activity-search-form-values
Seamus Lee [Tue, 29 Oct 2019 22:08:27 +0000 (09:08 +1100)]
Merge pull request #15655 from demeritcowboy/activity-search-form-values

dev/core#1348 - backport of PR 15654

5 years agoMerge pull request #15652 from eileenmcnaughton/schema
Seamus Lee [Tue, 29 Oct 2019 21:49:51 +0000 (08:49 +1100)]
Merge pull request #15652 from eileenmcnaughton/schema

Add uniquenames for mailing_name, mailing_job_status

5 years agoDelete mkdocs.yml
Mikey O'Toole [Tue, 29 Oct 2019 21:48:30 +0000 (21:48 +0000)]
Delete mkdocs.yml

We may as well remove the old mkdocs.yml file as it's not used.

5 years agopledge search not working
DemeritCowboy [Tue, 29 Oct 2019 21:44:00 +0000 (17:44 -0400)]
pledge search not working

5 years agoactivity search not working at all
DemeritCowboy [Tue, 29 Oct 2019 21:08:31 +0000 (17:08 -0400)]
activity search not working at all

5 years agodev/core#1344 Simplify email template logic on displaying card information
eileen [Tue, 29 Oct 2019 20:19:33 +0000 (09:19 +1300)]
dev/core#1344 Simplify email template logic on displaying card information

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

5 years agoAdd uniquenames for mailing_name, mailing_job_status
eileen [Tue, 29 Oct 2019 19:28:14 +0000 (08:28 +1300)]
Add uniquenames for mailing_name, mailing_job_status

This is in support of https://github.com/civicrm/civicrm-core/pull/15369

Where the names in the search do not match the 'real names' we have 2 techniques

1) where adding a unique name to the schema gives a match we do that - here that is
the case for mailing_name
2) otherwise we ensure the schema has a unique name if appropriate &
rename the field in the upgrade scriptt

In this case when we look at CRM_Mailing_BAO_Query we don't see mailing_name
as present (only mailing_id which should be an entity reference field). However it
is used in the confusingly-not-related Mailing search so lets rename this
one at the same time.

5 years agoMerge pull request #15646 from eileenmcnaughton/add_pay
Seamus Lee [Tue, 29 Oct 2019 19:15:10 +0000 (06:15 +1100)]
Merge pull request #15646 from eileenmcnaughton/add_pay

dev/core#1344 Simplify email template logic on displaying billing detail

5 years agoMerge pull request #15626 from demeritcowboy/case-pdf-merge-order
Seamus Lee [Tue, 29 Oct 2019 19:11:48 +0000 (06:11 +1100)]
Merge pull request #15626 from demeritcowboy/case-pdf-merge-order

dev/core#893 - fix misfiled case print/merge pdfs (alternate to PR 15609/15364)

5 years agoMerge pull request #14763 from eileenmcnaughton/payment_3
Eileen McNaughton [Tue, 29 Oct 2019 19:07:20 +0000 (08:07 +1300)]
Merge pull request #14763 from eileenmcnaughton/payment_3

dev/financial#34 Fix line allocation in Payment.create

5 years agofix warning when no searchPane mapping for mode
DemeritCowboy [Tue, 29 Oct 2019 18:43:46 +0000 (14:43 -0400)]
fix warning when no searchPane mapping for mode

5 years agoMerge pull request #15648 from seamuslee001/relationship_date_cleanup_fixes
Eileen McNaughton [Tue, 29 Oct 2019 04:38:28 +0000 (17:38 +1300)]
Merge pull request #15648 from seamuslee001/relationship_date_cleanup_fixes

Cleanup following smart group conversions and fix the old name of the…

5 years agoCleanup following smart group conversions and fix the old name of the relationship...
Seamus Lee [Tue, 29 Oct 2019 01:33:00 +0000 (12:33 +1100)]
Cleanup following smart group conversions and fix the old name of the relationship date relative fields for conversion and add a unit test

5 years agoMerge pull request #15647 from demeritcowboy/regen-upper-lower
Seamus Lee [Tue, 29 Oct 2019 01:45:03 +0000 (12:45 +1100)]
Merge pull request #15647 from demeritcowboy/regen-upper-lower

Allow regen.sh to work with either upper/lower case for CMS name to match elsewhere

5 years agoMerge pull request #15637 from eileenmcnaughton/relationdates
Seamus Lee [Tue, 29 Oct 2019 01:19:19 +0000 (12:19 +1100)]
Merge pull request #15637 from eileenmcnaughton/relationdates

Convert relationship start & end dates to datepicker

5 years agowork with either upper/lower to match elsewhere
demeritcowboy [Tue, 29 Oct 2019 00:10:03 +0000 (20:10 -0400)]
work with either upper/lower to match elsewhere

5 years agoConvert relationship_start_date & relationship_end_date to datepicker
eileen [Mon, 28 Oct 2019 05:02:59 +0000 (18:02 +1300)]
Convert relationship_start_date & relationship_end_date to datepicker

This seems to work OK - look forwards to seeing you kick the tyres on it & see if you find any issues

5 years agoMerge pull request #15635 from eileenmcnaughton/contact_date
Seamus Lee [Mon, 28 Oct 2019 21:47:34 +0000 (08:47 +1100)]
Merge pull request #15635 from eileenmcnaughton/contact_date

dev/core#561 Convert birth_date & deceased_date to datepicker

5 years agoConvert birth_date & deceased_date to datepicker
eileen [Mon, 28 Oct 2019 04:13:07 +0000 (17:13 +1300)]
Convert birth_date & deceased_date to datepicker

5 years agoMerge pull request #15636 from eileenmcnaughton/relationship_date
Seamus Lee [Mon, 28 Oct 2019 20:40:48 +0000 (07:40 +1100)]
Merge pull request #15636 from eileenmcnaughton/relationship_date

Add unique name for relationship start & end dates

5 years agodev/core#1344 Simplify email template logic on displaying billing detail
eileen [Mon, 28 Oct 2019 20:26:51 +0000 (09:26 +1300)]
dev/core#1344 Simplify email template logic on displaying billing detail

Per https://lab.civicrm.org/dev/core/issues/1344 we currently use complex & fragile logic whereas we can simply display
what we have gathered. Since email templates are already being upgraded this release it feels like a good
opportunity to clean these up too.

This just includes one template - but I'll rip through the rest if this gets merged & people agree

5 years agoMerge pull request #15643 from omarabuhussein/fixing-optionvalues-xml-processing
Eileen McNaughton [Mon, 28 Oct 2019 19:35:43 +0000 (08:35 +1300)]
Merge pull request #15643 from omarabuhussein/fixing-optionvalues-xml-processing

Fixing a fatal error when installing extensions with Option Values defined in XML

5 years agoMerge pull request #15630 from eileenmcnaughton/pay_fail
Eileen McNaughton [Mon, 28 Oct 2019 19:34:22 +0000 (08:34 +1300)]
Merge pull request #15630 from eileenmcnaughton/pay_fail

Fix cancel payment action to reverse financial items related to cancelled payment

5 years agoMerge pull request #15644 from civicrm/5.19
Eileen McNaughton [Mon, 28 Oct 2019 19:33:08 +0000 (08:33 +1300)]
Merge pull request #15644 from civicrm/5.19

5.19 to master

5 years agoMerge pull request #15642 from MiyaNoctem/dev-core-1093-backport-fix-to-v5.19-rc
Eileen McNaughton [Mon, 28 Oct 2019 19:32:36 +0000 (08:32 +1300)]
Merge pull request #15642 from MiyaNoctem/dev-core-1093-backport-fix-to-v5.19-rc

dev/core#1093: Bckport Fix to v.5.19 to Add Custom Fields to Logging Tables

5 years agoFixing a fatal error when installing extensions with Option Values
Omar abu hussein [Mon, 28 Oct 2019 15:55:35 +0000 (15:55 +0000)]
Fixing a fatal error when installing extensions with Option Values
defined in XML

If an Extension has an option value defined in an XML file and the
option value belongs to an option group that is already defined in Civi
But in the XML (e.g activity_type option group) then installing the
extension will result in a fatal error with the following message :

"A fatal error was triggered: One of parameters (value: ) is not of the type Integer"

The error happen because CiviCRM fails to find the option group in the
XML file so it look for it in the database, but the code that look for
it pass the option group name as a SimpleXML object (since SimpleXML
does not return scalar values and rather objects of Type SimpleXML) and
because of that the code won't be able to find the value which will
result in executing a query that expect an integer but rather a NULL
pass to it which result in the fatal error.

I fixed it by casting the option group name inside the SimpleXML object
to string.

5 years agodev/core#1093: Add Custom Fields to Logging Tables
Camilo Rodríguez [Thu, 24 Oct 2019 18:34:54 +0000 (13:34 -0500)]
dev/core#1093: Add Custom Fields to Logging Tables

BulkSave method was adding fields to custom group table, but not to custom
group logging table. If these tables were updated on installation, before all
the schema is synced bewtween main and logging tables, fatal errors would be
thrown, as triggers tried to insert info into log tables missing required
fields.

Fixed by building log table after all fields are added to main table, and
before rebuilding triggers.

5 years agoMerge pull request #15639 from eileenmcnaughton/pay
Eileen McNaughton [Mon, 28 Oct 2019 11:32:51 +0000 (00:32 +1300)]
Merge pull request #15639 from eileenmcnaughton/pay

dev/financial#77 ++ Make contribution_id mandatory for PaymentProcessor.pay, pass invoiceID

5 years agodev/financial#77 ++ Make contribution_id mandatory for PaymentProcessor.pay, pass...
eileen [Mon, 28 Oct 2019 10:05:18 +0000 (23:05 +1300)]
dev/financial#77 ++ Make contribution_id mandatory for PaymentProcessor.pay, pass incoieID

Replaces https://github.com/civicrm/civicrm-core/pull/15477 & also resolves https://lab.civicrm.org/dev/financial/issues/77

by requiring contribution_id for PaymentProcessor.pay as a way to ensure that it is only called after the order is created
per our preferred flow (people could still get past this but it feels like they would at least know they werre
hacking our process & take responsibility for any issues if it breaks or we suddenly start enforcing that
it is a valid contribution.

This also sets some of the recommended variables. Note that I had to use a few more lines to ensure we were always setting
contactID, contributionRecurID to an integer. I do think this stricter approach is better but it wound up
more verbose

5 years agoMerge pull request #15375 from ixiam/dev_issue#1282
Eileen McNaughton [Mon, 28 Oct 2019 09:22:20 +0000 (22:22 +1300)]
Merge pull request #15375 from ixiam/dev_issue#1282

dev/core#1282 Takes care of customfields of type multiselect that were not being rendered

5 years agodev/core#1282, 1324 unit test for bug
eileen [Mon, 28 Oct 2019 08:09:29 +0000 (21:09 +1300)]
dev/core#1282, 1324 unit test for bug

5 years agoMerge pull request #15541 from ixiam/dev_issue#1324
Eileen McNaughton [Mon, 28 Oct 2019 08:08:12 +0000 (21:08 +1300)]
Merge pull request #15541 from ixiam/dev_issue#1324

Adds missing join on the customtable of address customfields while exposed as profile

5 years agoAdd unique name for relationship start & end dates
eileen [Mon, 28 Oct 2019 04:23:06 +0000 (17:23 +1300)]
Add unique name for relationship start & end dates

Preliminary to fixing for datepicker

5 years agoMerge pull request #15634 from eileenmcnaughton/mailing_date
Eileen McNaughton [Mon, 28 Oct 2019 05:12:42 +0000 (18:12 +1300)]
Merge pull request #15634 from eileenmcnaughton/mailing_date

Improve metadata support for table civicrm_mailing_job in search

5 years agoMerge pull request #15633 from seamuslee001/dev_core_561_mailing
Seamus Lee [Mon, 28 Oct 2019 04:32:25 +0000 (15:32 +1100)]
Merge pull request #15633 from seamuslee001/dev_core_561_mailing

dev/core#561 Convert mailing date search field to using datepicker

5 years agoMerge pull request #15631 from eileenmcnaughton/fix_it
Seamus Lee [Mon, 28 Oct 2019 04:04:25 +0000 (15:04 +1100)]
Merge pull request #15631 from eileenmcnaughton/fix_it

[REF] Further deconstruction of updateFinancialAccounts

5 years agoPass dbFieldName to dbFieldName parameter
eileen [Mon, 28 Oct 2019 03:45:15 +0000 (16:45 +1300)]
Pass dbFieldName to dbFieldName parameter

5 years agoImprove metadata support for table civicrm_mailing_job in search
eileen [Mon, 28 Oct 2019 02:56:17 +0000 (15:56 +1300)]
Improve metadata support for table civicrm_mailing_job in search

This makes the civicrm_mailing_job_start_date field available as
metadata and cleans up the code specifying how
civicrm_mailing_job gets joined in.

It turns out the code design has a pretty sensible methodology for ensuring that required
tables are added but unaware of this the tables
got configured all over the place in the where clause
functions.

5 years agodev/core#561 Convert mailing date search field to using datepicker
Seamus Lee [Mon, 28 Oct 2019 02:14:46 +0000 (13:14 +1100)]
dev/core#561 Convert mailing date search field to using datepicker

Some more cleanup and also open tab if specified in the URL

5 years agoMerge pull request #15629 from eileenmcnaughton/mailing_form
Seamus Lee [Sun, 27 Oct 2019 23:49:44 +0000 (10:49 +1100)]
Merge pull request #15629 from eileenmcnaughton/mailing_form

Change parent class on mailing_form

5 years agoMerge pull request #15627 from eileenmcnaughton/nfc
Seamus Lee [Sun, 27 Oct 2019 23:14:15 +0000 (10:14 +1100)]
Merge pull request #15627 from eileenmcnaughton/nfc

[NFC] reformat BAO_Case file

5 years agoFurther deconstruction of updateFinancialAccounts
eileen [Sun, 27 Oct 2019 23:08:01 +0000 (12:08 +1300)]
Further deconstruction of updateFinancialAccounts

updateFinancialAccounts is only called from one place with the context of 'changedStatus'. When called this
way the function updateFinancialAccountsOnContributionStatusChange is called & that 'tells'
the calling function whether to call the rest of this function.

Since this handling is specific to one place from which the function is called we can move that logic
back to the place that calls it & further simplify the updateFinancialAccounts function
which has been a bit of a haven of chaos

5 years agoFix cancel payment action to reverse financial items related to cancelled payment
eileen [Sun, 27 Oct 2019 22:54:53 +0000 (11:54 +1300)]
Fix cancel payment action to reverse financial items related to cancelled payment

The unit test to test & ensure this was failing to pick up that the records were not being created because it iterated
through the created rows & checked they were right but there was no check to ensure the rows were created :-(

This still leaves a gap I think for refunds not tied to a specific payment but that can be a later step

5 years agoMerge pull request #15601 from eileenmcnaughton/items
Seamus Lee [Sun, 27 Oct 2019 22:48:42 +0000 (09:48 +1100)]
Merge pull request #15601 from eileenmcnaughton/items

[REF] simplify definition of isARefund

5 years agoMerge pull request #15628 from eileenmcnaughton/mailing
Seamus Lee [Sun, 27 Oct 2019 22:48:23 +0000 (09:48 +1100)]
Merge pull request #15628 from eileenmcnaughton/mailing

[NFC] Add date information to MailingJob Schema

5 years agoAdd call to getSearchFieldMetadata
eileen [Sun, 27 Oct 2019 22:17:13 +0000 (11:17 +1300)]
Add call to getSearchFieldMetadata

5 years agoChange parent class on mailing_form
eileen [Sun, 27 Oct 2019 21:49:48 +0000 (10:49 +1300)]
Change parent class on mailing_form

5 years ago[REF] simplify definition of isARefund
eileen [Thu, 24 Oct 2019 23:24:28 +0000 (12:24 +1300)]
[REF] simplify definition of isARefund

5 years agoAdd date information to MailingJob Schema
eileen [Sun, 27 Oct 2019 21:42:20 +0000 (10:42 +1300)]
Add date information to MailingJob Schema

5 years agoMerge pull request #15625 from seamuslee001/e2e_cache_debugging
Seamus Lee [Sun, 27 Oct 2019 21:44:14 +0000 (08:44 +1100)]
Merge pull request #15625 from seamuslee001/e2e_cache_debugging

[NFC] Add in debugging to try and resolve E2E Cache intermitant test …

5 years ago[NFC] reformat BAO_Case file
eileen [Sun, 27 Oct 2019 21:38:52 +0000 (10:38 +1300)]
[NFC] reformat BAO_Case file

5 years agoExceptions
eileen [Sun, 27 Oct 2019 21:35:48 +0000 (10:35 +1300)]
Exceptions

5 years agoUpdate ArrayDecoratorTest.php
Tim Otten [Sun, 27 Oct 2019 20:07:26 +0000 (13:07 -0700)]
Update ArrayDecoratorTest.php

5 years agofix misfiled pdf merges
DemeritCowboy [Sun, 27 Oct 2019 12:18:35 +0000 (08:18 -0400)]
fix misfiled pdf merges