From 417c68347b8e5fa767b6526278be5694c01bffb0 Mon Sep 17 00:00:00 2001 From: eileen Date: Sat, 19 Nov 2016 14:26:02 +1300 Subject: [PATCH] CRM-19594 extend test to ensure 2 line items created on separate membership --- CRM/Contribute/Form/Contribution/Confirm.php | 4 +++- tests/phpunit/api/v3/ContributionPageTest.php | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index 51080e1a08..60ed63b53d 100644 --- a/CRM/Contribute/Form/Contribution/Confirm.php +++ b/CRM/Contribute/Form/Contribution/Confirm.php @@ -1457,7 +1457,9 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr } } - $membershipParams['skipLineItem'] = 1; + if (!$isProcessSeparateMembershipTransaction) { + $membershipParams['skipLineItem'] = 1; + } $paymentResult = CRM_Contribute_BAO_Contribution_Utils::processConfirm($form, $membershipParams, $contactID, $financialTypeID, diff --git a/tests/phpunit/api/v3/ContributionPageTest.php b/tests/phpunit/api/v3/ContributionPageTest.php index 218016617f..2821ac7530 100644 --- a/tests/phpunit/api/v3/ContributionPageTest.php +++ b/tests/phpunit/api/v3/ContributionPageTest.php @@ -401,6 +401,7 @@ class api_v3_ContributionPageTest extends CiviUnitTestCase { $this->callAPIAndDocument('contribution_page', 'submit', $submitParams, __FUNCTION__, __FILE__, 'submit contribution page', NULL); $contributions = $this->callAPISuccess('contribution', 'get', array('contribution_page_id' => $this->_ids['contribution_page'])); $this->assertCount(2, $contributions['values']); + $this->callAPISuccessGetCount('LineItem', array(), 2); $membershipPayment = $this->callAPISuccess('membership_payment', 'getsingle', array()); $this->assertTrue(in_array($membershipPayment['contribution_id'], array_keys($contributions['values']))); $membership = $this->callAPISuccessGetSingle('membership', array('id' => $membershipPayment['membership_id'])); -- 2.25.1