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
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
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…
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
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
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
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
eileen [Mon, 24 Jul 2017 10:19:00 +0000 (22:19 +1200)]
CRM-20950 Prt 2 Contact import mapping to wrong location type
Eileen McNaughton [Mon, 24 Jul 2017 09:58:54 +0000 (21:58 +1200)]
Merge pull request #10735 from eileenmcnaughton/reg
CRM-20950 Contact import mapping to wrong location type
eileen [Mon, 24 Jul 2017 09:56:43 +0000 (21:56 +1200)]
CRM-20950 Contact import mapping to wrong location type
Pradeep Nayak [Mon, 24 Jul 2017 02:20:26 +0000 (07:50 +0530)]
CRM-20947, fixed warning for deprecated function while generating invoice
----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
https://issues.civicrm.org/jira/browse/CRM-20947
Eileen McNaughton [Mon, 24 Jul 2017 00:27:31 +0000 (12:27 +1200)]
Merge pull request #10664 from jitendrapurohit/CRM-20875
CRM-20875 - Fix membership import to avoid notice error to be thrown
Eileen McNaughton [Sun, 23 Jul 2017 22:36:33 +0000 (10:36 +1200)]
Merge pull request #10727 from JMAConsulting/CRM-20947
CRM-20947, fixed notice error deprecated CRM_Core_OptionGroup::getLabel
Eileen McNaughton [Sun, 23 Jul 2017 22:25:21 +0000 (10:25 +1200)]
Merge pull request #10724 from seamuslee001/CRM-19941
CRM-19941 CRM-20943 Fix issue in PHP7.1 using is non object mode in …
eileen [Sun, 23 Jul 2017 07:25:20 +0000 (19:25 +1200)]
Test for CRM-20915 - Initial testing on Back office participant form class.
Although the failing assertion is not present, this test demonstrates the bug described in
CRM-20915. It also adds initial test to the form
deb.monish [Wed, 19 Jul 2017 18:30:43 +0000 (00:00 +0530)]
CRM-20915: Creating credit card registration for event stores payment method as check
Pradeep Nayak [Sun, 23 Jul 2017 10:15:45 +0000 (15:45 +0530)]
CRM-20947, ficed notice error deprecated CRM_Core_OptionGroup::getLabel
----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
https://issues.civicrm.org/jira/browse/CRM-20947
Eileen McNaughton [Sun, 23 Jul 2017 04:51:19 +0000 (16:51 +1200)]
Merge pull request #10722 from seamuslee001/CRM-20944
CRM-20944 Remove call to deprecated CRM_Core_OptionGroup::getValue in…
Seamus Lee [Sat, 22 Jul 2017 22:18:55 +0000 (22:18 +0000)]
CRM-20944 Remove call to deprecated CRM_Core_OptionGroup::getValue in ActivityLinks.php
Seamus Lee [Sat, 22 Jul 2017 22:48:14 +0000 (22:48 +0000)]
CRM-20945 Remove underline on active pager step
Seamus Lee [Sat, 22 Jul 2017 22:43:24 +0000 (22:43 +0000)]
CRM-19941 CRM-20943 Fix issue in PHP7.1 using is non object mode in AtoZ Pager
Tim Otten [Sat, 22 Jul 2017 18:04:10 +0000 (11:04 -0700)]
Merge pull request #10715 from totten/master-jdebug
CRM-19575 - CRM_Utils_System_Joomla - Fix warning. Define JDEBUG
Seamus Lee [Sat, 22 Jul 2017 00:35:38 +0000 (10:35 +1000)]
CRM-20939 Fix issue where $_recent variable is initialised as a string when should be array
Monish Deb [Fri, 21 Jul 2017 12:28:24 +0000 (17:58 +0530)]
Merge pull request #10710 from jitendrapurohit/participantfix
CRM-17236 - Custom dates fields displayed as (01/01/1970) in Events confirmation receipt
Jitendra Purohit [Thu, 20 Jul 2017 10:42:08 +0000 (16:12 +0530)]
Fix participant mails
Monish Deb [Fri, 21 Jul 2017 11:02:34 +0000 (16:32 +0530)]
Merge pull request #10704 from eileenmcnaughton/admin_form
CRM-20923 refactor tpl to be based on metadata not hard-coding
deb.monish [Fri, 21 Jul 2017 09:15:34 +0000 (14:45 +0530)]
style fix
Eileen McNaughton [Fri, 21 Jul 2017 09:01:26 +0000 (21:01 +1200)]
Merge pull request #10676 from fuzionnz/CRM-20884-remove_net_smtp_readme_symlink
Remove broken symlink from vendor/pear/net_smtp
Eileen McNaughton [Fri, 21 Jul 2017 08:59:42 +0000 (20:59 +1200)]
Merge pull request #10668 from jmcclelland/CRM-20876
CRM-20876 - ensure honor block variable is passed to template
Eileen McNaughton [Fri, 21 Jul 2017 08:52:56 +0000 (20:52 +1200)]
Merge pull request #10713 from mfb/CRM-20931
CRM-20931 - Allow contact custom fields to be added to Contribution Detail report
Eileen McNaughton [Fri, 21 Jul 2017 02:56:31 +0000 (14:56 +1200)]
Merge pull request #10714 from totten/master-gitignore
(NFC) gitignore - Remove obsolete entries
Tim Otten [Fri, 21 Jul 2017 02:53:38 +0000 (19:53 -0700)]
CRM-20932 - CRM_Utils_System_Joomla - Fix warning. Define JDEBUG
Background
==========
When running `cv en <extname>` on Joomla, there are repeated warnings, "Use
of undefined constant JDEBUG", and each includes a backtrace. This is hard
to read.
The bug appears to affect backend scripts; it's discussed with a solution in:
https://github.com/joomla/joomla-cms/issues/11512#issuecomment-
244937966
Before
======
`CRM_Utils_System_Joomla::loadBootStrap()` loads various config files.
However, these may or may not set `JDEBUG`.
After
=====
`CRM_Utils_System_Joomla::loadBootStrap()` defensively sets `JDEBUG` if no
other part of the bootstrap has done so.
Eileen McNaughton [Fri, 21 Jul 2017 02:46:13 +0000 (14:46 +1200)]
Merge pull request #10711 from colemanw/CRM-20929
CRM-20929 - Convey css classes to main page title from Angular
Coleman Watts [Fri, 21 Jul 2017 01:43:58 +0000 (21:43 -0400)]
CRM-20929 - Simply add crm-page-title class
Tim Otten [Fri, 21 Jul 2017 00:59:40 +0000 (17:59 -0700)]
(NFC) gitignore - Remove obsolete entries
The `packages` directory is actually a separate git repo, with its own copy
of `.gitignore`.
These rules have no effect in there.
The `packages` directory is ignored as a whole with one entry in
`gitignore`.
eileen [Thu, 20 Jul 2017 01:02:15 +0000 (13:02 +1200)]
CRM-20923 refactor tpl to be based on metadata not hard-coding
Change-Id: Iee2a7aa9fa93c5d20b95f3dbc45ec2f3cf7a216b
mark burdett [Thu, 20 Jul 2017 20:32:50 +0000 (13:32 -0700)]
CRM-20931 - Allow contact custom fields to be added to Contribution Detail report
As a bonus also add nickname column to the report :)
colemanw [Thu, 20 Jul 2017 16:38:17 +0000 (12:38 -0400)]
Merge pull request #10430 from JMAConsulting/IIDA-144
CRM-20648, fixed validation to allow participant to register if their…
colemanw [Thu, 20 Jul 2017 14:23:19 +0000 (10:23 -0400)]
Merge pull request #10706 from totten/master-regen-finact
regen.sh - Fix stale function call in sql/GenerateData.php
Coleman Watts [Thu, 20 Jul 2017 13:58:36 +0000 (09:58 -0400)]
CRM-20929 - Convey css classes to main page title from Angular
Edsel [Thu, 20 Jul 2017 12:59:42 +0000 (18:29 +0530)]
CRM-20648 Applied check exclusively to cancelled status
----------------------------------------
* CRM-20648: Allow registration in event with cancelled registration
https://issues.civicrm.org/jira/browse/CRM-20648
Pradeep Nayak [Mon, 29 May 2017 08:48:19 +0000 (14:18 +0530)]
CRM-20648, fixed validation to allow participant to register if their previous registration is cancelled
----------------------------------------
* CRM-20648: Allow registration in event with cancelled registration
https://issues.civicrm.org/jira/browse/CRM-20648
Tim Otten [Thu, 20 Jul 2017 05:33:47 +0000 (22:33 -0700)]
regen.sh - Fix stale function call in sql/GenerateData.php
In [#10463](https://github.com/civicrm/civicrm-core/pull/10463), the
function signature of `getInstrumentFinancialAccount()` changed slightly -- in that
the parameter became mandatory.
Grepping for other calls to `getInstrumentFinancialAccount()` shows that one of the unit-tests
works with example input `4`, so this does the same.
Before
======
Running "regen.sh" fails -- because `getInstrumentFinancialAccount` is called without a parameter.
After
=====
Running "regen.sh" completes -- because `getInstrumentFinancialAccount` is called with `4`.
Acceptance Prompts
==================
* The example data produced by `regen.sh` should contain suitable/similar values for financial records.
* Determine whether `4` is a suitable value.