eileen [Mon, 5 Aug 2013 02:28:14 +0000 (14:28 +1200)]
essential fix on member payment bao I've made about 50 times & some keeps not making it into my PRs
eileen [Mon, 5 Aug 2013 02:25:31 +0000 (14:25 +1200)]
CRM-13155 move recur contribution search pane into subsidiary tpl
this appears to all work. To get recurring contributions with no contributions you have to manually clear 'test' - but as this is a bit of an edge case it can stay that way for now. I expect that this will become more important with the circle extension - but not today
eileen [Mon, 5 Aug 2013 01:44:49 +0000 (13:44 +1200)]
CRM-13155 fix search to join direct from contact when in contact context
eileen [Mon, 5 Aug 2013 01:26:13 +0000 (13:26 +1200)]
CRM-13155 search is working but a) the recurring should have a separate pane & b) on contact the search joins via contribution & doesn't find ones with no contribution
eileen [Mon, 5 Aug 2013 01:17:14 +0000 (13:17 +1200)]
CRM-13155 rename next_sched_contribution to end in date as search logic expects that & conformance seems better than hackery
colemanw [Mon, 5 Aug 2013 00:23:46 +0000 (17:23 -0700)]
Merge pull request #1332 from eileenmcnaughton/CRM-13148
CRM-13148 preparatory cleanup mostly moving js from tpl to js file
Coleman Watts [Mon, 5 Aug 2013 00:06:39 +0000 (17:06 -0700)]
Revert eileen's commit to BAO_Membership
Eileen McNaughton [Mon, 5 Aug 2013 00:06:27 +0000 (12:06 +1200)]
Opps changed wrong BAO per Colemans's comment
Eileen McNaughton [Mon, 5 Aug 2013 00:04:47 +0000 (12:04 +1200)]
use BAO obj not DAO per @colmanw comment
Coleman Watts [Sun, 4 Aug 2013 23:42:23 +0000 (16:42 -0700)]
Merge branch 'CRM-13067-bao-prep' of https://github.com/eileenmcnaughton/civicrm-core into CRM-13067-bao-prep
Conflicts:
api/v3/Membership.php
tests/phpunit/api/v3/MembershipTest.php
----------------------------------------
* CRM-13067-bao-prep:
http://issues.civicrm.org/jira/browse/CRM-13067-bao-prep
eileen [Sun, 4 Aug 2013 10:18:57 +0000 (22:18 +1200)]
CRM-13148 preliminary cleanup - move rest of js out of tpl
eileen [Sun, 4 Aug 2013 10:17:07 +0000 (22:17 +1200)]
unrelated e-notice fix
eileen [Sun, 4 Aug 2013 09:40:29 +0000 (21:40 +1200)]
CRM-13148 minor tidy up - remove smarty from js
eileen [Sun, 4 Aug 2013 09:37:34 +0000 (21:37 +1200)]
unrelated e-notice fix
eileen [Sun, 4 Aug 2013 08:15:19 +0000 (20:15 +1200)]
CRM-13148 partial move of js functions out of the tpl into the js file
eileen [Sun, 4 Aug 2013 08:02:06 +0000 (20:02 +1200)]
CRM-13148 basic tidy up - use 'recommended' functions / tpl js separation
eileen [Sun, 4 Aug 2013 07:45:07 +0000 (19:45 +1200)]
unrelated fix to broken test set up on BaseIPN
eileen [Sun, 4 Aug 2013 06:18:02 +0000 (18:18 +1200)]
fix api wrapper as CRM_Core_Exception fatals on the PEAR exception getUserMessage despite extending that exception
colemanw [Sun, 4 Aug 2013 22:50:40 +0000 (15:50 -0700)]
Merge pull request #1331 from colemanw/memberApi
Membership API date calculation CRM-13153
Coleman Watts [Sun, 4 Aug 2013 16:32:39 +0000 (09:32 -0700)]
Membership API date calculation CRM-13153
----------------------------------------
* CRM-13153: Improve Membership API to calculate dates
http://issues.civicrm.org/jira/browse/CRM-13153
Kurund Jalmi [Sun, 4 Aug 2013 18:04:48 +0000 (11:04 -0700)]
Merge pull request #1168 from eileenmcnaughton/CRM-13059
CRM-13059 fix relationship killing query
Coleman Watts [Sun, 4 Aug 2013 04:24:32 +0000 (21:24 -0700)]
Cleanup membership api
Kurund Jalmi [Sun, 4 Aug 2013 12:50:44 +0000 (05:50 -0700)]
Merge pull request #1326 from davecivicrm/CRM-13148
CRM-13148 Support use of cid=0 and cid=NNN for online contribution pages...
Kurund Jalmi [Sun, 4 Aug 2013 12:50:15 +0000 (05:50 -0700)]
Merge pull request #1327 from davecivicrm/CRM-13111
CRM-1311 Improved inline help for Honoree section.
Kurund Jalmi [Sun, 4 Aug 2013 12:48:48 +0000 (05:48 -0700)]
Merge pull request #1330 from eileenmcnaughton/master
test fixup- changed fn signature doesn't expect 'NULL'
eileen [Sun, 4 Aug 2013 07:15:34 +0000 (19:15 +1200)]
CRM-13067 fix up membership date setting to be done in BAO & work for API
eileen [Sun, 4 Aug 2013 03:00:36 +0000 (15:00 +1200)]
CRM-13142 as we have now have a unit test for date setting, dates do not need to be a reserved profile field
eileen [Sun, 4 Aug 2013 02:51:41 +0000 (14:51 +1200)]
CRM-13142 , CRM-13067 update tests to date setting is tested correctly
eileen [Sat, 3 Aug 2013 23:40:35 +0000 (11:40 +1200)]
CRM-13067 preparatory tidy-up on membership-payment api
CRM-13067 preparatory tidy-up on membership-payment api
eileen [Sat, 3 Aug 2013 00:37:06 +0000 (12:37 +1200)]
CRM-13067 mini-refactor - make options per wiki BAO std (ie. params holds
ids & ids is optional / on the way out
CRM-13067 mini-refactor - make options per wiki BAO std (ie. params holds
ids & ids is optional / on the way out
eileen [Fri, 2 Aug 2013 22:04:13 +0000 (10:04 +1200)]
CRM-13067 refactor recordMembershipContribution into MembershipPayment::create step one
CRM-13067 refactor recordMembershipContribution into MembershipPayment::create step one
CRM-13067 reinstate change to fn signature lost during gitting
eileen [Sun, 4 Aug 2013 03:42:30 +0000 (15:42 +1200)]
test fixup- changed fn signature doesn't expect 'NULL'
colemanw [Sun, 4 Aug 2013 02:29:56 +0000 (19:29 -0700)]
Merge pull request #1328 from eileenmcnaughton/master
Test improvements, minor fix on mailing API (Closes CRM-13512)
eileen [Sat, 3 Aug 2013 23:56:17 +0000 (11:56 +1200)]
add tests for exising behaviour on membership_type, membership_type_id fields (so redundant can be removed safely
eileen [Sat, 3 Aug 2013 23:23:39 +0000 (11:23 +1200)]
CRM-13152 - api mailing_event_subscribe.create returns array in wrong format
eileen [Sat, 3 Aug 2013 07:05:41 +0000 (19:05 +1200)]
test tweaks and updated examples
colemanw [Sat, 3 Aug 2013 21:43:38 +0000 (14:43 -0700)]
Merge pull request #1325 from davecivicrm/GeneratedFix
Rebuilt generated since last merge version was missing sample contacts.
Dave Greenberg [Sat, 3 Aug 2013 18:34:44 +0000 (11:34 -0700)]
CRM-1311 Improved inline help for Honoree section.
----------------------------------------
* CRM-1311:
http://issues.civicrm.org/jira/browse/CRM-1311
Dave Greenberg [Sat, 3 Aug 2013 18:28:01 +0000 (11:28 -0700)]
CRM-13148 Support use of cid=0 and cid=NNN for online contribution pages.
----------------------------------------
* CRM-13148:
http://issues.civicrm.org/jira/browse/CRM-13148
Dave Greenberg [Sat, 3 Aug 2013 18:26:24 +0000 (11:26 -0700)]
Rebuilt generated since last merge version was missing sample contacts.
Tim Otten [Fri, 2 Aug 2013 23:28:05 +0000 (16:28 -0700)]
Merge pull request #1324 from totten/master-duplicate
CRM-12911 - CRM.Backbone.sync - Add mechanism for API-assisted duplicati...
Tim Otten [Fri, 2 Aug 2013 22:41:33 +0000 (15:41 -0700)]
CRM-12911 - CRM.Backbone.sync - Add mechanism for API-assisted duplication of entities
----------------------------------------
* CRM-12911: Implement "Duplicate" feature for Jobs
http://issues.civicrm.org/jira/browse/CRM-12911
Tim Otten [Fri, 2 Aug 2013 23:23:31 +0000 (16:23 -0700)]
Merge pull request #1323 from totten/master-handleprimary
CRM_Core_BAO_Block - Fix API regressions
Tim Otten [Fri, 2 Aug 2013 23:20:54 +0000 (16:20 -0700)]
CRM_Core_BAO_Block - Fix API regressions
Dave Greenberg [Fri, 2 Aug 2013 22:01:50 +0000 (15:01 -0700)]
Merge pull request #1322 from kurund/accounting-batch-fixes
another fix
Dave Greenberg [Fri, 2 Aug 2013 22:01:15 +0000 (15:01 -0700)]
Merge pull request #1314 from pradpnayak/CRM-13004
-- fixed notice error for CRM-13004
kurund [Fri, 2 Aug 2013 21:55:21 +0000 (03:25 +0530)]
another fix
Dave Greenberg [Fri, 2 Aug 2013 21:45:26 +0000 (14:45 -0700)]
Merge pull request #1321 from kurund/accounting-batch-fixes
fixed wrong PseudoConstant call
kurund [Fri, 2 Aug 2013 21:42:13 +0000 (03:12 +0530)]
fixed wrong PseudoConstant call
kurund [Fri, 2 Aug 2013 21:30:22 +0000 (03:00 +0530)]
fixed wrong PseudoConstant call
Dave Greenberg [Fri, 2 Aug 2013 21:14:51 +0000 (14:14 -0700)]
Merge pull request #1315 from pradpnayak/CRM-12972
--fixed typo for CRM-12972
eileen [Tue, 16 Jul 2013 04:18:24 +0000 (16:18 +1200)]
CRM-13059 fix relationship killing query
Dave Greenberg [Fri, 2 Aug 2013 20:58:01 +0000 (13:58 -0700)]
Merge pull request #1313 from pradpnayak/CRM-12694
-- Fixed formatting and code fix for CRM-12694, removed mime_content_typ...
Dave Greenberg [Fri, 2 Aug 2013 20:57:02 +0000 (13:57 -0700)]
Merge pull request #1320 from kurund/accounting-batch-fixes
fixed wrong PseudoConstant call
This fixes a fatal error when trying to create a new Accounting Batch (Field 'status_id' doesn't have a default value).
Kurund Jalmi [Fri, 2 Aug 2013 20:46:16 +0000 (13:46 -0700)]
Merge pull request #1319 from eileenmcnaughton/master
CRM-12972 updated IPN test now fix has been merged in
Kurund Jalmi [Fri, 2 Aug 2013 20:44:25 +0000 (13:44 -0700)]
Merge pull request #1305 from davecivicrm/CRM-13090
CRM-13090 uniqueness on title + activity type + campaign (optional).
kurund [Fri, 2 Aug 2013 20:37:22 +0000 (02:07 +0530)]
fixed wrong PseudoConstant call
eileen [Fri, 2 Aug 2013 20:33:07 +0000 (08:33 +1200)]
CRM-12972 updated IPN test now fix has been merged in
Kurund Jalmi [Fri, 2 Aug 2013 20:04:05 +0000 (13:04 -0700)]
Merge pull request #1310 from eileenmcnaughton/CRM-13149
CRM-13149 add relationship type filter to relationship api (both paths)
Kurund Jalmi [Fri, 2 Aug 2013 20:01:57 +0000 (13:01 -0700)]
Merge pull request #1309 from yashodha/4.4
fix typos
Tim Otten [Fri, 2 Aug 2013 19:20:47 +0000 (12:20 -0700)]
Merge pull request #1318 from dlobo/CRM-12874
CRM-12874
Donald A. Lobo [Fri, 2 Aug 2013 19:10:51 +0000 (12:10 -0700)]
CRM-12874
----------------------------------------
* CRM-12874: Rename civicrm.settings.php.tpl so it uses a different suffix from Smarty templates
http://issues.civicrm.org/jira/browse/CRM-12874
Donald A. Lobo [Fri, 2 Aug 2013 19:08:27 +0000 (12:08 -0700)]
CRM-12874
----------------------------------------
* CRM-12874: Rename civicrm.settings.php.tpl so it uses a different suffix from Smarty templates
http://issues.civicrm.org/jira/browse/CRM-12874
Tim Otten [Fri, 2 Aug 2013 18:22:29 +0000 (11:22 -0700)]
Merge pull request #1316 from dlobo/CRM-13127
CRM-13127
Donald A. Lobo [Fri, 2 Aug 2013 17:02:50 +0000 (10:02 -0700)]
CRM-13127
----------------------------------------
* CRM-13127: test should include isset in API contact.php
http://issues.civicrm.org/jira/browse/CRM-13127
colemanw [Fri, 2 Aug 2013 16:43:07 +0000 (09:43 -0700)]
Merge pull request #1312 from pratik-joshi/CRM-12639-improvements
CRM-12639-improvements : code improvements which also fixes the failing tests https://test.civicrm.org/job/CiviCRM-master-git/LABEL=debian6,SUITE=api_v3_AllTests/397/
Pradeep Nayak [Fri, 2 Aug 2013 15:28:12 +0000 (20:58 +0530)]
--fixed typo for CRM-12972
----------------------------------------
* CRM-12972: No receipt sent for PayPal Pro Recurring Donations
http://issues.civicrm.org/jira/browse/CRM-12972
Pradeep Nayak [Fri, 2 Aug 2013 15:01:28 +0000 (20:31 +0530)]
-- fixed notice error for CRM-13004
----------------------------------------
* CRM-13004: Create discount transaction fails for event price sets that do not use radio buttons
http://issues.civicrm.org/jira/browse/CRM-13004
Pradeep Nayak [Fri, 2 Aug 2013 14:57:49 +0000 (20:27 +0530)]
-- Fixed formatting and code fix for CRM-12694, removed mime_content_type since we have only 2 export format CSV and IIF and both have text/plain mime_content_type
----------------------------------------
* CRM-12694: Eliminate/replace call to function mime_content_type()
http://issues.civicrm.org/jira/browse/CRM-12694
Pratik Joshi [Fri, 2 Aug 2013 14:23:02 +0000 (19:53 +0530)]
CRM-12639-improvements : code improvements which also fixes the failing tests https://test.civicrm.org/job/CiviCRM-master-git/LABEL=debian6,SUITE=api_v3_AllTests/397/
eileen [Fri, 2 Aug 2013 11:56:24 +0000 (23:56 +1200)]
partial tidy-up of test class (while waiting for tests to run :-)
eileen [Fri, 2 Aug 2013 11:47:10 +0000 (23:47 +1200)]
CRM-13149 additional test on api array as filter syntax
eileen [Fri, 2 Aug 2013 11:43:54 +0000 (23:43 +1200)]
CRM-13149 remove code comment
eileen [Fri, 2 Aug 2013 11:18:23 +0000 (23:18 +1200)]
remove unrelated debug code
eileen [Fri, 2 Aug 2013 11:17:53 +0000 (23:17 +1200)]
CRM-13149 fix BAO based reciprocal relationship get to accept type filter as an array per API, includes extracting function to be available from the BAO
eileen [Fri, 2 Aug 2013 10:53:11 +0000 (22:53 +1200)]
CRM-13149 array filter now working on relationship type
eileen [Fri, 2 Aug 2013 10:39:25 +0000 (22:39 +1200)]
CRM-13149 add relationship type id as a filter option for both 'paths', add tests & tidy up membership.create fn on test class in prep for adding it to tests
yashodha [Fri, 2 Aug 2013 08:47:50 +0000 (14:17 +0530)]
fix typos
yashodha [Fri, 2 Aug 2013 07:26:31 +0000 (12:56 +0530)]
fix typos
Tim Otten [Fri, 2 Aug 2013 00:14:58 +0000 (17:14 -0700)]
Merge pull request #1308 from totten/master-apicreate-nulls
CRM-13120 - APIv3 - Don't return "null" from "create" action
Tim Otten [Thu, 1 Aug 2013 23:49:05 +0000 (16:49 -0700)]
Merge pull request #1307 from eileenmcnaughton/CRM-12108
CRM-12108 fix bug introduced when rebasing PR
eileen [Thu, 1 Aug 2013 23:35:00 +0000 (11:35 +1200)]
CRM-12108 fix bug introduced when rebasing PR
Tim Otten [Thu, 1 Aug 2013 22:59:12 +0000 (15:59 -0700)]
Merge pull request #1275 from eileenmcnaughton/CRM-12108
CRM-12108 minor improvement - simplify ipn.php by putting logic in the
Tim Otten [Thu, 1 Aug 2013 21:19:00 +0000 (14:19 -0700)]
CRM-13120 - APIv3 - Don't return "null" from "create" action
* Split CRM_Core_HTMLInputCoder in three:
* CRM_Utils_API_AbstractFieldCoder
* CRM_Utils_API_HTMLInputCoder
* CRM_Core_HTMLInputCoder (for backward compatibility)
* Add CRM_Utils_API_NullOutputCoder (based on AbstractFieldCoder)
----------------------------------------
* CRM-13120:
http://issues.civicrm.org/jira/browse/CRM-13120
Tim Otten [Thu, 1 Aug 2013 22:41:01 +0000 (15:41 -0700)]
CRM-13120 - Reproduce 'null' problem with a core API
----------------------------------------
* CRM-13120:
http://issues.civicrm.org/jira/browse/CRM-13120
Dave Greenberg [Thu, 1 Aug 2013 21:16:01 +0000 (14:16 -0700)]
CRM-13090 add comment on public var.
----------------------------------------
* CRM-13090: New Petition/Survey form validation - enforce unique constraint on ActivityType-Campaign-Title
http://issues.civicrm.org/jira/browse/CRM-13090
Dave Greenberg [Thu, 1 Aug 2013 21:07:32 +0000 (14:07 -0700)]
CRM-13090 uniqueness on title + activity type + campaign (optional). Moved the petition form rule to Petition form class where it belongs (was put in Survey/Results for some reason ??).
----------------------------------------
* CRM-13090: New Petition/Survey form validation - enforce unique constraint on ActivityType-Campaign-Title
http://issues.civicrm.org/jira/browse/CRM-13090
eileen [Thu, 1 Aug 2013 20:09:22 +0000 (08:09 +1200)]
CRM-12108 fix merge of intermediary commit
eileen [Tue, 30 Jul 2013 09:29:35 +0000 (21:29 +1200)]
CRM-12108 add code comments which explain why I couldn't make the test succeed without the try catch block - see CRM-12972 for user reports
eileen [Tue, 30 Jul 2013 09:28:16 +0000 (21:28 +1200)]
CRM-12108 refactore PayPalProIPN.php so that it can be called outside of a webtest & can be tested
eileen [Tue, 30 Jul 2013 09:21:58 +0000 (21:21 +1200)]
CRM-12108 tests on refactored PayPalProIPN, if CRM-12972 is fixed try catch can be removed & can update to check mail is sent
eileen [Tue, 30 Jul 2013 01:22:25 +0000 (13:22 +1200)]
CRM-12108 noticed api.contribution_recur.start_date needs to be set or have a default - am defaulting to now
eileen [Tue, 30 Jul 2013 01:18:12 +0000 (13:18 +1200)]
CRM-12108 noticed api.contribution_recur.frequency_interval needs to be mandatory
eileen [Tue, 30 Jul 2013 00:42:54 +0000 (12:42 +1200)]
CRM-12108 noticed type on 'skipDefault' was wrong
Eileen [Mon, 29 Jul 2013 02:17:45 +0000 (22:17 -0400)]
CRM-12108 minor improvement - simplify ipn.php by putting logic in the
relevant classes (no logic behind the split)
colemanw [Thu, 1 Aug 2013 17:34:54 +0000 (10:34 -0700)]
Merge pull request #1300 from eileenmcnaughton/CRM-13142
CRM-13142 limited tidy up to extract js from tpl using new standards
Kurund Jalmi [Thu, 1 Aug 2013 15:47:52 +0000 (08:47 -0700)]
Merge pull request #1290 from pratik-joshi/CRM_12639-fix
Crm 12639 fix
Kurund Jalmi [Thu, 1 Aug 2013 15:44:18 +0000 (08:44 -0700)]
Merge pull request #1284 from yashodha/4.4.CRM-13092
CRM-13092
Kurund Jalmi [Thu, 1 Aug 2013 15:44:05 +0000 (08:44 -0700)]
Merge pull request #1303 from yashodha/CRM-13147
fixed query for CRM-13147
pratik-joshi [Thu, 1 Aug 2013 15:14:44 +0000 (08:14 -0700)]
Merge pull request #1304 from aadityawalawalkar/CRM-12439
Crm 12439