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
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
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
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
Eileen McNaughton [Tue, 25 Jul 2017 20:36:09 +0000 (08:36 +1200)]
Merge pull request #10750 from JMAConsulting/CRM-20947
CRM-20947, fixed notice error for deprecated function on new Bulk ent…
Eileen McNaughton [Tue, 25 Jul 2017 20:29:08 +0000 (08:29 +1200)]
Merge pull request #10762 from seanmadsen/premium-images
Fix placement of call to simplifyURL() function
Eileen McNaughton [Tue, 25 Jul 2017 20:28:05 +0000 (08:28 +1200)]
Merge pull request #10742 from eileenmcnaughton/dead
CRM-20953 Importing contacts with deceased_date not setting is_deceased
Eileen McNaughton [Tue, 25 Jul 2017 20:16:16 +0000 (08:16 +1200)]
Merge pull request #10752 from seamuslee001/CRM-20961
CRM-20961 Fix issue where test on php7.1 was reporting that a non num…
Monish Deb [Tue, 25 Jul 2017 18:43:31 +0000 (00:13 +0530)]
Merge pull request #10761 from monishdeb/CRM-20821_CRM-20938
CRM-20821 & CRM-20938 : minor fix
Sean Madsen [Tue, 25 Jul 2017 18:25:35 +0000 (12:25 -0600)]
Fix placement of call to simplifyURL() function
Before this commit, the URL simplification was performed within the
$params array used as the *default* values, so these values got
over-written by the submitted values with array_merge().
This is a follow-up to changes made in #10720
bb80d2f
deb.monish [Tue, 25 Jul 2017 18:02:46 +0000 (23:32 +0530)]
CRM-20821 & CRM-20938 : minor fix
mickadoo [Tue, 25 Jul 2017 12:31:17 +0000 (13:31 +0100)]
CRM-20965: Add PR template
Monish Deb [Tue, 25 Jul 2017 11:41:40 +0000 (17:11 +0530)]
Merge pull request #10751 from seamuslee001/CRM-20960
CRM-20960 Upgrade dompdf to 0.8 for php7.1 compatability
Monish Deb [Tue, 25 Jul 2017 11:34:55 +0000 (17:04 +0530)]
Merge pull request #10747 from samuelsov/CRM-20954
CRM-20954 Fixing localized financial status problems
Seamus Lee [Tue, 25 Jul 2017 07:29:40 +0000 (17:29 +1000)]
CRM-20961 Fix issue where test on php7.1 was reporting that a non numeric was being passed
Seamus Lee [Tue, 25 Jul 2017 05:03:24 +0000 (15:03 +1000)]
CRM-20960 Upgrade dompdf to 0.8 for php7.1 compatability
Pradeep Nayak [Tue, 25 Jul 2017 02:52:45 +0000 (08:22 +0530)]
CRM-20947, fixed notice error for deprecated function on new Bulk entry Batch
----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
https://issues.civicrm.org/jira/browse/CRM-20947
colemanw [Tue, 25 Jul 2017 01:57:13 +0000 (21:57 -0400)]
Merge pull request #10720 from seanmadsen/CRM-20821_CRM-20938
CRM-20821 & CRM-20938 - fix bugs in managing premium product images
colemanw [Tue, 25 Jul 2017 01:52:27 +0000 (21:52 -0400)]
Merge pull request #10723 from seamuslee001/CRM-20945
CRM-20945 Remove underline on active pager step
Eileen McNaughton [Tue, 25 Jul 2017 01:35:14 +0000 (13:35 +1200)]
Merge pull request #10743 from JMAConsulting/CRM-20947
CRM-20947, fixed notice error for deprecated function on Bulk entry B…
Seamus Lee [Mon, 24 Jul 2017 21:50:44 +0000 (07:50 +1000)]
Make the button a bit more prominiant
Monish Deb [Mon, 24 Jul 2017 21:17:34 +0000 (02:47 +0530)]
Merge pull request #10748 from seamuslee001/CRM-20943-2
CRM-20943 Fix subsequent issue found by Monish and Steven
Samuel Vanhove [Mon, 24 Jul 2017 21:17:26 +0000 (17:17 -0400)]
CRM-20954 Initiate paid status id only once
Seamus Lee [Mon, 24 Jul 2017 21:14:07 +0000 (07:14 +1000)]
CRM-20943 Fix subsequent issue found by Monish and Steven
Monish Deb [Mon, 24 Jul 2017 20:52:45 +0000 (02:22 +0530)]
Merge pull request #10686 from totten/master-sql
CRM_Utils_SQL_Select - Allow fluent query execution
Samuel Vanhove [Mon, 24 Jul 2017 20:19:57 +0000 (16:19 -0400)]
CRM-20954 Fixing localized finantial status problems
Monish Deb [Mon, 24 Jul 2017 14:44:31 +0000 (20:14 +0530)]
Merge pull request #10653 from JKingsnorth/CRM-20863
CRM-20863 Improve report list ordering
Pradeep Nayak [Mon, 24 Jul 2017 13:59:02 +0000 (19:29 +0530)]
CRM-20947, fixed notice error for deprecated function on Bulk entry Batch listing page
----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
https://issues.civicrm.org/jira/browse/CRM-20947
eileen [Mon, 24 Jul 2017 13:25:01 +0000 (01:25 +1200)]
CRM-20953 Importing contacts with deceased_date not setting is_deceased
Edsel [Mon, 24 Jul 2017 13:24:52 +0000 (18:54 +0530)]
CRM-20952 Refresh membership tab if contribution is membership payment
----------------------------------------
* CRM-20952: Refresh membership tab on edits to membership payments
https://issues.civicrm.org/jira/browse/CRM-20952
deb.monish [Mon, 24 Jul 2017 12:09:52 +0000 (17:39 +0530)]
additional fix
Eileen McNaughton [Mon, 24 Jul 2017 12:55:55 +0000 (00:55 +1200)]
Merge pull request #10732 from JMAConsulting/CRM-20947
CRM-20947, fixed warning for deprecated function while generating inv…
Eileen McNaughton [Mon, 24 Jul 2017 12:45:59 +0000 (00:45 +1200)]
Merge pull request #10739 from civicrm/4.7.23-rc
4.7.23 rc merge to master
eileen [Mon, 24 Jul 2017 12:28:46 +0000 (00:28 +1200)]
CRM-20759 (follow up fix) Primary address is 'distributed' over several ID
This wasn't picked up originally in the test as it was only using one field of the primary type.
The old code was indexing by 'addressCnt' (checking that the location type id was different each time). I
have switched to index by location_type_id - we should only have one address per location type per contact.
I also removed the code that sets 'is_primary' if we are importing the first address for a contact.
That has been handled by the BAO for some time
Sean Madsen [Fri, 21 Jul 2017 19:13:31 +0000 (13:13 -0600)]
Don't use array dereferencing (for PHP 5.3 compat)
Sean Madsen [Fri, 21 Jul 2017 17:01:39 +0000 (11:01 -0600)]
CRM-20938 - Maintain aspect ratio in resizeImage()
Make CRM_Utils_File::resizeImage() preserve image aspect ratio by
default.
Sean Madsen [Fri, 21 Jul 2017 16:53:16 +0000 (10:53 -0600)]
CRM-20821 - Use smarter logic to adjust img URL
This change is the crux of CRM-20821.
Before this change, editing a premium product would automatically
break the image URL. After this change, premium products can be edited
while retaining the image URL. Functionality is preserved which changes
the URL to a local URL when possible.
This commit adds two new Utils functions (along with tests) to handle
the logic of changing a supplied URL to a local URL.
Sean Madsen [Fri, 21 Jul 2017 16:43:49 +0000 (10:43 -0600)]
CRM-20821 - Improve ManagePremiums formRule()
- Improve CRM_Contribute_Form_ManagePremiums::formRule()
- Require an image file, if "upload" is chosen
- Remove the commented-out code for a rule which required images to be
within a certain size
- Minor refactoring to improve code clarity
Sean Madsen [Fri, 21 Jul 2017 16:41:37 +0000 (10:41 -0600)]
CRM-20821 - Refactor ManagePremiums postProcess()
- Refactor CRM_Contribute_Form_ManagePremiums::postProcess()
- No major changes to functionality
- Eliminate deeply nested code (addressing "FIXME" comment)
- Split code into multiple functions
- Add more comments
Sean Madsen [Fri, 21 Jul 2017 16:31:12 +0000 (10:31 -0600)]
CRM-20821 - Refactor PremiumProduct BAO add()
- Refactor CRM_Contribute_BAO_ManagePremiums::add
- Don't change any functionality
- Improve docblock
- Use a $defaults array
Sean Madsen [Fri, 21 Jul 2017 16:25:29 +0000 (10:25 -0600)]
CRM-20821 - Refactor resizeImage()
- Clean up CRM_Utils_File::resizeImage()
- No major functionality changes
- Better docblock
- Better error handling
- Better variable names
Sean Madsen [Fri, 21 Jul 2017 16:15:58 +0000 (10:15 -0600)]
CRM-20821 - Move resizeImage() to Utils class
- Move resizeImage() from CRM_Contribute_Form_ManagePremiums to
CRM_Utils_File
- Make it public static
- Don't change anything about how it works
Monish Deb [Mon, 24 Jul 2017 11:37:47 +0000 (17:07 +0530)]
Merge pull request #10736 from eileenmcnaughton/reg
CRM-20950 Prt 2 Contact import mapping to wrong location type