Eileen McNaughton [Thu, 21 Jan 2016 04:56:46 +0000 (17:56 +1300)]
Merge pull request #7583 from JMAConsulting/CRM-16259-6
CRM-16259, added payment api
Eileen McNaughton [Thu, 21 Jan 2016 03:23:22 +0000 (16:23 +1300)]
Merge pull request #7623 from eileenmcnaughton/CRM-17850
CRM-17850 allow payment processors to control which recurring fields can be edited
Coleman Watts [Thu, 21 Jan 2016 02:50:34 +0000 (21:50 -0500)]
CRM-17645 - Prevent adding case acl clause inappropriately
Tim Otten [Thu, 21 Jan 2016 02:08:58 +0000 (18:08 -0800)]
Merge pull request #7624 from totten/master-phpunit
tools/scripts/phpunit - Delegate to `phpunit` from `PATH`
Coleman Watts [Thu, 21 Jan 2016 02:08:30 +0000 (21:08 -0500)]
CRM-17645 - Ensure utils file is included
eileenmcnaughton [Thu, 21 Jan 2016 02:04:37 +0000 (02:04 +0000)]
CRM-17850 cleanup based on feedback
eileenmcnaughton [Thu, 21 Jan 2016 02:00:13 +0000 (02:00 +0000)]
CRM-17850 implement getEditableRecurringScheduleFields for Dummy processor
This is purely to give visibility of the option to enable appropriate fields for editing
eileenmcnaughton [Thu, 21 Jan 2016 01:02:18 +0000 (01:02 +0000)]
CRM-17850 Allow payment processors to determine which edit fields are exposed
Tim Otten [Thu, 21 Jan 2016 01:29:15 +0000 (17:29 -0800)]
phpunit.xml.dist - Update test suites
Not sure how this is different, but it seems more accurate.
Tim Otten [Thu, 21 Jan 2016 01:27:40 +0000 (17:27 -0800)]
tools/scripts/phpunit - Delegate to `phpunit` from `PATH`
Embedding a copy of PHPUnit within CiviCRM makes it really confusing when testing
extensions. For example, if an extension author tries to use `phpunit` directly, he'll
conflicts between his copy and the embedded copy.
The work-around has been to *always* use the embedded copy, but this is still confusing
because bootstrapping becomes complicated.
The goal here is to remove Civi's embedded copy of PHPUnit to avoid conflicts.
To preserve compatibility with existing test-documentation and test-scripts
(Jenkins), we leave behind a stub script in `tools/scripts/phpunit`.
Tim Otten [Wed, 20 Jan 2016 23:06:54 +0000 (15:06 -0800)]
Merge pull request #7474 from JMAConsulting/CRM-16259-3
--CRM-16259, added function to allocate line item proportinally
eileenmcnaughton [Wed, 20 Jan 2016 22:21:33 +0000 (22:21 +0000)]
Use better function for retrieving payment processor for recurring
Pradeep Nayak [Wed, 20 Jan 2016 21:34:09 +0000 (03:04 +0530)]
CRM-16259, round off of amount
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Thu, 14 Jan 2016 09:44:55 +0000 (15:14 +0530)]
CRM-16259, fixed jenkins Checkstyle Warnings
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Thu, 14 Jan 2016 09:37:03 +0000 (15:07 +0530)]
CRM-16259, fixed unit test
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Tue, 12 Jan 2016 12:10:07 +0000 (17:40 +0530)]
-- CRM-16259, added unit test for assignProportionalLineItems()
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Tue, 12 Jan 2016 11:03:45 +0000 (16:33 +0530)]
CRM-16259, used api calling instead save()
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Fri, 18 Dec 2015 14:10:09 +0000 (19:40 +0530)]
--CRM-16259, removed white space
Pradeep Nayak [Wed, 16 Dec 2015 13:49:52 +0000 (19:19 +0530)]
--CRM-16259, added function to allocate line item proportinally
Pradeep Nayak [Wed, 20 Jan 2016 21:03:37 +0000 (02:33 +0530)]
CRM-16259, removed cruft code
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Wed, 20 Jan 2016 20:50:21 +0000 (02:20 +0530)]
CRM-16259, added api test for update action
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Wed, 20 Jan 2016 20:04:08 +0000 (01:34 +0530)]
CRM-16259, removed cruft code
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Wed, 20 Jan 2016 14:23:45 +0000 (19:53 +0530)]
CRM-16259, removed extra space
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Wed, 20 Jan 2016 14:10:46 +0000 (19:40 +0530)]
--CRM-16259, updated test for testCreatePaymentLineItems
Pradeep Nayak [Wed, 20 Jan 2016 12:53:59 +0000 (18:23 +0530)]
--CRM-16259, added more assert rules
Pradeep Nayak [Wed, 20 Jan 2016 12:28:50 +0000 (17:58 +0530)]
--CRM-16259, updated api test for get action
Pradeep Nayak [Wed, 20 Jan 2016 12:23:32 +0000 (17:53 +0530)]
CRM-16259, update api test for create action
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Wed, 20 Jan 2016 11:13:29 +0000 (16:43 +0530)]
CRM-16259, added api test for delete action
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
CiviCRM [Wed, 20 Jan 2016 11:12:46 +0000 (03:12 -0800)]
Update version to 4.7.0
Pradeep Nayak [Wed, 20 Jan 2016 11:12:37 +0000 (16:42 +0530)]
CRM-16259, ignore foreach iteration when financial trxn id is null in api result
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Wed, 20 Jan 2016 11:08:25 +0000 (16:38 +0530)]
CRM-16259, fixed Jenkins style check error
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Wed, 20 Jan 2016 10:41:03 +0000 (16:11 +0530)]
CRM-16259, get particiant id if contribution is related to event
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Wed, 20 Jan 2016 10:37:08 +0000 (16:07 +0530)]
CRM-16259, added api test for cancel action
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Wed, 20 Jan 2016 10:22:58 +0000 (15:52 +0530)]
--CRM-16259, added comment block
Pradeep Nayak [Wed, 20 Jan 2016 09:10:16 +0000 (14:40 +0530)]
CRM-16259, fixed notice error
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Monish Deb [Wed, 20 Jan 2016 06:14:09 +0000 (11:44 +0530)]
Merge pull request #7604 from rohankatkar/17815
CRM-17815 fix
Web Access [Wed, 20 Jan 2016 05:47:23 +0000 (11:17 +0530)]
Minor changes
Web Access [Tue, 19 Jan 2016 12:58:57 +0000 (18:28 +0530)]
Additional fix for CRM-17815 and alignment fixes
Web Access [Fri, 15 Jan 2016 09:40:53 +0000 (15:10 +0530)]
CRM-17815 fix
Eileen McNaughton [Wed, 20 Jan 2016 02:50:02 +0000 (15:50 +1300)]
Merge pull request #7618 from eileenmcnaughton/CRM-17837
CRM-17837 Report class, various minor tweaks to support increasing te…
eileen [Tue, 19 Jan 2016 21:33:18 +0000 (10:33 +1300)]
CRM-17837 Report class, various minor tweaks to support increasing test coverage
Eileen McNaughton [Tue, 19 Jan 2016 23:20:01 +0000 (12:20 +1300)]
Merge pull request #7617 from eileenmcnaughton/CRM-17837
CRM-17837 Report class pager function, test/ api access fix
colemanw [Tue, 19 Jan 2016 21:48:15 +0000 (16:48 -0500)]
Merge pull request #7615 from colemanw/CRM-17429
CRM-17429 - Disable google checkout payment processors
eileen [Tue, 19 Jan 2016 21:33:18 +0000 (10:33 +1300)]
Report class, add ts to untranslated string
Change-Id: I4c63afabd9d3d0f7c31a07dae4b91f660b8b7466
eileen [Tue, 19 Jan 2016 21:32:15 +0000 (10:32 +1300)]
CRM-17837 Report class pager function, test/ api access fix.
This minor patch just checks if the get function is callable before calling it. It allows the api calls to not fatal.
The api calls are primarily used in the unit tests at this stage although the original intent was about more flexible charting by retrieving
the data from an api & passing it to 'any' charting library
Change-Id: I8b3e4e9ade3f75ce8bc6e608cb3c7c6e60d127b9
Eileen McNaughton [Tue, 19 Jan 2016 21:06:05 +0000 (10:06 +1300)]
Merge pull request #7616 from eileenmcnaughton/CRM-17837
CRM-17837 store rollup result grand total on the class rather than di…
eileen [Tue, 19 Jan 2016 19:47:59 +0000 (08:47 +1300)]
CRM-17837 store rollup result grand total on the class rather than discarding it
This makes it available for re-use in the statistics
Coleman Watts [Tue, 19 Jan 2016 19:34:10 +0000 (14:34 -0500)]
CRM-17429 - Disable google checkout payment processors
colemanw [Tue, 19 Jan 2016 16:29:34 +0000 (11:29 -0500)]
Merge pull request #7612 from colemanw/CRM-17429
CRM-17429 - Remove Google Checkout payment processor
Coleman Watts [Tue, 19 Jan 2016 03:17:04 +0000 (22:17 -0500)]
CRM-17429 - Test fixes
Coleman Watts [Tue, 19 Jan 2016 01:39:43 +0000 (20:39 -0500)]
CRM-17429 - Remove Google Checkout payment processor
colemanw [Mon, 18 Jan 2016 23:28:27 +0000 (18:28 -0500)]
Merge pull request #7609 from colemanw/editPerm
CRM-17795 - Api.create/delete - support acls for contact related entities
Eileen McNaughton [Mon, 18 Jan 2016 22:46:58 +0000 (11:46 +1300)]
Merge pull request #7611 from eileenmcnaughton/CRM-16278
CRM-16278 add financial type field to pledge reports
eileen [Mon, 18 Jan 2016 22:05:47 +0000 (11:05 +1300)]
CRM-16278 add financial type field to pledge reports
Coleman Watts [Mon, 18 Jan 2016 20:52:36 +0000 (15:52 -0500)]
CRM-17795 - Test fix
Eileen McNaughton [Mon, 18 Jan 2016 20:50:44 +0000 (09:50 +1300)]
Merge pull request #7610 from rohankatkar/CRM-17273-webtest
Webtest - CRM-17273
Coleman Watts [Mon, 18 Jan 2016 19:37:40 +0000 (14:37 -0500)]
Merge branch 'PalanteJon-CRM-17552-v2'
Conflicts:
CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl
Coleman Watts [Mon, 18 Jan 2016 18:06:26 +0000 (13:06 -0500)]
CRM-17795 - Api.contact.create/delete - support acls for contacts
Coleman Watts [Sun, 17 Jan 2016 21:12:39 +0000 (16:12 -0500)]
CRM-17795 - Api.create/delete - support acls for contact related entities
Web Access [Mon, 18 Jan 2016 13:31:11 +0000 (19:01 +0530)]
Warning fix
Pradeep Nayak [Mon, 18 Jan 2016 13:21:24 +0000 (18:51 +0530)]
CRM-16259, fixed jenkins checkstyle error
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Web Access [Mon, 18 Jan 2016 13:21:14 +0000 (18:51 +0530)]
Webtest - CRM-17273
Edsel [Mon, 18 Jan 2016 13:12:17 +0000 (18:42 +0530)]
CRM-16259 CIVI-3 Fixed 0 rows fetched by payment API
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Monish Deb [Mon, 18 Jan 2016 06:30:34 +0000 (12:00 +0530)]
Merge pull request #7605 from monishdeb/CRM-17685
CRM-17685 fix - CiviCRM DB Syntax Error when enabling logging
colemanw [Sun, 17 Jan 2016 21:00:18 +0000 (16:00 -0500)]
Merge pull request #7592 from colemanw/CRM-17645
CRM-17645 - Case acl improvements
Coleman Watts [Sat, 16 Jan 2016 01:06:44 +0000 (20:06 -0500)]
CRM-17645 - Move util function
colemanw [Fri, 15 Jan 2016 21:14:37 +0000 (16:14 -0500)]
Merge pull request #7608 from colemanw/CRM-16353
CRM-16353 - Warn not to use deprecated function
Coleman Watts [Fri, 15 Jan 2016 18:38:06 +0000 (13:38 -0500)]
CRM-16353 - Warn not to copy-paste legacy code
Coleman Watts [Fri, 15 Jan 2016 18:28:54 +0000 (13:28 -0500)]
CRM-16353 - Warn not to use deprecated function
colemanw [Fri, 15 Jan 2016 17:56:45 +0000 (12:56 -0500)]
Merge pull request #7607 from JKingsnorth/unused-icons
Remove unused icons
JKingsnorth [Fri, 15 Jan 2016 15:57:48 +0000 (15:57 +0000)]
Remove unused icons
colemanw [Fri, 15 Jan 2016 14:46:43 +0000 (09:46 -0500)]
Merge pull request #7606 from JKingsnorth/patch-5
Delete EnvelopeIn.gif
John Kingsnorth [Fri, 15 Jan 2016 14:42:58 +0000 (14:42 +0000)]
Delete EnvelopeIn.gif
Couldn't find anything that references this icon
monishdeb [Fri, 15 Jan 2016 14:12:01 +0000 (19:42 +0530)]
CRM-17685 fix - CiviCRM DB Syntax Error when enabling logging
https://issues.civicrm.org/jira/browse/CRM-17685
colemanw [Fri, 15 Jan 2016 14:02:13 +0000 (09:02 -0500)]
Merge pull request #7602 from JKingsnorth/CRM-17826
CRM-17826: Font awesome icons
JKingsnorth [Fri, 15 Jan 2016 12:14:04 +0000 (12:14 +0000)]
Update icons in CiviCampaign
JKingsnorth [Fri, 15 Jan 2016 11:40:04 +0000 (11:40 +0000)]
Update tree icons to font awesome
Edsel [Fri, 15 Jan 2016 07:21:24 +0000 (12:51 +0530)]
CRM-16259 CIVI-3 Added payment API test
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Monish Deb [Fri, 15 Jan 2016 06:25:33 +0000 (11:55 +0530)]
Merge pull request #7600 from yashodha/fix-version
Update version to 4.7.beta8
yashodha [Fri, 15 Jan 2016 06:20:58 +0000 (11:50 +0530)]
Update version to 4.7.beta8
Coleman Watts [Fri, 15 Jan 2016 04:53:55 +0000 (23:53 -0500)]
CRM-17645 - Better integration of hook_civicrm_selectWhereClause
Coleman Watts [Fri, 15 Jan 2016 01:33:52 +0000 (20:33 -0500)]
CRM-17645 - More consistent function naming
Coleman Watts [Fri, 15 Jan 2016 01:30:44 +0000 (20:30 -0500)]
CRM-17645 - add hook_civicrm_selectWhereClause
Coleman Watts [Fri, 15 Jan 2016 01:16:41 +0000 (20:16 -0500)]
CRM-17645 - Introduce aclWhere clause into case search
Coleman Watts [Thu, 14 Jan 2016 21:04:39 +0000 (16:04 -0500)]
Case api test fixes/skips
Coleman Watts [Thu, 14 Jan 2016 20:26:16 +0000 (15:26 -0500)]
CRM-17645 - Migrate more case lookups to go through api
Coleman Watts [Thu, 14 Jan 2016 17:44:08 +0000 (12:44 -0500)]
Remove unused case functions
Coleman Watts [Thu, 14 Jan 2016 17:17:27 +0000 (12:17 -0500)]
CRM-17645 - Add filters for Case entityRef
Coleman Watts [Thu, 14 Jan 2016 02:22:23 +0000 (21:22 -0500)]
CRM-17645 - Convert case autocompletes to use EntityRef
Coleman Watts [Wed, 13 Jan 2016 21:14:30 +0000 (16:14 -0500)]
CRM-17795 - Prevent (most) redundant acl sub clauses
Coleman Watts [Wed, 13 Jan 2016 04:04:32 +0000 (23:04 -0500)]
CRM-17645 - Add entityRef support for autocompleting Cases
Coleman Watts [Wed, 13 Jan 2016 04:03:44 +0000 (23:03 -0500)]
CRM-17795 - Fix order by to work across joins
Coleman Watts [Tue, 5 Jan 2016 21:28:30 +0000 (16:28 -0500)]
CRM-17645 - Refactor case permissions to go through the api
Coleman Watts [Mon, 4 Jan 2016 22:56:28 +0000 (17:56 -0500)]
Cleanup - rm unused vars
colemanw [Thu, 14 Jan 2016 17:47:22 +0000 (12:47 -0500)]
Merge pull request #7597 from colemanw/CRM-17819
CRM-17819 - Api explorer - fix field name parsing
Coleman Watts [Thu, 14 Jan 2016 17:47:07 +0000 (12:47 -0500)]
CRM-17819 - Api explorer - fix field name parsing
colemanw [Thu, 14 Jan 2016 17:23:07 +0000 (12:23 -0500)]
Merge pull request #7596 from agh1/dedupe-modified-date
CRM-17818 Dedupe merge: use crmDate instead of hardcoded format
Andrew Hunt [Thu, 14 Jan 2016 16:36:05 +0000 (11:36 -0500)]
CRM-17818 Dedupe merge: use crmDate instead of hardcoded format
----------------------------------------
* CRM-17818: Merge screen modified date hardcoded format
https://issues.civicrm.org/jira/browse/CRM-17818
Monish Deb [Thu, 14 Jan 2016 10:37:04 +0000 (16:07 +0530)]
Merge pull request #7590 from rohankatkar/CRM-17787
CRM-17787
Monish Deb [Thu, 14 Jan 2016 07:54:40 +0000 (13:24 +0530)]
Merge pull request #7584 from jitendrapurohit/CRM-17809
CRM-17809 -- Fatal Error on Date Format Page
projects / civicrm-core.git / log