Peter Haight [Wed, 19 Nov 2014 23:57:59 +0000 (15:57 -0800)]
CRM-15622: Fix for incorrect Fee Amount.
There's a bunch of fee_amount fields in this section of the code leading
to a lot of confusion (see CRM-15372). Many of the payment processors set
the fee_amount field in the result array they return which sets up the
contribution.fee_amount field, but the Authorize.Net AIM API doesn't
return fee information, so Authorize.Net doesn't set this field. Instead
of setting this field to 0 there, I thought it would be better to not
require that the payment processor set this field. Since some of the
payment processors return the same array that was passed into them and the
payment processors don't need the fee_amount field as an argument, I think
that setting that to NULL before passing it in gets us the correct output.
Note that we still need the fix from CRM-15372 to get the
participant.fee_amount field set correctly because the code that sets up
the pariticpant shares the field array that the contribution creation
uses even though they don't have the same 'fee_amount' field.
Conflicts:
CRM/Event/Form/Participant.php
Eileen McNaughton [Sat, 22 Nov 2014 10:13:12 +0000 (23:13 +1300)]
Merge pull request #4597 from eileenmcnaughton/4.4
minor backports (more for consistency but php warning fixes)
Eileen McNaughton [Sat, 22 Nov 2014 10:04:18 +0000 (23:04 +1300)]
Merge pull request #4587 from cividesk/Contribution_BAO_fix
added contribution table in query from clause for contribution note
Eileen McNaughton [Tue, 27 May 2014 08:22:19 +0000 (20:22 +1200)]
CRM-14755 - upgrade fails on insert country
Eileen McNaughton [Mon, 23 Jun 2014 04:02:14 +0000 (16:02 +1200)]
CRM-14902 - html error id relationshipTypeID declared twice
Eileen McNaughton [Fri, 4 Jul 2014 04:24:03 +0000 (16:24 +1200)]
make fn displaySessionError static
Eileen McNaughton [Thu, 3 Jul 2014 23:14:30 +0000 (11:14 +1200)]
resolve pass by ref
Chris Burgess [Mon, 1 Sep 2014 01:39:15 +0000 (13:39 +1200)]
Fix CRM-13113. Do not try to foreach() an empty array.
joannechester [Wed, 3 Sep 2014 03:41:20 +0000 (13:41 +1000)]
Update Date.php
joannechester [Wed, 3 Sep 2014 03:33:45 +0000 (13:33 +1000)]
Update Date.php
Eileen McNaughton [Sat, 22 Nov 2014 07:44:50 +0000 (20:44 +1300)]
Merge pull request #4595 from pradpnayak/CRM-10206-1
CRM-10206 View-only custom field can't be set by APIv3
Pradeep Nayak [Wed, 19 Nov 2014 16:19:35 +0000 (21:49 +0530)]
--CRM-10206, added api test
Pradeep Nayak [Tue, 18 Nov 2014 15:04:26 +0000 (20:34 +0530)]
--CRM-10206, reverted back some changes that caused regression when creating multi value custom field value using api
Pradeep Nayak [Fri, 21 Nov 2014 19:58:27 +0000 (01:28 +0530)]
--CRM-10206
sunil [Wed, 19 Nov 2014 10:42:26 +0000 (16:12 +0530)]
added contribution table in query from clause for contribution note
CiviCRM [Thu, 20 Nov 2014 01:16:48 +0000 (17:16 -0800)]
Update version to 4.4.11
Eileen McNaughton [Tue, 18 Nov 2014 20:09:04 +0000 (09:09 +1300)]
Merge pull request #4580 from eileenmcnaughton/4.4
test fixes
Eileen McNaughton [Tue, 18 Nov 2014 20:06:50 +0000 (09:06 +1300)]
test fixes
Eileen McNaughton [Tue, 18 Nov 2014 03:43:16 +0000 (16:43 +1300)]
Merge pull request #4571 from eileenmcnaughton/4.4
test fixes
Eileen McNaughton [Tue, 18 Nov 2014 03:42:56 +0000 (16:42 +1300)]
test fixes
Eileen McNaughton [Mon, 17 Nov 2014 00:34:56 +0000 (13:34 +1300)]
Merge pull request #4567 from eileenmcnaughton/4.4
test fix
Eileen McNaughton [Mon, 17 Nov 2014 00:33:57 +0000 (13:33 +1300)]
test fix
Eileen McNaughton [Fri, 14 Nov 2014 02:29:32 +0000 (15:29 +1300)]
Merge pull request #4555 from eileenmcnaughton/4.4
test fix
Eileen McNaughton [Fri, 14 Nov 2014 02:24:04 +0000 (15:24 +1300)]
test fix
Eileen McNaughton [Tue, 11 Nov 2014 19:57:14 +0000 (08:57 +1300)]
Merge pull request #4539 from eileenmcnaughton/CRM-14731
CRM-14731 warning fix
Eileen McNaughton [Thu, 22 May 2014 05:56:52 +0000 (17:56 +1200)]
CRM-14731 warning fix
Eileen McNaughton [Tue, 11 Nov 2014 10:06:12 +0000 (23:06 +1300)]
Merge pull request #4538 from eileenmcnaughton/enotice
E-notice fix to last commit
Eileen McNaughton [Tue, 11 Nov 2014 09:09:46 +0000 (22:09 +1300)]
Merge pull request #4537 from eileenmcnaughton/CRM-15581
CRM-15581 mailing group form defaults regression
Eileen McNaughton [Wed, 26 Feb 2014 03:27:55 +0000 (16:27 +1300)]
E-notice fix to last commit
Eileen McNaughton [Tue, 11 Nov 2014 07:52:35 +0000 (20:52 +1300)]
CRM-15581 mailing group form defaults regression
Eileen McNaughton [Tue, 11 Nov 2014 01:41:45 +0000 (14:41 +1300)]
Merge pull request #4529 from eileenmcnaughton/CRM-15332
Fix for CRM-15332 activity subject label for memberships
sunil [Mon, 22 Sep 2014 11:41:23 +0000 (17:11 +0530)]
Fix for CRM-15332
Eileen McNaughton [Mon, 10 Nov 2014 01:27:48 +0000 (14:27 +1300)]
Merge pull request #4527 from mlutfy/4.4-crm15882-lts
CRM-14670: include target contact counter for mass mailings + fix exclude activity type
Eileen McNaughton [Sun, 9 Nov 2014 20:53:14 +0000 (09:53 +1300)]
Merge pull request #4526 from mlutfy/4.4-crm14222-lts
CRM-14222 : PCP i18n fix, backport from 4.5.
Eileen McNaughton [Sun, 9 Nov 2014 20:50:56 +0000 (09:50 +1300)]
Merge pull request #4507 from eileenmcnaughton/4.4.10
4.4.10 branch
CiviCRM [Thu, 19 Jun 2014 14:17:43 +0000 (19:47 +0530)]
CRM-14670: include target contact counter for mass mailings
CiviCRM [Thu, 5 Jun 2014 06:34:26 +0000 (12:04 +0530)]
CRM-14222 PCP i18n fix, backport from 4.5.
CiviCRM [Wed, 5 Nov 2014 11:08:23 +0000 (03:08 -0800)]
Update version to 4.4.10
Eileen McNaughton [Tue, 25 Feb 2014 11:34:01 +0000 (00:34 +1300)]
CRM-14269 correctly set default role id when event id is passed, note that this also adds support for roles to be passed in the url - taking precedence"
Eileen McNaughton [Wed, 5 Nov 2014 01:10:51 +0000 (14:10 +1300)]
CRM-15203 test for membership payment record
Eileen McNaughton [Wed, 5 Nov 2014 01:10:36 +0000 (14:10 +1300)]
CRM-15203 fix for membership payment records not being created
Eileen McNaughton [Tue, 4 Nov 2014 02:04:02 +0000 (15:04 +1300)]
sync 4.4 testclass with master
Eileen McNaughton [Mon, 7 Jul 2014 12:02:49 +0000 (00:02 +1200)]
CRM-14951 test for numterms not applied
Eileen McNaughton [Mon, 3 Nov 2014 01:29:08 +0000 (14:29 +1300)]
CRM-14951 num terms not respected for first membership
Eileen McNaughton [Mon, 27 Oct 2014 02:58:23 +0000 (15:58 +1300)]
CRM-15527 fix crash on membership renewals due to ->id not being set
Eileen McNaughton [Mon, 7 Jul 2014 12:06:04 +0000 (00:06 +1200)]
CRM-14951 fix for number of terms on IPN
Eileen McNaughton [Fri, 28 Mar 2014 03:58:49 +0000 (16:58 +1300)]
CRM-14399 add alterCalculatedMembershipStatus hook
Conflicts:
api/v3/MembershipStatus.php
Conflicts:
api/v3/MembershipStatus.php
backport extra hook fn (protection against calls to it getting updated without the hook being there
fix to double up hook in rebase
Jamie McClelland [Tue, 28 Oct 2014 21:21:28 +0000 (17:21 -0400)]
CRM-15537 - translate open ended installments to 9999 for authorize.net
----------------------------------------
* CRM-15537: editing recurring contribution for authorize.net with unlimited contributions throws error
https://issues.civicrm.org/jira/browse/CRM-15537
Eileen McNaughton [Tue, 4 Nov 2014 13:03:29 +0000 (02:03 +1300)]
synchronise test classes with 4.6 so we aren't constantly re-solving test-related problems
Eileen McNaughton [Tue, 29 Jul 2014 13:26:25 +0000 (01:26 +1200)]
partial fix on membership type's stompiness on updates to test pr
Conflicts:
CRM/Member/BAO/MembershipType.php
Eileen McNaughton [Tue, 3 Jun 2014 11:58:01 +0000 (23:58 +1200)]
CRM-14778 store names as lower
Conflicts:
CRM/Price/BAO/PriceField.php
CRM/Price/BAO/PriceFieldValue.php
Eileen McNaughton [Tue, 3 Jun 2014 11:14:40 +0000 (23:14 +1200)]
CRM-14778 handle missing name field
Conflicts:
CRM/Price/BAO/PriceSet.php
Eileen McNaughton [Mon, 27 Oct 2014 02:38:11 +0000 (15:38 +1300)]
CRM-15527 tests indicate ['membership'] is likely to be an array at this stage
Eileen McNaughton [Mon, 3 Nov 2014 03:00:47 +0000 (16:00 +1300)]
Merge pull request #4488 from eileenmcnaughton/4.4
increment version to 4.4.9
Eileen McNaughton [Sun, 2 Nov 2014 23:26:39 +0000 (12:26 +1300)]
increment version to 4.4.9
Eileen McNaughton [Wed, 29 Oct 2014 19:43:28 +0000 (08:43 +1300)]
Merge pull request #4472 from agh1/crm-14152
CRM-14152 only join to civicrm_participant line items
Andrew Hunt [Wed, 29 Oct 2014 15:27:44 +0000 (11:27 -0400)]
CRM-14152 only join to civicrm_participant line items
Tim Otten [Tue, 28 Oct 2014 21:21:57 +0000 (14:21 -0700)]
Merge pull request #4422 from eileenmcnaughton/CRM-15251
CRM-15251 prevent indexing of some urls
Eileen McNaughton [Tue, 28 Oct 2014 20:21:57 +0000 (09:21 +1300)]
Merge pull request #4461 from eileenmcnaughton/CRM-12679
CRM-12679 Fix Paypal Express Recurring IPN not working ...
Eileen McNaughton [Tue, 28 Oct 2014 20:01:50 +0000 (09:01 +1300)]
Merge pull request #4460 from eileenmcnaughton/4.4
CRM-14800 fix - Contact merge deletes a contribution record if it is lin...
Jamie McClelland [Tue, 10 Jun 2014 18:36:40 +0000 (14:36 -0400)]
CRM-12679 - fixing paypal ipn test so it works with latest pp code.
----------------------------------------
* CRM-12679: Paypal Express Recurring IPN not working?
https://issues.civicrm.org/jira/browse/CRM-12679
Eileen McNaughton [Tue, 28 Oct 2014 19:37:54 +0000 (08:37 +1300)]
CRM-12679 use less granular date to reflect JonG's comments
Eileen McNaughton [Mon, 3 Mar 2014 20:55:17 +0000 (09:55 +1300)]
CRM-12679 Fix Paypal Express Recurring IPN not working ...
Record Paypal express ipn contributions from recurring
Remove duplicate handlePaymentExpress
fix Paypalexpress IPN for renamed PaymentProcessorType DAO
CiviCRM [Fri, 6 Jun 2014 13:44:12 +0000 (19:14 +0530)]
CRM-14800 fix - Contact merge deletes a contribution record if it is linked to a membership being merged
https://issues.civicrm.org/jira/browse/CRM-14800
Eileen McNaughton [Tue, 28 Oct 2014 03:33:03 +0000 (16:33 +1300)]
Merge pull request #4458 from eileenmcnaughton/CRM-15535
CRM-15535 fix static warning on CRM_Core_Payment_Form
Eileen McNaughton [Tue, 28 Oct 2014 02:25:11 +0000 (15:25 +1300)]
CRM-15535 fix static warning on CRM_Core_Payment_Form
Eileen McNaughton [Mon, 27 Oct 2014 01:06:44 +0000 (14:06 +1300)]
Merge pull request #4434 from eileenmcnaughton/CRM-14945
CRM-14945 Event confirmation email - message not saved to Activities
jitendrapurohit [Wed, 9 Jul 2014 06:04:37 +0000 (11:34 +0530)]
CRM Test Fix 4.5beta2
jitendrapurohit [Mon, 7 Jul 2014 11:14:34 +0000 (16:44 +0530)]
CRM-14945
Eileen McNaughton [Sun, 26 Oct 2014 23:35:53 +0000 (12:35 +1300)]
Merge pull request #4444 from eileenmcnaughton/CRM-14854
CRM-14854. Highlight the selected price, not everything in that row.
Chris Burgess [Fri, 13 Jun 2014 04:39:12 +0000 (16:39 +1200)]
CRM-14854. Highlight the selected price, not everything in that row.
Eileen McNaughton [Sat, 25 Oct 2014 22:10:29 +0000 (11:10 +1300)]
Merge pull request #4442 from eileenmcnaughton/CRM-11342
CRM-11342 - Fix for correct filtering of permissioned employees. …
Dave Greenberg [Sat, 4 Oct 2014 00:54:46 +0000 (17:54 -0700)]
CRM-11342 - Fix for correct filtering of permissioned employees.
----------------------------------------
* CRM-11342:
https://issues.civicrm.org/jira/browse/CRM-11342
Conflicts:
CRM/Core/BAO/ActionSchedule.php
Eileen McNaughton [Thu, 23 Oct 2014 20:50:26 +0000 (09:50 +1300)]
Merge pull request #4433 from eileenmcnaughton/CRM-14815
CRM-14815 subscriptionURL() doesn't add checksum when called from CLI
Ken West [Sat, 7 Jun 2014 14:36:13 +0000 (00:36 +1000)]
CRM-14815 subscriptionURL() doesn't add checksum when called from CLI
Conflicts:
CRM/Core/Payment.php
Eileen McNaughton [Wed, 22 Oct 2014 18:50:59 +0000 (07:50 +1300)]
Merge pull request #4420 from eileenmcnaughton/CRM-15510-44
CRM-15510 param retrieval issue
Eileen McNaughton [Tue, 21 Oct 2014 22:47:40 +0000 (11:47 +1300)]
CRM-15251 4.4 class variants
John Prescott [Thu, 2 Oct 2014 15:52:03 +0000 (16:52 +0100)]
CRM-15251 - Contact details revealed when certain URLs indexed by search engines
Added No Follow and No Index to:
Petition Confirmation pages
Mailing Optouts & Unsubscribe pages
Mailing Subscription Confirmation pages
Conflicts:
CRM/Mailing/Form/Optout.php
CRM/Mailing/Form/Unsubscribe.php
Eileen McNaughton [Tue, 21 Oct 2014 22:18:49 +0000 (11:18 +1300)]
Merge pull request #4418 from eileenmcnaughton/4.4
CRM-15487 prefix removed from display_name
Eileen McNaughton [Tue, 21 Oct 2014 22:01:45 +0000 (11:01 +1300)]
CRM-15510 param retrieval issue
sunil [Tue, 21 Oct 2014 15:16:19 +0000 (20:46 +0530)]
Fix for CRM-15487
Eileen McNaughton [Mon, 20 Oct 2014 20:42:58 +0000 (09:42 +1300)]
Merge pull request #4403 from eileenmcnaughton/4.4
CRM-14930 fix net_amount on authorize.net
Ken West [Sun, 19 Oct 2014 23:56:53 +0000 (10:56 +1100)]
CRM-15492 / 4.5 branch / Notice: Undefined index: include in CRM_Mailing_Form_Group->setDefaultValues()
Conflicts:
CRM/Mailing/Form/Group.php
Eileen McNaughton [Mon, 30 Jun 2014 22:55:55 +0000 (10:55 +1200)]
CRM-14930 fix net_amount on authorize.net
Eileen McNaughton [Mon, 20 Oct 2014 19:43:29 +0000 (08:43 +1300)]
Merge pull request #4404 from eileenmcnaughton/CRM-14433
CRM-14433 Fixed token insert on Preference Address Page
sunil [Thu, 16 Oct 2014 10:10:50 +0000 (15:40 +0530)]
Fixed token insert on Preference Address Page
Eileen McNaughton [Mon, 20 Oct 2014 07:26:42 +0000 (20:26 +1300)]
Merge pull request #4400 from eileenmcnaughton/4.4-completetransaction
4.4 completetransaction patches
Eileen McNaughton [Tue, 15 Jul 2014 22:40:22 +0000 (10:40 +1200)]
update completetransaction test to reflect the update to make it only complete incomplete transactions
Eileen McNaughton [Mon, 20 Oct 2014 03:58:06 +0000 (16:58 +1300)]
Merge pull request #4104 from eileenmcnaughton/CRM-15271
2 fatal error avoidance fixes, CRM-15271last viewed links without cid CRM-14730 over-long urls
Eileen McNaughton [Mon, 20 Oct 2014 03:52:33 +0000 (16:52 +1300)]
Merge pull request #4233 from eileenmcnaughton/CRM-15376
CRM-15376 test for inappropriate reminders going out:
Eileen McNaughton [Mon, 20 Oct 2014 02:37:59 +0000 (15:37 +1300)]
api contribution.completetransaction fix misname of _spec function
Tim Otten [Tue, 15 Jul 2014 00:27:44 +0000 (17:27 -0700)]
Fix hard crash of test-suite due to syntax error
Note: This is *only* a syntax fix. I don't what's supposed to be going on,
and there are other tests which fails... but at least they don't
crash the test-suite.
Original change was:
9e2ee07bf82624fe50070e14ccc6aa39ffa1b7d9
Eileen McNaughton [Mon, 7 Jul 2014 12:11:35 +0000 (00:11 +1200)]
CRM-14950 exit on completetransaction is already completed
Eileen McNaughton [Mon, 20 Oct 2014 02:21:06 +0000 (15:21 +1300)]
CRM-15496 api contribution.complete_transaction improve recurring handling
Tim Otten [Wed, 15 Oct 2014 23:30:47 +0000 (16:30 -0700)]
Merge pull request #4374 from totten/4.4-bump-to-8
Bump version to 4.4.8
Tim Otten [Wed, 15 Oct 2014 22:09:59 +0000 (15:09 -0700)]
Bump version to 4.4.8
Dave Greenberg [Fri, 10 Oct 2014 21:19:41 +0000 (14:19 -0700)]
Merge pull request #4295 from eileenmcnaughton/CRM-15408
CRM-15280 - Advanced Search not working for deleted Contacts
Kurund Jalmi [Fri, 10 Oct 2014 07:39:14 +0000 (13:09 +0530)]
Merge pull request #4117 from totten/4.4-system-get
api/v3/System - Add a "get" operation to return basic system info
atif-shaikh [Mon, 15 Sep 2014 08:54:10 +0000 (14:24 +0530)]
CRM-15280 - Advanced Search not working for deleted Contacts
https://issues.civicrm.org/jira/browse/CRM-15280
Tim Otten [Wed, 1 Oct 2014 16:55:24 +0000 (17:55 +0100)]
Merge pull request #4288 from totten/4.4-setupsh-port
setup.sh - Fix support mysqld on alternative ports