colemanw [Thu, 12 Oct 2023 14:06:01 +0000 (10:06 -0400)]
APIv4 - Prevent fatal errors when getOptions returns an empty array
Tim Otten [Thu, 12 Oct 2023 03:53:39 +0000 (20:53 -0700)]
Merge pull request #27755 from colemanw/afformPlacement
Afform - Unify 'is_dashlet', 'is_token' & 'contact_summary' as 'placement'
Eileen McNaughton [Wed, 11 Oct 2023 22:46:29 +0000 (11:46 +1300)]
Merge pull request #27784 from midtsveen/patch-2
Update civicrm_state_province.tpl
Eileen McNaughton [Wed, 11 Oct 2023 22:06:43 +0000 (11:06 +1300)]
Merge pull request #27790 from civicrm/5.67
5.67 to master
Eileen McNaughton [Wed, 11 Oct 2023 22:05:45 +0000 (11:05 +1300)]
Merge pull request #27788 from eileenmcnaughton/567_prem
Add weights to premium screen
pmarg | Erik Midtsveen [Wed, 11 Oct 2023 21:42:35 +0000 (21:42 +0000)]
Update civicrm_state_province.tpl
,
Eileen McNaughton [Wed, 11 Oct 2023 21:11:05 +0000 (10:11 +1300)]
Merge pull request #27786 from eileenmcnaughton/api_func
Tag `getSubmittedValue()` as externally supported
Eileen McNaughton [Wed, 11 Oct 2023 21:05:17 +0000 (10:05 +1300)]
Add weights to premium screen
Seamus Lee [Wed, 11 Oct 2023 21:00:00 +0000 (08:00 +1100)]
Merge pull request #27776 from eileenmcnaughton/fix_localize
Update smarty localize for Smarty3
Eileen McNaughton [Wed, 11 Oct 2023 19:50:24 +0000 (08:50 +1300)]
Tag getSubmittedValue as externally supported
colemanw [Wed, 11 Oct 2023 19:59:36 +0000 (15:59 -0400)]
Merge pull request #27733 from eileenmcnaughton/no_text_offline
Blank out the text version of the offline receipt template
pmarg | Erik Midtsveen [Wed, 11 Oct 2023 18:48:05 +0000 (18:48 +0000)]
Update civicrm_state_province.tpl
. = ,
pmarg | Erik Midtsveen [Wed, 11 Oct 2023 18:08:18 +0000 (18:08 +0000)]
Update civicrm_state_province.tpl
colemanw [Sun, 8 Oct 2023 08:14:29 +0000 (04:14 -0400)]
Afform - Unify 'is_dashlet', 'is_token' & 'contact_summary' as 'placement'
Gathering these items into an option group makes future placement
options easy to add, and easy for other extensions to contribute to.
Mathieu Lu [Wed, 11 Oct 2023 13:24:44 +0000 (09:24 -0400)]
Merge pull request #27767 from herbdool/standalone-forgot-pass
Add translation tags
Herb [Tue, 10 Oct 2023 14:25:17 +0000 (10:25 -0400)]
Add translation tags
colemanw [Wed, 11 Oct 2023 11:29:07 +0000 (07:29 -0400)]
Merge pull request #27778 from eileenmcnaughton/standalone
Standalone Smarty3 support
Yashodha Chaku [Wed, 11 Oct 2023 10:42:16 +0000 (16:12 +0530)]
Merge pull request #27780 from eileenmcnaughton/567_pcp
Add some weights to pcp page
Eileen McNaughton [Wed, 11 Oct 2023 06:45:09 +0000 (19:45 +1300)]
Merge pull request #27779 from totten/master-phpstorm-routes
phpstorm - Generate hints for Civi::paths(), Civi::url(), CRM_Utils_System::url()
Eileen McNaughton [Wed, 11 Oct 2023 05:33:31 +0000 (18:33 +1300)]
Add some weights to pcp page
Tim Otten [Wed, 11 Oct 2023 03:14:13 +0000 (20:14 -0700)]
phpstorm - Generate hints for Civi::paths()
Tim Otten [Wed, 11 Oct 2023 03:13:48 +0000 (20:13 -0700)]
phpstorm - Generate hints for Civi::url() and CRM_Utils_System::url()
demeritcowboy [Wed, 11 Oct 2023 02:10:41 +0000 (22:10 -0400)]
Merge pull request #27765 from eileenmcnaughton/create_address
Stop passing variable no longer in signature
Eileen McNaughton [Wed, 11 Oct 2023 02:03:35 +0000 (15:03 +1300)]
Standalone Smarty3 support
Eileen McNaughton [Wed, 11 Oct 2023 01:50:09 +0000 (14:50 +1300)]
Update smarty localize for Smarty3
Eileen McNaughton [Wed, 11 Oct 2023 01:40:59 +0000 (14:40 +1300)]
Merge pull request #27773 from eileenmcnaughton/pledge_smart
Fix notice on New Pledge form
colemanw [Wed, 11 Oct 2023 01:20:22 +0000 (21:20 -0400)]
Merge pull request #27771 from eileenmcnaughton/567
Do not run financial acls if the setting it not set
Eileen McNaughton [Wed, 11 Oct 2023 00:58:07 +0000 (13:58 +1300)]
Fix notice on New Pledge form
Eileen McNaughton [Wed, 11 Oct 2023 00:36:22 +0000 (13:36 +1300)]
Do not run financial acls if the setting it not set
Yeah - continues a fugly fix - but it's quick & works
Eileen McNaughton [Tue, 10 Oct 2023 21:58:39 +0000 (10:58 +1300)]
Merge pull request #27769 from systopia/fix_php_undefines_property
[PHP 8.2] fix undefined property in CRM_Event_Form_SelfSvcUpdate
colemanw [Tue, 10 Oct 2023 21:45:00 +0000 (17:45 -0400)]
Merge pull request #27766 from colemanw/quickSearchEmployer
QuickSearch - Add Current Employer option
Jo Franz [Tue, 10 Oct 2023 21:13:56 +0000 (23:13 +0200)]
php 7 compliance
Jo Franz [Tue, 10 Oct 2023 20:10:53 +0000 (22:10 +0200)]
PHP 8 fix undefines_property
colemanw [Tue, 10 Oct 2023 19:38:40 +0000 (15:38 -0400)]
Merge pull request #27763 from eileenmcnaughton/blank_text
Fix Participant form test to correctly test html version
colemanw [Tue, 10 Oct 2023 14:20:26 +0000 (10:20 -0400)]
QuickSearch - Add Current Employer option
colemanw [Tue, 10 Oct 2023 13:09:12 +0000 (09:09 -0400)]
Merge pull request #27722 from colemanw/civiCaseSelectWhereClause
CiviCase - Fix SelectWhereClause for Activity queries
Tim Otten [Tue, 10 Oct 2023 07:32:03 +0000 (00:32 -0700)]
Merge pull request #27652 from MegaphoneJon/faster-verp
CiviMail - Speed up generation of VERP URLs
colemanw [Tue, 10 Oct 2023 00:34:10 +0000 (20:34 -0400)]
ActivityTest - Fix tearDown to prevent test leakage
Eileen McNaughton [Mon, 9 Oct 2023 21:30:34 +0000 (10:30 +1300)]
Stop passing variable no longer in signature
Eileen McNaughton [Mon, 9 Oct 2023 20:20:59 +0000 (09:20 +1300)]
Fix Participant form test to correctly test html version
We were checking for text that is present on the text version - but not the html.
In this case the html version is right - ie we only show paid amount & balance if
relevant - ie if part payment has been made. If it is all paid or all unpaid we don't
colemanw [Sun, 8 Oct 2023 14:34:04 +0000 (10:34 -0400)]
Merge pull request #27759 from braders/paypalipn-exception
Fix message within exception (PayPalIPN)
colemanw [Sun, 8 Oct 2023 14:33:24 +0000 (10:33 -0400)]
Merge pull request #27758 from braders/proper-null
[NFC] Make null really null
colemanw [Sun, 8 Oct 2023 13:54:08 +0000 (09:54 -0400)]
Merge pull request #27757 from braders/remove-method-getEmailAddress
[REF] Remove getEmailAddress method which cannot work
colemanw [Sun, 8 Oct 2023 13:52:15 +0000 (09:52 -0400)]
Merge pull request #27756 from braders/renewOptionLocalVariable
[REF][PHP8.2] Replace dynmaic property with variable
Bradley Taylor [Sun, 8 Oct 2023 10:30:16 +0000 (11:30 +0100)]
Fix message within exception (PayPalIPN)
Bradley Taylor [Sun, 8 Oct 2023 10:21:13 +0000 (11:21 +0100)]
[NFC] Make null really null
Bradley Taylor [Sun, 8 Oct 2023 10:12:31 +0000 (11:12 +0100)]
[REF] Remove getEmailAddress method which cannot work
Bradley Taylor [Sun, 8 Oct 2023 10:06:13 +0000 (11:06 +0100)]
[REF][PHP8.2] Replace dynmaic property with variable
colemanw [Sun, 8 Oct 2023 08:13:58 +0000 (04:13 -0400)]
Core/ext - Remove unnecessary default values from packaged Afforms
Eileen McNaughton [Sat, 7 Oct 2023 21:29:29 +0000 (10:29 +1300)]
Merge pull request #27753 from civicrm/5.67
5.67 to master
Eileen McNaughton [Sat, 7 Oct 2023 21:27:21 +0000 (10:27 +1300)]
Merge pull request #27751 from braders/unused-var
[NFC] Remove unused var
colemanw [Sat, 7 Oct 2023 17:30:12 +0000 (13:30 -0400)]
Fix Activity ACL clause generation
Regression was caused by
918e583a146876fb42932a1d959796fd710b7b74 updating DAO::getSelectWhereClause
but not CRM_Contact_BAO_Query::generatePermissionClause. Turns out the code was being duplicated and
the latter could just call the former.
colemanw [Fri, 6 Oct 2023 18:45:01 +0000 (14:45 -0400)]
Fix tests not setting permissions properly
colemanw [Thu, 5 Oct 2023 18:01:25 +0000 (14:01 -0400)]
DAO - Handle OR clauses in getDynamicFkAclClauses, improve sql formatting for readability
Follow-up to
918e583a146876fb42932a1d959796fd710b7b74 - this correctly joins sub-arrays using OR
Bradley Taylor [Sat, 7 Oct 2023 16:39:00 +0000 (17:39 +0100)]
[NFC] Remove unused var
colemanw [Sat, 7 Oct 2023 13:45:34 +0000 (09:45 -0400)]
Merge pull request #27748 from eileenmcnaughton/register_567
Fix rc regression on register participants action
Eileen McNaughton [Sat, 7 Oct 2023 06:27:53 +0000 (19:27 +1300)]
Blonk out text version of offline event template
As our sendMessage protocol generates text versions at runtime
and the audience for these is vanishingly small we are moving towards
removing the shipped text versions of workflow messages in favour
of runtime-generated. The plan is to do this
with the offline-participant-receipt template first. By blanking it
out people who have not customised it should get the blank
version on upgrade.
Merging this part does not require any additional action but there
are some follow ons
Eileen McNaughton [Sat, 7 Oct 2023 05:55:56 +0000 (18:55 +1300)]
Merge pull request #27750 from civicrm/5.67
5.67
Seamus Lee [Sat, 7 Oct 2023 03:59:29 +0000 (14:59 +1100)]
Merge pull request #27747 from eileenmcnaughton/567
Regen (rc)
Eileen McNaughton [Sat, 7 Oct 2023 02:51:25 +0000 (15:51 +1300)]
Merge pull request #27745 from eileenmcnaughton/delete
Extend normal form for delete action
Eileen McNaughton [Sat, 7 Oct 2023 02:47:34 +0000 (15:47 +1300)]
Fix rc regression on register participants action
Fixes an rc bug where contact information was not being loaded per participant,
resulting in emails not going out
Eileen McNaughton [Sat, 7 Oct 2023 01:52:08 +0000 (14:52 +1300)]
Regen (rc)
Eileen McNaughton [Sat, 7 Oct 2023 01:44:29 +0000 (14:44 +1300)]
Merge pull request #27746 from eileenmcnaughton/master
5.67 to master (conflict resolved)
Eileen McNaughton [Sat, 7 Oct 2023 01:43:13 +0000 (14:43 +1300)]
Merge branch '5.67' of github.com:civicrm/civicrm-core
colemanw [Sat, 7 Oct 2023 01:36:12 +0000 (21:36 -0400)]
Merge pull request #27743 from eileenmcnaughton/notice_fix
Fix notice (smarty) in Event fee tab
colemanw [Sat, 7 Oct 2023 01:35:42 +0000 (21:35 -0400)]
Merge pull request #27728 from eileenmcnaughton/surver
Add some more weight fields
colemanw [Sat, 7 Oct 2023 01:34:52 +0000 (21:34 -0400)]
Merge pull request #27741 from eileenmcnaughton/567_event
Fix rc regression - balance amount missing
colemanw [Sat, 7 Oct 2023 01:33:32 +0000 (21:33 -0400)]
Merge pull request #27692 from eileenmcnaughton/billing_name
Switch to a token for billingName & address
Eileen McNaughton [Sat, 7 Oct 2023 01:32:08 +0000 (14:32 +1300)]
Extend normal form for delete action
colemanw [Sat, 7 Oct 2023 01:30:44 +0000 (21:30 -0400)]
Merge pull request #27738 from eileenmcnaughton/mail_empty
Trim text emails when checking if empty
Eileen McNaughton [Fri, 6 Oct 2023 23:15:41 +0000 (12:15 +1300)]
Fix rc regression - balance amount missing
This is pretty hard to get to (outside the test). You need to configure
an event with a pending contribution and then partially pay it
and go back & send a receipt.
Unfortunately the
Paid amount & Balance amount
got removed from the html version by accident
and the tests didn't pick it up because they were testing
the text version - which had not had many of the recent updates
applied (it was going to be done after but we have since decided to remove the
text version).
This updates the test to check the html version, puts back the removed text
and adds it to the preview screen
Eileen McNaughton [Sat, 7 Oct 2023 01:28:07 +0000 (14:28 +1300)]
Merge pull request #27744 from civicrm/5.67
5.67 to master
colemanw [Sat, 7 Oct 2023 00:50:06 +0000 (20:50 -0400)]
Merge pull request #27742 from eileenmcnaughton/smarty_tag
Fix missing quotes in tpl file
Eileen McNaughton [Sat, 7 Oct 2023 00:47:44 +0000 (13:47 +1300)]
Fix notice (smarty) in Event fee tab
Eileen McNaughton [Sat, 7 Oct 2023 00:43:30 +0000 (13:43 +1300)]
Fix missing quotes in tpl file
This is a longstanding error rather than a regression - but it hard failes when
Smarty3 is enabled. Smarty3 is a pretty good tool for finding issues when testing
the rc it turns out (highlights variable errors in smarty)
so I'm fixing in the rc so as not to be blocked on using smarty with the rc
Eileen McNaughton [Fri, 6 Oct 2023 20:57:29 +0000 (09:57 +1300)]
Trim text emails when checking if empty
I was concerned that inadvertant white space might block the addiiton of a text version.
The unit test showed that to be the case so I added the extra trim
Eileen McNaughton [Fri, 6 Oct 2023 20:27:23 +0000 (09:27 +1300)]
Merge pull request #27736 from colemanw/afformFnError
Afform - fix undefined function error
colemanw [Fri, 6 Oct 2023 14:37:45 +0000 (10:37 -0400)]
Afform - fix undefined function error
Fixes bug from
1ff8423300d85100e026741111383cdabd5fce05
colemanw [Fri, 6 Oct 2023 12:39:33 +0000 (08:39 -0400)]
Merge pull request #27577 from eileenmcnaughton/online_event
PHP8.x Stop sharing EventFee::preProcess from Registration form
Eileen McNaughton [Sat, 30 Sep 2023 04:55:10 +0000 (17:55 +1300)]
Switch to a token for billingName & address
This adds the token to the contribution entity & updates the event receipts
to use it (including the ones we are gonna kill cos
it was a simple replace).
Note I updated the format function to
access apiv4 style label fields & let the
chips fall where they may re event & county
(ie you probably wouldn't set county but if you
did AND your address format is configured to show it who are
we to say otherwise)
Seamus Lee [Fri, 6 Oct 2023 03:25:45 +0000 (14:25 +1100)]
Merge pull request #27732 from civicrm/5.67
5.67 to master
Eileen McNaughton [Fri, 6 Oct 2023 02:57:57 +0000 (15:57 +1300)]
Merge pull request #27730 from eileenmcnaughton/567
Notice fix
Eileen McNaughton [Fri, 6 Oct 2023 02:43:50 +0000 (15:43 +1300)]
Stop receiving billingID in createAddress
BillingID is determined in the form in one of 2 ways
- calling the function CRM_Core_BAO_LocationType::getBilling();
- hard-coding the number 5
There is no magic whereby it varies depending on the form & it is a source
of many undefined property errors.
I did a broader PR removing it, which stalled, so making this change makes it easier
to remove piecemeal
Eileen McNaughton [Fri, 6 Oct 2023 02:11:14 +0000 (15:11 +1300)]
Notice fix
Eileen McNaughton [Fri, 6 Oct 2023 02:09:39 +0000 (15:09 +1300)]
Merge pull request #27727 from seamuslee001/message_template_gencode_smarty3
[REF] Fix up Message template gencode to work with Smarty 3
Seamus Lee [Thu, 5 Oct 2023 23:32:57 +0000 (10:32 +1100)]
[REF] Fix up Message template gencode to work with Smarty 3
colemanw [Thu, 5 Oct 2023 02:22:53 +0000 (22:22 -0400)]
CiviCase - Add selectWhereClause for activities
Eileen McNaughton [Thu, 5 Oct 2023 23:58:13 +0000 (12:58 +1300)]
Add some more weight fields
Eileen McNaughton [Thu, 5 Oct 2023 21:57:21 +0000 (10:57 +1300)]
Merge pull request #27694 from larssandergreen/Change-to-soundasleep/html2text
Switch from html2text to soundasleep/html2text
Seamus Lee [Thu, 5 Oct 2023 21:10:05 +0000 (08:10 +1100)]
Merge pull request #27674 from eileenmcnaughton/smarty_var
Replace smarty.get with assigned snippet_type in tpl
Seamus Lee [Thu, 5 Oct 2023 21:05:02 +0000 (08:05 +1100)]
Merge pull request #27726 from asmac-org/delete-trackingFields
delete one more trackingFields reference
Jeff Kellem [Thu, 5 Oct 2023 17:31:41 +0000 (10:31 -0700)]
delete one more trackingFields reference
This one was missed from Delete probably-unused TrackingFields.tpl PR #27233
colemanw [Thu, 5 Oct 2023 13:07:45 +0000 (09:07 -0400)]
Merge pull request #27723 from larssandergreen/Make-mailing-link-a-field-in-FB
Expose URL for mailing trackable link for filters in FormBuilder
CiviCRM [Thu, 5 Oct 2023 05:30:26 +0000 (05:30 +0000)]
Set version to 5.68.alpha1
CiviCRM [Thu, 5 Oct 2023 05:30:14 +0000 (05:30 +0000)]
Set version to 5.67.beta1
Tim Otten [Thu, 5 Oct 2023 05:28:28 +0000 (22:28 -0700)]
Merge commit '
269f94546c'
Tim Otten [Thu, 5 Oct 2023 05:21:46 +0000 (22:21 -0700)]
Merge pull request #27725 from eileenmcnaughton/new-notice
Enotice fix
Tim Otten [Thu, 5 Oct 2023 04:41:37 +0000 (21:41 -0700)]
Merge pull request #27557 from eileenmcnaughton/bulk_create
dev/core#4567 Update code creating queue entries to save mailing_id
Eileen McNaughton [Thu, 5 Oct 2023 04:02:35 +0000 (17:02 +1300)]
Enotice fix
Tim Otten [Thu, 5 Oct 2023 03:50:37 +0000 (20:50 -0700)]
Merge pull request #27720 from eileenmcnaughton/566
Do not create new contacts during bounce processing