Tim Otten [Sun, 30 Aug 2015 21:18:58 +0000 (14:18 -0700)]
CRM_Utils_SQL_Select - Better error for malformed numbers
Tim Otten [Sun, 30 Aug 2015 13:55:12 +0000 (06:55 -0700)]
CRM-13422 - ActionMappings - getRecipientTypes(), getRecipientListing()
Changes:
* Declare getRecipientTypes() before getRecipientListing() because it's easier to read in that order.
* Tweak docblocks
* Split combined/legacy functions (Civi\ActionSchedule\Mapping) into simpler per-entity functions (CRM_Activity_ActionMapping, CRM_Event_ActionMapping).
* For "Contribution Type" reminders, allow targetting to soft creditors.
* For "Contribution Page" reminders, don't bother with soft-creditors. If someone paid through a self-service form, then I'm not sure we have soft-creditors.
Tim Otten [Sun, 30 Aug 2015 13:36:03 +0000 (06:36 -0700)]
CRM-13422 - Form/ScheduleReminders - Allow role filters on custom mappings
Previously, the 'Recipient Role' was only displayed if the results were
limited to 'participant_role'. Now, the field will be displayed if the
mapping's getRecipientListing($recipientType) returns any data.
Tim Otten [Sat, 29 Aug 2015 22:24:19 +0000 (15:24 -0700)]
CRM-13422 - MappingInterface::getRecipientTypes - Remove $noThanksJustKidding
This is a weird option that owes to a quirk in the UX -- where activity
roles are presented differently than other roles. That UX quirk probably
shouldn't exist, but given that it does... we'll push the quirk up into the
form layer (rather than in our API).
Tim Otten [Sat, 29 Aug 2015 22:05:13 +0000 (15:05 -0700)]
CRM-13422 - ActionMapping - Remove gratuitous `entity_recipient`
This just functions an alternate-key for `entity`. It's only used
internally by the legacy `Mapping` class and does not appear in
the public interface.
Tim Otten [Sat, 29 Aug 2015 19:52:20 +0000 (12:52 -0700)]
CRM-13422 - ActionSchedule - Kill getSelection() and getSelection1()
These are silly functions whose job is to wrap up data in a bundle using
mysterious names so that it can get immediately unwrapped.
Tim Otten [Sat, 29 Aug 2015 19:15:01 +0000 (12:15 -0700)]
CRM-13422 - Consolidate extra rules for contact reminders
Tim Otten [Sat, 29 Aug 2015 18:49:13 +0000 (11:49 -0700)]
CRM-13422 - Add MappingInterface::validateSchedule().
Also: In CRM_Admin_Form_ScheduleReminders, extract parseActionSchedule()
from postProcess(). Now we can call parseActionSchedule() from both
postProcess() and formRule().
Tim Otten [Sat, 29 Aug 2015 15:16:18 +0000 (08:16 -0700)]
CRM_Core_BAO_ActionSchedule::getSelection - Make it easier to trace dataflow
Tim Otten [Sat, 29 Aug 2015 14:56:34 +0000 (07:56 -0700)]
TokenRow - Fix docs
Tim Otten [Sat, 29 Aug 2015 14:54:38 +0000 (07:54 -0700)]
CRM_Utils_Array::collectMethod() and ::toKeyValueRows()
Tim Otten [Wed, 5 Aug 2015 05:23:17 +0000 (22:23 -0700)]
CRM-13422 - CRM_Contribute_ActionMapping_ByType
Tim Otten [Wed, 5 Aug 2015 04:59:06 +0000 (21:59 -0700)]
CRM-13422 - CRM_Contribute_ActionMapping_ByPage
Tim Otten [Wed, 5 Aug 2015 01:16:41 +0000 (18:16 -0700)]
CRM-13244 - civicrm_action_schedule.mapping_id - Change int to varchar
When modules define new mappings, it's easier if they can makeup their own
symbolic names rather than picking a number.
Tim Otten [Wed, 5 Aug 2015 00:40:14 +0000 (17:40 -0700)]
CRM-13244 - MappingInterface - Document/cleanup getRecipient* stuff
Tim Otten [Tue, 4 Aug 2015 07:51:04 +0000 (00:51 -0700)]
CRM-13244 - Split prepareMailingQuery() into entity-specific pieces.
Tim Otten [Tue, 4 Aug 2015 02:15:29 +0000 (19:15 -0700)]
CRM-13244 - ActionScheduleTmp - Move entity-specific parts to separate classes
Tim Otten [Tue, 4 Aug 2015 04:50:52 +0000 (21:50 -0700)]
CRM-13244 - RecipientBuilder::prepareStartDateClauses - Less stringiness
Tim Otten [Tue, 4 Aug 2015 00:10:38 +0000 (17:10 -0700)]
CRM-13244 - ActionMapping - Strictly use MappingInterface
Tim Otten [Sat, 1 Aug 2015 12:45:07 +0000 (05:45 -0700)]
CRM-13244 - RecipientBuilder - Move entity-specific bits to ActionMappings
Tim Otten [Wed, 29 Jul 2015 10:54:16 +0000 (03:54 -0700)]
CRM-13244 - Move buildRecipientContacts into new class. Split into smaller functions.
Note: This was originally written as a series of smaller changes, but they
were squashed. For more detailed history, check totten's repo for
alternative history leading up to, eg,
9e4d69e.
Tim Otten [Tue, 28 Jul 2015 08:49:29 +0000 (01:49 -0700)]
CRM-13244 - prepareMailingQuery - Use CRM_Utils_SQL_Select
Tim Otten [Wed, 29 Jul 2015 03:26:04 +0000 (20:26 -0700)]
CRM-13244 - ActionSchedule\Mapping - Privatize various fields
These fields are kind of stupid and are mostly only used within the Mapping
class.
The main external usage was for looking up a mapping record by
`entity_value`. However, this can be made simpler now that mapping IDs are
constant.
Tim Otten [Wed, 29 Jul 2015 02:11:51 +0000 (19:11 -0700)]
CRM-13244 - ActionSchedule - Externalize getMappings
Tim Otten [Mon, 27 Jul 2015 07:24:52 +0000 (00:24 -0700)]
CRM-13244 - ActionSchedule - Extract entity-specific logic for tokens and dropdowns.
The `ActionSchedule` BAO had a ton of duplicate, helter-skelter code for
looking up specific details about specific entities and mappings. The
mapping class (`CRM_Core_DAO_ActionMapping`) had an anemic model. The
mapping records could be modified in the DB, but in practice this was
pointless because they depended on so many hard-coded lookups. And there
were some confusing variable names (sel1, sel2, sel3, etc) and
variable-shuffling.
This revision moves several entity-specific bits into new classes
(`Civi\ActionSchedule\Mapping` and `CRM_Core_ActionScheduleTmp`), abandons
the pretense of DB editing, centralizes mapping-related lookups, and replaces
various references to `CRM_Core_DAO_ActionMapping`.
This is envisioned as an intermediate step; the two classes are still a bit
heavy (mixing together logic for unrelated entities) and should be split
further.
Tim Otten [Fri, 31 Jul 2015 23:58:06 +0000 (16:58 -0700)]
CRM_Core_BAO_ActionScheduleTest - Fix racy test
Tim Otten [Fri, 31 Jul 2015 02:07:47 +0000 (19:07 -0700)]
CRM-13244 - CRM_Core_BAO_ActionScheduleTest - Add some event examples
Tim Otten [Fri, 24 Jul 2015 09:34:45 +0000 (02:34 -0700)]
CRM-13244 - CRM_Core_BAO_ActionSchedule - Simplify `sendMailing()`
Tim Otten [Fri, 24 Jul 2015 07:10:23 +0000 (00:10 -0700)]
CRM-13244 - CRM_Core_BAO_ActionSchedule - Use TokenProcessor instead of replaceComponentTokens
Tim Otten [Fri, 24 Jul 2015 02:18:22 +0000 (19:18 -0700)]
CRM-13244 - CRM_Core_BAO_ActionSchedule - Simplify `sendReminder`
The old `sendReminder()` had too many responsibilities (loading token data
and processing token data and sending emails and sending SMS's), contained
lots of duplicate code, and did pointless variable shuffling. The Smarty
and HTML parameters were enforced inconsistently, and the "From" address had
weird side-effects, ad nauseum.
This commit splits `sendReminder()` into three pieces:
* `TokenCompatSubscriber` for filling in token data.
* `sendReminderSms()` for sending SMS.
* `sendReminderEmail()` for sending email.
Tim Otten [Thu, 23 Jul 2015 07:11:45 +0000 (00:11 -0700)]
CRM-13244 - Civi\Token - Add new class for processing messages with tokens.
Tim Otten [Tue, 21 Jul 2015 03:39:45 +0000 (20:39 -0700)]
CRM-13244 - CRM_Core_BAO_ActionSchedule - Comment about seemingly dead code
Tim Otten [Tue, 21 Jul 2015 03:38:05 +0000 (20:38 -0700)]
CRM-13244 - ActionSchedule - Normalize static references
Some code uses "self::" and other use "CRM_Core_BAO_ActionSchedule::". It'll
be easier to reorganize if the notation is consistent.
Tim Otten [Tue, 21 Jul 2015 03:12:46 +0000 (20:12 -0700)]
CRM-13244 - ActionSchedule - Extract methods from sendMailings
New methods
* listMailingTokens()
* prepareMailingQuery()
* prepareMailingTokens()
* createMailingActivity()
Tim Otten [Tue, 21 Jul 2015 05:15:03 +0000 (22:15 -0700)]
CRM-13244 - ActionScheduleTest - Use some tokens
Tim Otten [Sat, 25 Jul 2015 03:41:29 +0000 (20:41 -0700)]
CRM-16355 - bgm addon to change CMS locale - make it temporary
Tim Otten [Sat, 25 Jul 2015 01:03:06 +0000 (18:03 -0700)]
CRM-16355 - bgm addon to change CMS locale - cleanup
Samuel Vanhove [Wed, 29 Apr 2015 22:38:16 +0000 (18:38 -0400)]
CRM-16355 - bgm addon to change CMS locale
Samuel Vanhove [Wed, 29 Apr 2015 00:06:14 +0000 (20:06 -0400)]
CRM-16355 - checkstyle typos
Samuel Vanhove [Tue, 28 Apr 2015 23:58:02 +0000 (19:58 -0400)]
CRM-16355 - checkstyle typos
Samuel Vanhove [Tue, 28 Apr 2015 23:46:09 +0000 (19:46 -0400)]
CRM-16355 - communication language choices order + help text fixes
Samuel Vanhove [Tue, 28 Apr 2015 23:08:59 +0000 (19:08 -0400)]
CRM-16355 - cleanup, use of CRM_Core_I18n::language instead of a new function
Samuel Vanhove [Mon, 27 Apr 2015 03:18:13 +0000 (23:18 -0400)]
CRM-16355 - add the contact filter based on language and dynamic language change
Tim Otten [Mon, 27 Jul 2015 06:04:08 +0000 (23:04 -0700)]
CRM-16355 - UI and database - fixup
Samuel Vanhove [Sat, 25 Apr 2015 23:09:47 +0000 (19:09 -0400)]
CRM-16355 - UI and database
Dave Greenberg [Sat, 26 Sep 2015 22:22:26 +0000 (18:22 -0400)]
Merge pull request #6789 from jdax/fixing_drupal_text_confusion
CRM-17264 Profile: Duplicate User Notice Text Is Confusing
Coleman Watts [Sat, 26 Sep 2015 16:16:57 +0000 (12:16 -0400)]
Merge branch '4.6' into master
Conflicts:
CRM/Upgrade/Incremental/sql/4.6.9.mysql.tpl
colemanw [Sat, 26 Sep 2015 15:53:31 +0000 (11:53 -0400)]
Merge pull request #6805 from colemanw/case
Fix submitting multiple addRole popups on caseView
Coleman Watts [Sat, 26 Sep 2015 15:53:05 +0000 (11:53 -0400)]
Fix submitting multiple addRole popups on caseView
Kurund Jalmi [Fri, 25 Sep 2015 19:00:11 +0000 (00:30 +0530)]
Merge pull request #6799 from yashodha/CRM-17221
CRM-17221: Phuket spelt incorrectly as Phaket in states/counties table
Monish Deb [Fri, 25 Sep 2015 15:53:27 +0000 (21:23 +0530)]
Merge pull request #6801 from jitendrapurohit/casefix
CRM-17282 -- Fix DB error on Add/Manage Case
jitendrapurohit [Fri, 25 Sep 2015 11:38:33 +0000 (17:08 +0530)]
Fix DB error on Add/Manage Case
Monish Deb [Fri, 25 Sep 2015 07:18:55 +0000 (12:48 +0530)]
Merge pull request #6796 from monishdeb/CRM-17270
CRM-17270 fix - Custom country multi-select fields used in a Drupal V…
yashodha [Fri, 25 Sep 2015 04:12:47 +0000 (09:42 +0530)]
CRM-17221: Phuket spelt incorrectly as Phaket in states/counties table
----------------------------------------
* CRM-17221: Phuket spelt incorrectly as Phaket in states/counties table
https://issues.civicrm.org/jira/browse/CRM-17221
Eileen McNaughton [Fri, 25 Sep 2015 02:18:43 +0000 (14:18 +1200)]
Merge pull request #6752 from TobiasLounsbury/UFJoin_Delete
Added api UFJoin::delete
Eileen McNaughton [Fri, 25 Sep 2015 02:16:19 +0000 (14:16 +1200)]
Merge pull request #6798 from eileenmcnaughton/master
API tests: add test to see if preferred language works
eileen [Thu, 24 Sep 2015 21:34:17 +0000 (09:34 +1200)]
API tests: add test to see if preferred language works
Dave Greenberg [Thu, 24 Sep 2015 14:20:04 +0000 (10:20 -0400)]
Merge pull request #6780 from pradpnayak/CRM-17240
--CRM-17240, made financial type mandatory on create of price field v…
monishdeb [Thu, 24 Sep 2015 13:18:18 +0000 (18:48 +0530)]
CRM-17270 fix - Custom country multi-select fields used in a Drupal View display the four digit ID number instead of the name of the country
https://issues.civicrm.org/jira/browse/CRM-17270
Pradeep Nayak [Thu, 24 Sep 2015 11:01:06 +0000 (16:31 +0530)]
--CRM-17240, fixed tests
Yashodha Chaku [Thu, 24 Sep 2015 07:52:35 +0000 (13:22 +0530)]
Merge pull request #6777 from yashodha/CRM-17237
CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERV…
colemanw [Wed, 23 Sep 2015 21:09:45 +0000 (17:09 -0400)]
Merge pull request #6792 from colemanw/multisite
Remove multisite extension
Coleman Watts [Wed, 23 Sep 2015 19:57:26 +0000 (15:57 -0400)]
Remove multisite extension
Coleman Watts [Wed, 23 Sep 2015 19:54:03 +0000 (15:54 -0400)]
Add icon to profile form button
CiviCRM [Wed, 23 Sep 2015 18:05:23 +0000 (11:05 -0700)]
Update version to 4.7.alpha2
Kurund Jalmi [Wed, 23 Sep 2015 17:35:48 +0000 (23:05 +0530)]
removed unwanted files
Kurund Jalmi [Wed, 23 Sep 2015 16:17:31 +0000 (21:47 +0530)]
inlclude localization file
Nikki Murray [Wed, 23 Sep 2015 14:30:39 +0000 (10:30 -0400)]
CRM-17264: Profile: Duplicate User Notice Text Is Confusing
Monish Deb [Wed, 23 Sep 2015 14:20:03 +0000 (19:50 +0530)]
Merge pull request #6791 from monishdeb/47alpha1-upgrade-fix
4.7.alpha1 upgrade fixes
monishdeb [Wed, 23 Sep 2015 14:09:16 +0000 (19:39 +0530)]
CRM-16873: OnBehalf fix for multilingual
----------------------------------------
* CRM-16873: Migrating OnBehalf to ProfileContact
https://issues.civicrm.org/jira/browse/CRM-16873
jitendrapurohit [Wed, 23 Sep 2015 11:30:20 +0000 (17:00 +0530)]
4.7.alpha1 upgrade fix
jitendrapurohit [Wed, 23 Sep 2015 09:58:53 +0000 (15:28 +0530)]
include civi.php in distmaker
monishdeb [Wed, 23 Sep 2015 10:06:53 +0000 (15:36 +0530)]
47alpha1 upgrade fix
colemanw [Wed, 23 Sep 2015 01:02:32 +0000 (21:02 -0400)]
Merge pull request #6790 from totten/master-fys
CRM-16373 - Fix default for fiscalYearStart
Tim Otten [Wed, 23 Sep 2015 00:50:52 +0000 (17:50 -0700)]
CRM-16373 - Fix default for fiscalYearStart
Dave Greenberg [Tue, 22 Sep 2015 23:26:28 +0000 (16:26 -0700)]
Merge pull request #6788 from joannechester/crm-16195-rename-and-reorder
CRM-16195-rename-and-reorder
Dave Greenberg [Tue, 22 Sep 2015 23:05:01 +0000 (16:05 -0700)]
Merge pull request #6520 from mlutfy/4.6-crm17034
CRM-17034 : PriceField tax_amount should not be rounded
joannechester [Tue, 22 Sep 2015 22:59:02 +0000 (08:59 +1000)]
CRM-16195-after-regen.sh
Dave Greenberg [Tue, 22 Sep 2015 22:48:01 +0000 (15:48 -0700)]
Merge pull request #6787 from jitendrapurohit/CRM-17204
CRM-17204 - Empty Current Employer profile field disables employer re…
Eileen McNaughton [Tue, 22 Sep 2015 22:37:35 +0000 (10:37 +1200)]
Merge pull request #6783 from eileenmcnaughton/CRM-17258
CRM-17258 add created_id, owner_id to report_instances
Nikki Murray [Tue, 22 Sep 2015 21:24:07 +0000 (17:24 -0400)]
CRM-17264: Profile: Duplicate User Notice Text Is Confusing
Nikki Murray [Tue, 22 Sep 2015 21:17:01 +0000 (17:17 -0400)]
Fixing text to make it more clear that the user has an account but is not registered for an event
Dave Greenberg [Tue, 22 Sep 2015 18:27:35 +0000 (11:27 -0700)]
Merge pull request #6778 from eileenmcnaughton/CRM-17255
CRM-17255 group.api ACLS : do not exclude hidden groups for ACL users
Dave Greenberg [Tue, 22 Sep 2015 16:27:16 +0000 (09:27 -0700)]
Merge pull request #6759 from davecivicrm/CRM-16029
CRM-16029 - fix for create new financial type in when account relatio…
Monish Deb [Tue, 22 Sep 2015 14:36:45 +0000 (20:06 +0530)]
Merge pull request #6786 from monishdeb/CRM-17247
CRM-17247 fix - Vaildation fails silently on required fields (Drupal …
Monish Deb [Tue, 22 Sep 2015 13:04:58 +0000 (18:34 +0530)]
Merge pull request #6782 from monishdeb/CRM-17252
CRM-17252 fix - Advanced Search by Group broken
joannechester [Tue, 22 Sep 2015 12:32:56 +0000 (22:32 +1000)]
CRM-16195-rename-and-reorder
jitendrapurohit [Tue, 22 Sep 2015 12:32:52 +0000 (18:02 +0530)]
CRM-17204 - Empty Current Employer profile field disables employer relationship
monishdeb [Tue, 22 Sep 2015 09:46:20 +0000 (15:16 +0530)]
CRM-17247 fix - Vaildation fails silently on required fields (Drupal user editing)
https://issues.civicrm.org/jira/browse/CRM-17247
yashodha [Tue, 22 Sep 2015 05:35:23 +0000 (11:05 +0530)]
notice fix
eileen [Mon, 21 Sep 2015 22:51:15 +0000 (10:51 +1200)]
CRM-17258 add created_id, owner_id to report_instances
monishdeb [Mon, 21 Sep 2015 20:57:16 +0000 (02:27 +0530)]
CRM-17252 fix - Advanced Search by Group broken
https://issues.civicrm.org/jira/browse/CRM-17252
Dave Greenberg [Mon, 21 Sep 2015 17:53:02 +0000 (10:53 -0700)]
Merge pull request #6779 from JKingsnorth/patch-1
Version fix
Monish Deb [Mon, 21 Sep 2015 14:19:34 +0000 (19:49 +0530)]
Merge pull request #6767 from colemanw/CRM-17131
CRM-17131 - Fix where clause
John Kingsnorth [Mon, 21 Sep 2015 13:52:35 +0000 (14:52 +0100)]
Version fix
Pradeep Nayak [Mon, 21 Sep 2015 13:34:42 +0000 (19:04 +0530)]
--CRM-17240, made financial type mandatory on create of price field value through api
yashodha [Mon, 21 Sep 2015 13:31:28 +0000 (19:01 +0530)]
minor fixes
yashodha [Mon, 21 Sep 2015 11:38:19 +0000 (17:08 +0530)]
CRM-17237: more fixes
----------------------------------------
* CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERVED rule
https://issues.civicrm.org/jira/browse/CRM-17237
Kurund Jalmi [Mon, 21 Sep 2015 10:34:02 +0000 (16:04 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-21-15-52-41
Conflicts:
CRM/Contribute/BAO/ContributionPage.php
CRM/Core/Resources.php
Yashodha Chaku [Mon, 21 Sep 2015 09:34:52 +0000 (15:04 +0530)]
Merge pull request #6712 from jitendrapurohit/CRM-17146-tests
Test to check CRM-17146 - include trxn_date in completetransaction API