eileenmcnaugton [Tue, 13 Oct 2015 13:39:58 +0000 (02:39 +1300)]
CRM-17256 fix for paylater billing_required
This commit sets up pay-later as a payment processor class in limited capacity to allow it to cope
with the field loading for billing_required_for_pay_later contribution forms. I had hoped not to have to do this
in 4.7 but the address fields were not loading correctly on form-change :-(. This did allow me to remove quite a few
hacks that were in place to support the way the billing_for_pay_later was working though :-).
Note that a better solution than a check-box for billing-required-for-pay-later would be to allow joining a profile
of field that the paymnet processor should be 'encouraged' to provide on the payment form. ie. the payment processor could
then build the form to include the profile fields and those required (if any) by it's processor.
The code is written on the assumption the billing profile might be changed to a real profile at some point
eileenmcnaugton [Tue, 13 Oct 2015 13:15:27 +0000 (02:15 +1300)]
CRM-17256 don't validate cc fields if token has been entered
eileenmcnaugton [Tue, 13 Oct 2015 09:38:25 +0000 (22:38 +1300)]
enotice fix on paypal express
eileenmcnaugton [Tue, 13 Oct 2015 09:38:04 +0000 (22:38 +1300)]
CRM-17387 getBillingDefaults function not available to Membership Form
I think this might be some mix up in the history of merged & perhaps this function
might have been meant to go in favour of anohter.
But, the other places in the code that duplicate this are still present - so perhaps not tackled
eileenmcnaugton [Tue, 13 Oct 2015 09:06:22 +0000 (22:06 +1300)]
CRM-17256 move validation of billing fields to the payment processor
Note that this wasn't done previously due to trying to 'work around' the billing-for-pay later
but that doesn't turn out to be working properly at the moment so better to do the 'proper' fix for this
and for that than to keep trying to work around the way that code was working
eileenmcnaugton [Tue, 13 Oct 2015 09:02:07 +0000 (22:02 +1300)]
CRM-17256 use consistent retrieval of billing location type id
eileenmcnaugton [Sun, 11 Oct 2015 07:41:58 +0000 (20:41 +1300)]
CRM-17256 paypal : fix up method selection code
eileenmcnaugton [Mon, 28 Sep 2015 09:06:16 +0000 (22:06 +1300)]
CRM -17256 fix address field validatoin for payment processors
https://github.com/civicrm/civicrm-core/pull/6758
Here is the patch. Am working on something else at this stage but it seems to make the form load ok
Eileen McNaughton [Sun, 11 Oct 2015 01:50:00 +0000 (14:50 +1300)]
Merge pull request #6896 from jake-mw/CRM-16669-master
CRM-16669 - ensure financialType is loaded for credit card and non-cr…
colemanw [Sat, 10 Oct 2015 16:36:32 +0000 (12:36 -0400)]
Merge pull request #6547 from colemanw/CRM-17004
CRM-17004 - Remove Moneris from core
Kurund Jalmi [Sat, 10 Oct 2015 16:09:20 +0000 (17:09 +0100)]
Merge pull request #6923 from eileenmcnaughton/CRM-17120
CRM-17120 remove last instance of call to uncached CRM_Core_OptionGro…
eileen [Sat, 10 Oct 2015 03:50:19 +0000 (16:50 +1300)]
CRM-17120 remove last instance of call to uncached CRM_Core_OptionGroup::optionLabel fn
I searched & didn't find any other instances of this function
Coleman Watts [Fri, 9 Oct 2015 23:52:37 +0000 (19:52 -0400)]
CRM-17293 - Fix bad merge
Coleman Watts [Thu, 8 Oct 2015 19:39:49 +0000 (15:39 -0400)]
CRM-17004 - Fix upgrade query for removing payment processors
colemanw [Fri, 9 Oct 2015 21:52:05 +0000 (17:52 -0400)]
Merge pull request #6918 from colemanw/apiExplorer
apiExplorer - Encorage 'return' to be an array for php & js
Kurund Jalmi [Fri, 9 Oct 2015 15:25:22 +0000 (16:25 +0100)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-09-16-14-05
Conflicts:
CRM/Core/Payment/Form.php
Kurund Jalmi [Fri, 9 Oct 2015 15:03:54 +0000 (16:03 +0100)]
Merge pull request #6921 from kurund/CRM-16785
CRM-16785, exclude code coverage
Kurund Jalmi [Fri, 9 Oct 2015 14:59:50 +0000 (15:59 +0100)]
CRM-16785, exclude code coverage
----------------------------------------
* CRM-16785: non-free file "packages/PHP/CodeCoverage/Report/HTML/Renderer/Template/highcharts.js"
https://issues.civicrm.org/jira/browse/CRM-16785
Eileen McNaughton [Fri, 9 Oct 2015 06:31:02 +0000 (19:31 +1300)]
Merge pull request #6917 from eileenmcnaughton/CRM-17144
CRM-17144 add developer tab to lybunt
Coleman Watts [Fri, 9 Oct 2015 00:30:51 +0000 (20:30 -0400)]
apiExplorer - Encorage 'return' to be an array for php & js
colemanw [Thu, 8 Oct 2015 23:37:19 +0000 (19:37 -0400)]
Merge pull request #6617 from colemanw/CRM-17102
CRM-17102 - Better navigation for ACL screens
eileen [Thu, 8 Oct 2015 21:37:31 +0000 (10:37 +1300)]
CRM-17144 add developer tab to lybunt
Change-Id: Ifd21ea255bebd6a218eb4693ea7bfa386360f348
Dave Greenberg [Thu, 8 Oct 2015 20:37:07 +0000 (13:37 -0700)]
Merge pull request #6888 from davecivicrm/CRM-16725
CRM-16725 - Add Preview PDF button to PDF Letter task so users can re…
Monish Deb [Thu, 8 Oct 2015 17:08:43 +0000 (22:38 +0530)]
Merge pull request #6915 from jitendrapurohit/CRMtestfixes
CRM-master test fix
Coleman Watts [Thu, 8 Oct 2015 16:56:59 +0000 (12:56 -0400)]
CRM-17004 - Fix upgrade order
Coleman Watts [Fri, 21 Aug 2015 00:51:35 +0000 (20:51 -0400)]
CRM-17004 - Remove Moneris from core
jitendrapurohit [Thu, 8 Oct 2015 13:18:22 +0000 (18:48 +0530)]
CRM-master test fix
colemanw [Thu, 8 Oct 2015 13:07:30 +0000 (09:07 -0400)]
Merge pull request #6909 from colemanw/CRM-12527
CRM-12527 - Additional header fixes
colemanw [Thu, 8 Oct 2015 13:06:36 +0000 (09:06 -0400)]
Merge pull request #6913 from eileenmcnaughton/CRM-17075-more
CRM-17075 further fix to handling entity reference in search form
Monish Deb [Thu, 8 Oct 2015 12:06:00 +0000 (17:36 +0530)]
Merge pull request #6911 from monishdeb/CRM-17353
CRM-17353 fix - Membership Dashboard has links with eg status1,2,3 wh…
Yashodha Chaku [Thu, 8 Oct 2015 11:40:58 +0000 (17:10 +0530)]
Merge pull request #6914 from yashodha/fix-version
Update version to 4.7.alpha4
yashodha [Thu, 8 Oct 2015 08:44:04 +0000 (14:14 +0530)]
version fix
Yashodha Chaku [Thu, 8 Oct 2015 08:31:19 +0000 (14:01 +0530)]
Merge pull request #6898 from yashodha/CRM-17299
CRM-17299: Yes or No custom fields not displayed correctly in table
eileenmcnaugton [Thu, 8 Oct 2015 04:53:05 +0000 (17:53 +1300)]
CRM-17075 hack back in handling for membership_type_id as temp fix
eileenmcnaugton [Thu, 8 Oct 2015 02:33:52 +0000 (15:33 +1300)]
CRM-17075 further fix to handling entity reference in search form
This represents another step towards the logic of standardised saving & handling in the query layer
and letting the form layer interpret that to a form
monishdeb [Thu, 8 Oct 2015 04:55:08 +0000 (10:25 +0530)]
CRM-17353 fix - Membership Dashboard has links with eg status1,2,3 which do not cause filter to be applied
https://issues.civicrm.org/jira/browse/CRM-17353
Coleman Watts [Thu, 8 Oct 2015 02:01:09 +0000 (22:01 -0400)]
CRM-16725 - Add status msg when downloading PDF
Coleman Watts [Thu, 8 Oct 2015 01:38:41 +0000 (21:38 -0400)]
CRM-16725 - Remove global download behavior from popups
It was problematic to have the button change run globally.
Now it's just in the spot that needs it.
If other spots need something similar it would be good to find a way to reuse the code.
Coleman Watts [Tue, 6 Oct 2015 00:56:34 +0000 (20:56 -0400)]
CRM-16725 - Change preview button label/icon
Eileen McNaughton [Wed, 7 Oct 2015 23:02:35 +0000 (12:02 +1300)]
Merge pull request #6824 from eileenmcnaughton/CRM-17293
CRM-17293 align payment processor interface between 4.6 & 4.7
Eileen McNaughton [Wed, 7 Oct 2015 23:01:28 +0000 (12:01 +1300)]
Merge pull request #6877 from saurabhbatra96/comment-fixes-utils
Comment fixes for CRM/Utils directory
Eileen McNaughton [Wed, 7 Oct 2015 22:58:37 +0000 (11:58 +1300)]
Merge pull request #6873 from saurabhbatra96/comment-fixes-pledge
Comment fixes for CRM/Pledge directory.
Dave Greenberg [Sat, 3 Oct 2015 20:09:15 +0000 (16:09 -0400)]
CRM-16725 - Add Preview PDF button to PDF Letter task so users can review PDF without creating activity.
----------------------------------------
* CRM-16725:
https://issues.civicrm.org/jira/browse/CRM-16725
Coleman Watts [Wed, 7 Oct 2015 18:51:50 +0000 (14:51 -0400)]
Merge branch 4.6 into master
Conflicts:
sql/civicrm_generated.mysql
xml/version.xml
colemanw [Wed, 7 Oct 2015 18:49:25 +0000 (14:49 -0400)]
Merge pull request #6910 from colemanw/pdf
Fix template checkboxes in Print PDF form
Coleman Watts [Wed, 7 Oct 2015 18:41:55 +0000 (14:41 -0400)]
Fix template checkboxes in Print PDF form
Coleman Watts [Wed, 7 Oct 2015 18:05:35 +0000 (14:05 -0400)]
CRM-12527 - Additional header fixes
Dave Greenberg [Wed, 7 Oct 2015 17:19:51 +0000 (10:19 -0700)]
Merge pull request #6866 from eileenmcnaughton/CRM-17318
CRM-17318 add getPaymentDescript to Core_Payment class …
CiviCRM [Wed, 7 Oct 2015 12:58:14 +0000 (05:58 -0700)]
Update version to 4.6.10
Kurund Jalmi [Wed, 7 Oct 2015 11:27:15 +0000 (12:27 +0100)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-07-14-23-03
Conflicts:
CRM/Contribute/BAO/Contribution.php
CRM/Core/Payment/BaseIPN.php
CRM/Extension/Manager/Payment.php
CRM/Upgrade/Incremental/sql/4.6.6.mysql.tpl
README.txt
sql/civicrm_generated.mysql
templates/CRM/common/success.tpl
tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
Monish Deb [Wed, 7 Oct 2015 09:21:45 +0000 (14:51 +0530)]
Merge pull request #6908 from jitendrapurohit/CRM-17348
CRM-17348 - add Advcheckbox in addfield()
Yashodha Chaku [Wed, 7 Oct 2015 08:17:04 +0000 (13:47 +0530)]
Merge pull request #6869 from seamuslee001/CRM-17309_master
CRM-17309 Classify no MX record bounce pattern as a DNS Bounce
jitendrapurohit [Wed, 7 Oct 2015 07:29:43 +0000 (12:59 +0530)]
fix for enable/disable relationship
jitendrapurohit [Wed, 7 Oct 2015 07:18:22 +0000 (12:48 +0530)]
minor fix
jitendrapurohit [Wed, 7 Oct 2015 06:51:30 +0000 (12:21 +0530)]
CRM-17348 - add Advcheckbox in addfield()
yashodha [Wed, 7 Oct 2015 06:48:01 +0000 (12:18 +0530)]
make sure it works for non-boolean options as well
colemanw [Wed, 7 Oct 2015 01:35:29 +0000 (21:35 -0400)]
Merge pull request #6549 from pradpnayak/CRM-16620
--CRM-16620, replaced 'nothing' to NULL
colemanw [Wed, 7 Oct 2015 01:03:28 +0000 (21:03 -0400)]
Merge pull request #6533 from BorislavZlatanov/patch-1
Skip loop iteration if 'element_name' field is not set
colemanw [Wed, 7 Oct 2015 00:46:15 +0000 (20:46 -0400)]
Merge pull request #6882 from eileenmcnaughton/CRM-17334
CRM-17334 ensure installments is passed to membership rocessing if set
colemanw [Wed, 7 Oct 2015 00:41:08 +0000 (20:41 -0400)]
Merge pull request #6902 from colemanw/CRM-13823
CRM-13823 - Add php version check
colemanw [Wed, 7 Oct 2015 00:38:32 +0000 (20:38 -0400)]
Merge pull request #6835 from seamuslee001/CRM-17075
CRM-17075 fix searching on membership type as entity reference in adv…
colemanw [Wed, 7 Oct 2015 00:36:34 +0000 (20:36 -0400)]
Merge pull request #6897 from jitendrapurohit/CRMtestfixes
4.6 - CRM Test Fixes
Dave Greenberg [Wed, 7 Oct 2015 00:36:25 +0000 (17:36 -0700)]
Merge pull request #6887 from davecivicrm/CRM-14898
CRM-14898 - Modify action links on membership selector to make it eas…
colemanw [Wed, 7 Oct 2015 00:35:11 +0000 (20:35 -0400)]
Merge pull request #6899 from colemanw/crmDatepicker
crmDatepicker fixes and documentation
colemanw [Wed, 7 Oct 2015 00:05:16 +0000 (20:05 -0400)]
Merge pull request #6875 from colemanw/CRM-17323
CRM-17323 - Add sid token to registration/membership links
Dave Greenberg [Wed, 7 Oct 2015 00:01:23 +0000 (17:01 -0700)]
CRM-14898 - Webtest fixes for action link change.
----------------------------------------
* CRM-14898: Take "Renew" out of More or make it more prominent somehow
https://issues.civicrm.org/jira/browse/CRM-14898
Dave Greenberg [Tue, 6 Oct 2015 23:58:55 +0000 (16:58 -0700)]
Merge pull request #6431 from JMAConsulting/CRM-16526
Crm 16526
colemanw [Tue, 6 Oct 2015 21:26:46 +0000 (17:26 -0400)]
Merge pull request #6853 from eileenmcnaughton/CRM-17256-46
CRM-17256 populate created_id on report creation
Dave Greenberg [Tue, 6 Oct 2015 19:15:19 +0000 (12:15 -0700)]
Merge pull request #6904 from davecivicrm/CRM-17344
CRM-17344 - Fix footer button markup in Manage Reports Template.
Dave Greenberg [Tue, 6 Oct 2015 19:14:14 +0000 (12:14 -0700)]
CRM-17344 - Fix footer button markup in Manage Reports Template.
----------------------------------------
* CRM-17344: buttons without text on Manage Reports page
https://issues.civicrm.org/jira/browse/CRM-17344
Dave Greenberg [Tue, 6 Oct 2015 19:02:19 +0000 (12:02 -0700)]
Merge pull request #6889 from davecivicrm/CRM-17175
CRM-17175 - Support passing of custom field value in force mode to Ac…
Dave Greenberg [Tue, 6 Oct 2015 18:59:40 +0000 (11:59 -0700)]
Merge pull request #6891 from davecivicrm/CRM-17340
CRM-17340 - Fix handling of Amount label for back-office quick config…
Dave Greenberg [Tue, 6 Oct 2015 18:55:44 +0000 (11:55 -0700)]
Merge pull request #6893 from seamuslee001/CRM-17341
CRM-17341 Include Hold date in the display of Emails on contact records to show…
colemanw [Tue, 6 Oct 2015 18:55:40 +0000 (14:55 -0400)]
Merge pull request #6903 from colemanw/CRM-14748
CRM-14748 - Clarify rest url in api explorer
Coleman Watts [Tue, 6 Oct 2015 18:46:07 +0000 (14:46 -0400)]
CRM-14748 - Clarify rest url in api explorer
Coleman Watts [Tue, 6 Oct 2015 18:42:01 +0000 (14:42 -0400)]
CRM-13823 - Add php version check
colemanw [Tue, 6 Oct 2015 18:34:12 +0000 (14:34 -0400)]
Merge pull request #6883 from eileenmcnaughton/CRM-17355
CRM-17335 toward eliminating use of leaky static
colemanw [Tue, 6 Oct 2015 18:26:05 +0000 (14:26 -0400)]
Merge pull request #6806 from colemanw/CRM-16980
CRM-16980 - Improve case role handing
Coleman Watts [Tue, 6 Oct 2015 16:42:00 +0000 (12:42 -0400)]
Update civicrm.org links to use https
Coleman Watts [Tue, 6 Oct 2015 13:44:45 +0000 (09:44 -0400)]
CRM-16907 - Preserve other links in the help menu
Coleman Watts [Tue, 6 Oct 2015 13:40:53 +0000 (09:40 -0400)]
crmDatepicker fixes and documentation
yashodha [Tue, 6 Oct 2015 13:29:46 +0000 (18:59 +0530)]
CRM-17299: Yes or No custom fields not displayed correctly in table
----------------------------------------
* CRM-17299: "Yes or No" custom fields not displayed correctly in table
https://issues.civicrm.org/jira/browse/CRM-17299
jitendrapurohit [Tue, 6 Oct 2015 10:19:41 +0000 (15:49 +0530)]
minor changes
jitendrapurohit [Tue, 6 Oct 2015 10:08:51 +0000 (15:38 +0530)]
4.6 - CRM Test Fixes
Kurund Jalmi [Tue, 6 Oct 2015 06:38:48 +0000 (12:08 +0530)]
Merge pull request #6890 from monishdeb/46merge
4.6.9 merge-forward
Jake Martin White [Tue, 6 Oct 2015 04:38:55 +0000 (04:38 +0000)]
CRM-16669 - ensure financialType is loaded for credit card and non-credit-card transactions so non_deductible amount is correctly set
Seamus Lee [Tue, 6 Oct 2015 03:23:50 +0000 (03:23 +0000)]
Include Hold date in the display of Emails on contact records to show when the address was put on hold
Dave Greenberg [Mon, 5 Oct 2015 23:15:53 +0000 (16:15 -0700)]
Merge pull request #6880 from eileenmcnaughton/CRM-17329
CRM-17329 fix over-zealous setting of recurring and add unit test
Eileen McNaughton [Mon, 5 Oct 2015 22:56:21 +0000 (11:56 +1300)]
Merge pull request #6870 from eileenmcnaughton/CRM-17234
CRM-17324 Log upgrade steps
Dave Greenberg [Mon, 5 Oct 2015 22:03:14 +0000 (15:03 -0700)]
Merge pull request #6886 from jaapjansma/CRM-17338
Fixed #CRM-17338
Dave Greenberg [Mon, 5 Oct 2015 21:11:35 +0000 (14:11 -0700)]
CRM-17340 - Fix handling of Amount label for back-office quick config contributions.
----------------------------------------
* CRM-17340: Fix unexpected values stored in total_amount field for default price set
https://issues.civicrm.org/jira/browse/CRM-17340
Eileen McNaughton [Mon, 5 Oct 2015 20:56:46 +0000 (09:56 +1300)]
Merge pull request #6812 from eileenmcnaughton/CRM-17075
CRM-17075 further fix to using entity reference for membership_type_i…
Dave Greenberg [Mon, 5 Oct 2015 20:35:27 +0000 (13:35 -0700)]
CRM-17175 - Support passing of custom field value in force mode to Activity Search.
----------------------------------------
* CRM-17175: Enable search activity by custom fields in force mode
https://issues.civicrm.org/jira/browse/CRM-17175
monishdeb [Mon, 5 Oct 2015 04:54:41 +0000 (10:24 +0530)]
Relationship count fix
monishdeb [Mon, 21 Sep 2015 14:39:14 +0000 (20:09 +0530)]
Revert CRM-17067 fix
----------------------------------------
* CRM-17067: New relationship permission enforcement has result to related membership not created via public pages
https://issues.civicrm.org/jira/browse/CRM-17067
monishdeb [Mon, 21 Sep 2015 14:17:36 +0000 (19:47 +0530)]
minor change
monishdeb [Mon, 21 Sep 2015 13:49:45 +0000 (19:19 +0530)]
Revert "revert CRM-16711 fix "
This reverts commit
1ca927cc816b21e779ebc0e9e5e2dd3bd275debd.
monishdeb [Wed, 26 Aug 2015 06:00:20 +0000 (11:30 +0530)]
format fixes
monishdeb [Wed, 26 Aug 2015 05:28:02 +0000 (10:58 +0530)]
CRM-17067 fix - New relationship permission enforcement has result to related membership not created via public pages
https://issues.civicrm.org/jira/browse/CRM-17067
Guanhuan Chen [Fri, 2 Oct 2015 15:35:14 +0000 (16:35 +0100)]
Condense credit note number query
projects / civicrm-core.git / log