Monish Deb [Mon, 7 Aug 2017 12:03:48 +0000 (17:33 +0530)]
Merge pull request #10818 from eileenmcnaughton/recur_date
CRM-21027 Fix next recurring payment not accurately calculated
colemanw [Fri, 4 Aug 2017 22:00:39 +0000 (18:00 -0400)]
Merge pull request #10820 from JMAConsulting/CRM-21029
CRM-21029 - Report - Fix Activity Report SQL Syntax Error
Thomas Schüttler [Fri, 4 Aug 2017 10:40:40 +0000 (12:40 +0200)]
CRM-21029 - Report - Fix Activity Report SQL Syntax Error
eileen [Fri, 4 Aug 2017 08:49:32 +0000 (20:49 +1200)]
CRM-21027 Fix next recurring payment not accurately calculated when effective date passed in
Eileen McNaughton [Thu, 3 Aug 2017 04:14:15 +0000 (16:14 +1200)]
Merge pull request #10811 from jitendrapurohit/CRM-20913-sync-inprogress
CRM-20913: Fix inprogress value to match with contribution status
Jitendra Purohit [Thu, 3 Aug 2017 04:01:07 +0000 (09:31 +0530)]
CRM-20913: Fix inprogress value to match with contribution status
Eileen McNaughton [Wed, 2 Aug 2017 20:19:27 +0000 (08:19 +1200)]
Merge pull request #10807 from mattwire/link_to_release_notes
CRM-21012 Add link to release notes
Eileen McNaughton [Wed, 2 Aug 2017 19:45:54 +0000 (07:45 +1200)]
Merge pull request #10803 from jitendrapurohit/CRM-20913-sync-ov
CRM-20913 use pledge option group for pledge payments
colemanw [Wed, 2 Aug 2017 18:58:04 +0000 (14:58 -0400)]
Merge pull request #10806 from JMAConsulting/CRM-20610-2
CRM-20610: 'Payment Edit' form improvements
Matthew Wire [Wed, 2 Aug 2017 15:51:13 +0000 (16:51 +0100)]
Add link to release notes
deb.monish [Wed, 2 Aug 2017 14:11:03 +0000 (19:41 +0530)]
add metadata to trxn_id
deb.monish [Tue, 1 Aug 2017 10:45:40 +0000 (16:15 +0530)]
CRM-20610: 'Payment Edit' form improvements
Monish Deb [Wed, 2 Aug 2017 09:33:59 +0000 (15:03 +0530)]
Merge pull request #10677 from fuzionnz/CRM-20885-suppress_fakefile_error
Suppress error if fakeFile cannot be created.
Jitendra Purohit [Wed, 2 Aug 2017 08:56:16 +0000 (14:26 +0530)]
sync value for overdue with contribution status for safety
eileen [Mon, 31 Jul 2017 04:57:44 +0000 (16:57 +1200)]
CRM-20913 use pledge option group for pledge payments
Monish Deb [Wed, 2 Aug 2017 06:53:20 +0000 (12:23 +0530)]
Merge pull request #10303 from seamuslee001/CRM-20521
CRM-20521 Convert returning groups and mailings for CiviMail new mail…
Eileen McNaughton [Tue, 1 Aug 2017 22:45:34 +0000 (10:45 +1200)]
Merge pull request #10799 from JMAConsulting/CRM-21002
CRM-21002: Credit card type icons are incorrectly populated on backoffice live mode
Seamus Lee [Mon, 31 Jul 2017 21:51:02 +0000 (21:51 +0000)]
CRM-20521 Ensure that only Mailing List groups appear in the receipients box
Seamus Lee [Thu, 1 Jun 2017 22:21:47 +0000 (08:21 +1000)]
CRM-20521 Ensure that Disabled groups are also excluded
Seamus Lee [Thu, 4 May 2017 11:23:31 +0000 (21:23 +1000)]
CRM-20521 Convert returning groups and mailings for CiviMail new mailing screen into an API request rather than loading in the DOM
deb.monish [Tue, 1 Aug 2017 18:45:30 +0000 (00:15 +0530)]
CRM-21002: Credit card type icons are incorrectly populated on backoffice live mode
colemanw [Tue, 1 Aug 2017 16:06:08 +0000 (12:06 -0400)]
Merge pull request #10796 from tschuettler/CRM-20995
CRM-20995 - API - Extension get - Filter by full_name
Thomas Schüttler [Tue, 1 Aug 2017 10:55:06 +0000 (12:55 +0200)]
Change new parameter to default to 'keys'
Eileen McNaughton [Mon, 31 Jul 2017 23:37:40 +0000 (11:37 +1200)]
Merge pull request #10340 from Stoob/master
CRM-20563 change fatal error message
colemanw [Mon, 31 Jul 2017 19:38:08 +0000 (15:38 -0400)]
Merge pull request #10795 from jitendrapurohit/CRM-20994
CRM-20994 : Fix hardcoded relationship type value
Monish Deb [Mon, 31 Jul 2017 17:38:03 +0000 (23:08 +0530)]
Merge pull request #10792 from seamuslee001/CRM-20989
CRM-20989 Fix Active provider count to know about multisite
Monish Deb [Mon, 31 Jul 2017 17:37:14 +0000 (23:07 +0530)]
Merge pull request #10789 from JMAConsulting/CRM-20987
CRM-20987, added batch transaction column
Thomas Schüttler [Mon, 31 Jul 2017 15:41:44 +0000 (17:41 +0200)]
Fix coding standard
Thomas Schüttler [Mon, 31 Jul 2017 15:39:32 +0000 (17:39 +0200)]
Fix undefined index in UnitTests
Thomas Schüttler [Mon, 31 Jul 2017 10:55:38 +0000 (12:55 +0200)]
CRM-20995 - API - Extension get - Filter by full_name
----------------------------------------
* CRM-20995: API - Extension get - Ignores parameter full_name as created by API explorer
https://issues.civicrm.org/jira/browse/CRM-20995
Jitendra Purohit [Mon, 31 Jul 2017 10:50:09 +0000 (16:20 +0530)]
CRM-20994 : Fix hardcoded relationship type value
Eileen McNaughton [Mon, 31 Jul 2017 07:08:09 +0000 (19:08 +1200)]
Merge pull request #10788 from JMAConsulting/CRM-20947
CRM-20947, fixed notice error on Activity tab
Pradeep Nayak [Mon, 31 Jul 2017 06:03:48 +0000 (11:33 +0530)]
CRM-20987, fixed unit test
----------------------------------------
* CRM-20987: Add transaction date field to listings of transactions
https://issues.civicrm.org/jira/browse/CRM-20987
fixed indexes
Seamus Lee [Mon, 31 Jul 2017 06:36:48 +0000 (16:36 +1000)]
Add Unit test to provde domain filtering is working with activeProviderCount
Seamus Lee [Mon, 31 Jul 2017 06:11:57 +0000 (16:11 +1000)]
CRM-20989 Fix Active provider count to know about multistie and return a proper count
Pradeep Nayak [Mon, 31 Jul 2017 02:03:01 +0000 (07:33 +0530)]
CRM-20947, fixed notice error
----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
https://issues.civicrm.org/jira/browse/CRM-20947
fixed fieldname
Eileen McNaughton [Mon, 31 Jul 2017 05:10:54 +0000 (17:10 +1200)]
Merge pull request #10763 from JMAConsulting/CRM-20967
CRM-20967, use is_payment = TRUE to retrieve payments
Eileen McNaughton [Mon, 31 Jul 2017 03:39:16 +0000 (15:39 +1200)]
Merge pull request #10787 from JMAConsulting/CRM-20984
CRM-20984: Move placement of payment processor field
Pradeep Nayak [Mon, 31 Jul 2017 02:59:34 +0000 (08:29 +0530)]
CRM-20987, added batch transaction column
----------------------------------------
* CRM-20987: Add transaction date field to listings of transactions
https://issues.civicrm.org/jira/browse/CRM-20987
Pradeep Nayak [Mon, 31 Jul 2017 01:57:54 +0000 (07:27 +0530)]
CRM-20947, fixed notice error on Activity tab
----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
https://issues.civicrm.org/jira/browse/CRM-20947
Eileen McNaughton [Sun, 30 Jul 2017 21:52:59 +0000 (09:52 +1200)]
Merge pull request #10726 from JMAConsulting/CRM-20946
CRM-20946, use line total of line item to store in financial item table
deb.monish [Sun, 30 Jul 2017 20:43:26 +0000 (02:13 +0530)]
CRM-20984: Move placement of payment processor field
Monish Deb [Sun, 30 Jul 2017 19:07:41 +0000 (00:37 +0530)]
Merge pull request #10765 from seamuslee001/report_fixes
CRM-20969 Fix issues in order by clauses of reports showing errors in 7.1
deb.monish [Sat, 29 Jul 2017 18:42:10 +0000 (00:12 +0530)]
added unit test
Pradeep Nayak [Sun, 23 Jul 2017 10:05:01 +0000 (15:35 +0530)]
CRM-20946, use line total of line itme to store in financial item table
----------------------------------------
* CRM-20946: Wrong entries in financial table when contribution is cancelled
https://issues.civicrm.org/jira/browse/CRM-20946
Seamus Lee [Sun, 30 Jul 2017 06:39:24 +0000 (16:39 +1000)]
Remove orderBy function following Eileen's testing
Seamus Lee [Sat, 29 Jul 2017 05:26:42 +0000 (15:26 +1000)]
Use the orderByArray and groupByArray variables
eileen [Fri, 28 Jul 2017 02:23:03 +0000 (14:23 +1200)]
CRM-20969 alternate approach to resolving php 7.1 errors
I am proposing this as an alternate approach for fixing the 7.1 errors.
Note this only covers one report - I think we should move that function which is actually
generic to the parent class, however I think the one in contribute.summary is
a bit more nuanced.
Note this is also the approach taken by the extendedreport
extension (which takes it a little further). I will remove the declaration of
groupByArray from that extension if we add it here
I do have a medium term plan to move a lot of the helpers from extended report back into core.
Change-Id: I377d33a7417ff93169f12ccbda77f3662da5bac1
Seamus Lee [Tue, 25 Jul 2017 07:54:12 +0000 (17:54 +1000)]
Fix issues in order by clauses of reports showing errors in 7.1
Monish Deb [Sat, 29 Jul 2017 19:49:31 +0000 (01:19 +0530)]
Merge pull request #10737 from jitendrapurohit/CRM-20913
CRM-20913 - Add separate option group for pledge status
colemanw [Sat, 29 Jul 2017 17:59:31 +0000 (13:59 -0400)]
Merge pull request #10699 from JMAConsulting/CRM-20321-1
[re-submitted and unchanged] CRM-20321, CRM-20652 : Changing membership type should change related contribution and generalise changeFeeSelection function to be used for any entity
colemanw [Sat, 29 Jul 2017 14:15:59 +0000 (10:15 -0400)]
Merge pull request #10383 from MegaphoneJon/unsupervised-reserved-threshold
CRM-20607 - Dedupe - Allow saving reserved groups
Jitendra Purohit [Sat, 29 Jul 2017 05:12:09 +0000 (10:42 +0530)]
generated data
Eileen McNaughton [Sat, 29 Jul 2017 02:58:44 +0000 (14:58 +1200)]
Merge pull request #10782 from JMAConsulting/CRM-20947
CRM-20947, fixed notice error for deprecated function on batch form
Eileen McNaughton [Sat, 29 Jul 2017 02:55:42 +0000 (14:55 +1200)]
Merge pull request #10784 from totten/master-prtpl
CRM-20965 - PULL_REQUEST_TEMPLATE - Change header notation
Tim Otten [Sat, 29 Jul 2017 00:24:00 +0000 (17:24 -0700)]
CRM-20965 - PULL_REQUEST_TEMPLATE - Change header notation
If you use the `#` notation for headers, the Github CLI (`hub pull-request`)
would filter out those lines as comments.
Using the `---` notation should provide that.
colemanw [Fri, 28 Jul 2017 20:01:06 +0000 (16:01 -0400)]
Merge pull request #10741 from JMAConsulting/CRM-20952
[ready for review] CRM-20952 Refresh membership tab if contribution is membership payment
colemanw [Fri, 28 Jul 2017 19:25:23 +0000 (15:25 -0400)]
Merge pull request #10698 from jitendrapurohit/CRM-20910
CRM-20910: Check permission param while retrieving participants from api
Monish Deb [Fri, 28 Jul 2017 17:57:54 +0000 (23:27 +0530)]
Merge pull request #10348 from eileenmcnaughton/token
CRM-20577 - When creating an activity per-contact when sending letters, store the version with rendered tokens
Pradeep Nayak [Fri, 28 Jul 2017 16:44:49 +0000 (22:14 +0530)]
CRM-20947, fixed notice error for deprecated function on batch form
----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
https://issues.civicrm.org/jira/browse/CRM-20947
eileen [Mon, 15 May 2017 06:47:59 +0000 (18:47 +1200)]
CRM-20577 Fix activities to record actual html if activity per contact
(At least, this covers contributions at this stage).
I have also tried to move towards clearer inputs & outpus on createActivities, with the
weirdness around contactIds being moved up to the forms themselves and
not being passed in. Would prefer not to see form passed in either but, next time.
Unit tests cover emails & activity create (for the first time)
eileen [Mon, 15 May 2017 03:17:34 +0000 (15:17 +1200)]
Towards CRM-20577 preliminary form tidy up
eileen [Sat, 13 May 2017 08:49:56 +0000 (20:49 +1200)]
[nfc] Add Unit test for group by in pdf letters.
In addition to the unit test there is a minor change to not do the early return before assigning variables
if smarty is not set. This doesn't really have any performance advantage, as they are already calculated,
blocks the unit test and also blocks using these variables from outside extensions
Eileen McNaughton [Fri, 28 Jul 2017 11:03:39 +0000 (23:03 +1200)]
Merge pull request #10758 from mickadoo/CRM-20965_add-pull-request-template
CRM-20965: Add PR template
Eileen McNaughton [Fri, 28 Jul 2017 06:42:45 +0000 (18:42 +1200)]
Merge pull request #10753 from seamuslee001/CRM-20962
CRM-20962 Fix issue where we were passing through a string when it sh…
Eileen McNaughton [Fri, 28 Jul 2017 05:50:56 +0000 (17:50 +1200)]
Merge pull request #10701 from JMAConsulting/CRM-20915
CRM-20915: Creating credit card registration for event stores payment method as check
Seamus Lee [Fri, 28 Jul 2017 05:28:40 +0000 (15:28 +1000)]
CRM-20962 Add deprication notice in regards to settings with no metadata
Eileen McNaughton [Fri, 28 Jul 2017 05:25:30 +0000 (17:25 +1200)]
Merge pull request #10769 from mfb/CRM-20970
CRM-20970 - avoid MySQL error caused by long numeric postal codes
Seamus Lee [Tue, 25 Jul 2017 07:29:48 +0000 (17:29 +1000)]
CRM-20962 Fix issue where we were passing through a string when it should be an array causing error in php7.1
Eileen McNaughton [Fri, 28 Jul 2017 05:08:16 +0000 (17:08 +1200)]
Merge pull request #10721 from seamuslee001/CRM-20939
CRM-20939 CRM-19941 Fix issue where $_recent variable is initialised as a strin…
Jitendra Purohit [Fri, 28 Jul 2017 03:41:51 +0000 (09:11 +0530)]
Add option_group unit test
Eileen McNaughton [Thu, 27 Jul 2017 21:18:59 +0000 (09:18 +1200)]
Merge pull request #10778 from civicrm/4.7.23-rc
4.7.23 rc
Monish Deb [Thu, 27 Jul 2017 14:45:23 +0000 (20:15 +0530)]
Merge pull request #10738 from eileenmcnaughton/prim_address
CRM-20759 (follow up fix) Primary address is 'distributed' over sever…
Monish Deb [Thu, 27 Jul 2017 14:18:58 +0000 (19:48 +0530)]
Merge pull request #10777 from eileenmcnaughton/rdate
Code cleanup towards CRM-20610.
Eileen McNaughton [Thu, 27 Jul 2017 13:46:25 +0000 (01:46 +1200)]
Merge pull request #10773 from dsnopek/crm-20973
CRM-20973: Fixes "Call to undefined function Civi\API\civicrm_api3_create_error() …
Eileen McNaughton [Thu, 27 Jul 2017 12:12:16 +0000 (00:12 +1200)]
Merge pull request #10772 from seamuslee001/CRM-20971
CRM-20972 Attempt to handle new type of Exception thrown in php7.1 wh…
eileen [Thu, 27 Jul 2017 11:47:41 +0000 (23:47 +1200)]
Code cleanup towards CRM-20610.
We have code repetition of the receipt_date construct in the tpl. Once for
credit card payments & once not, with no substantive difference.
This commit consolidates them and moves them out of the payment block,
which going forwards will better distinguish between the contribution and
the payments towards it.
Seamus Lee [Thu, 27 Jul 2017 10:31:52 +0000 (10:31 +0000)]
Add in code comment about it being a PHP7.1 issue
Monish Deb [Thu, 27 Jul 2017 10:19:47 +0000 (15:49 +0530)]
Merge pull request #10774 from eileenmcnaughton/payment_form
CRM-20610 add a form for editing payment details
Monish Deb [Thu, 27 Jul 2017 09:47:09 +0000 (15:17 +0530)]
Merge pull request #10775 from eileenmcnaughton/bounce
CRM-20976 Improve error handling when someone tries to make a credit …
eileen [Thu, 27 Jul 2017 09:45:10 +0000 (21:45 +1200)]
CRM-20976 Improve error handling when someone tries to make a credit card contribution and no processor is configured
eileen [Thu, 27 Jul 2017 09:04:48 +0000 (21:04 +1200)]
CRM-20610 additional code comments.
I have added comments to some things I'd really like to see tidied up (but could
not reasonably extend the scope here to include)
Monish Deb [Thu, 27 Jul 2017 08:00:10 +0000 (20:00 +1200)]
CRM-20610 add a form for editing payment details
This commit adds a link to the left of the payment listing for editing
payments. Provided the payments do not have an attached
payment processor it is possible to edit the check number,
or card_type_id and pan_truncation, along with the
trxn_date
David Snopek [Thu, 27 Jul 2017 03:08:40 +0000 (22:08 -0500)]
CRM-20973: Fixes "Call to undefined function Civi\API\civicrm_api3_create_error() in Civi/API/Kernel.php on line 413"
Tim Otten [Wed, 26 Jul 2017 22:16:25 +0000 (15:16 -0700)]
Merge pull request #10766 from seamuslee001/contribute_perm_fix
(NFC) Fix permissions on CRM/Contribute/BAO/Contribution.php
Seamus Lee [Wed, 26 Jul 2017 22:00:59 +0000 (08:00 +1000)]
CRM-20972 Attempt to handle new type of Execption thrown in php7.1 when function call has too few variables
Eileen McNaughton [Wed, 26 Jul 2017 12:19:49 +0000 (00:19 +1200)]
Merge pull request #10771 from civicrm/4.7.23-rc
4.7.23 rc
Eileen McNaughton [Wed, 26 Jul 2017 11:54:52 +0000 (23:54 +1200)]
Merge pull request #10770 from jitendrapurohit/CRM-18177-rc
CRM-18177 RC Fix for param updated in previous PR #10173
Eileen McNaughton [Wed, 26 Jul 2017 11:53:56 +0000 (23:53 +1200)]
Merge pull request #10768 from JMAConsulting/CRM-20947
CRM-20947, fixed notice error for deprecated function
Edsel [Wed, 26 Jul 2017 11:25:32 +0000 (16:55 +0530)]
CRM-20952 Refreshed event tab on payment made to contribution
----------------------------------------
* CRM-20952: Refresh membership tab on edits to membership payments
https://issues.civicrm.org/jira/browse/CRM-20952
Jitendra Purohit [Wed, 26 Jul 2017 09:32:08 +0000 (15:02 +0530)]
Upgrade changes, weight and qill fix
Edsel [Wed, 26 Jul 2017 07:04:31 +0000 (12:34 +0530)]
CRM-20952 Bug fixes
----------------------------------------
* CRM-20952: Refresh membership tab on edits to membership payments
https://issues.civicrm.org/jira/browse/CRM-20952
Jitendra Purohit [Tue, 25 Jul 2017 07:19:02 +0000 (12:49 +0530)]
Fix updatePledgeStatus execution to use pledge_status og values
Jitendra Purohit [Mon, 24 Jul 2017 11:20:17 +0000 (16:50 +0530)]
Add separate option group for pledge status
Jitendra Purohit [Wed, 26 Jul 2017 04:45:08 +0000 (10:15 +0530)]
CRM-18177 RC Fix for param updated in previous PR #10173
mark burdett [Wed, 26 Jul 2017 02:13:05 +0000 (19:13 -0700)]
CRM-20970 - avoid MySQL error caused by long numeric postal codes
Seamus Lee [Tue, 25 Jul 2017 21:48:32 +0000 (07:48 +1000)]
Fix permissions on CRM/Contribute/BAO/Contribution.php
Pradeep Nayak [Tue, 25 Jul 2017 21:02:58 +0000 (02:32 +0530)]
CRM-20947, fixed notice error for deprecated function
----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
https://issues.civicrm.org/jira/browse/CRM-20947
Pradeep Nayak [Tue, 25 Jul 2017 21:00:04 +0000 (02:30 +0530)]
CRM-20947, fixed notice error for deprecated function
----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
https://issues.civicrm.org/jira/browse/CRM-20947
Eileen McNaughton [Tue, 25 Jul 2017 20:46:34 +0000 (08:46 +1200)]
Merge pull request #10764 from civicrm/4.7.23-rc
4.7.23 rc
projects / civicrm-core.git / log