[ready-for-core-team-review]CRM-16189, Code to add 'Record Payment' link on Contribution View and Contribution tab #8870

pradpnayak · 2016-08-11T07:33:17Z

CRM-16189: Improve support for Accrual Method bookkeeping

jitendrapurohit · 2016-08-12T12:50:59Z

While working on it for QA, just found a DB error on Edit Participant Form :(.

Steps to recreate-

Add Event Registration from a Contact Summary Page -> Save.
Click on Edit Link from the Events tab.

Database Error Code: Not unique table/alias: 'civicrm_participant_payment', 1066

JoeMurray · 2016-08-12T18:36:01Z

CRM/Contribute/Form/ContributionView.php

+      $values['id'], 'participant_id', 'contribution_id'
+    );
+    $this->assign('contactId', $values['contact_id']);
+    $this->assign('hasPayment', $values['id']);


A variable named hasPayment should use a boolean like isset($values['id']) rather than a numeric or NULL.

Just because a contribution is returned, I don't think that is equivalent to there being a payment already. Could you elaborate with a comment somewhere the reasons why this would be so?

pradpnayak · 2016-09-20T12:11:20Z

@monishdeb can you verify this PR?

monishdeb · 2016-09-20T12:37:21Z

sure

monishdeb · 2016-09-21T10:51:30Z

@pradpnayak there is unit test failure related to this PR

CRM_Contribute_BAO_ContributionTest::testIsPaymentFlag
Mismatch count for is payment flag.
Failed asserting that 1 matches expected 2.

/home/jenkins/buildkit/build/core-8870-7fl1d/sites/all/modules/civicrm/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php:502

pradpnayak · 2016-09-23T13:08:29Z

is test failure related to my PR?

monishdeb · 2016-09-23T13:20:19Z

Nope, CRM_Contribute_Form_ContributionTest::testSubmitCreditCardPayPal not a related test failure and there's already a fix for it #9041

jitendrapurohit · 2016-09-26T07:44:45Z

@pradpnayak I did a general click around testing which worked for almost all the cases for events, contribution, etc. except for some minor use-case which I've listed below:

The "Record Refund" link seems to be missing a required param id. Steps to replicate -

Register a participant to an Event selecting an amount of say ($1000) -> Save.
Edit Participation -> Perform Change Selection and select a lower amount for registration Eg - $800. (Contribution status gets changed to Pending Refund).
Navigate to Contribution Tab. Record Refund from more link hold a value of %%pid%% for id param. Clicking on it will lead to a fatal error. However, Record Refund button displayed on View Contribution Page has a correct link associated with it.

Completing a Payment from Contribution Record Payment link does not update Event registration status. Steps -

Register a participant to an Event selecting an amount of say ($1000).
Enter a lower amount(Eg. $800) in the Amount textbox under Payment Information section -> Save. (Participant status is saved as Partially Paid).
Navigate to Contribution Tab. Record Payment for the balance amount. (Contribution status gets changed to Completed.)
Participant status remains unaffected instead of updating itself to Registered. Balance amount is correctly updated to $0. Screenshot.

Record Refund for a new Offline Contribution doesn't update the contribution status.

Create a new Offline Contribution for a contact with status Pending Refund -> Save.
View Contribution -> Click Record Refund button. -> Save. Though a success message is displayed The payment record has been processed, but contribution status does not update itself.

Thanks.

yashodha · 2016-09-28T06:26:54Z

@pradpnayak : Let us know when done.

Edzelopez · 2016-12-15T13:54:49Z

Rebased PR

Edzelopez · 2016-12-16T12:25:58Z

Jenkins, retest this please

Edzelopez · 2016-12-16T12:39:32Z

@jitendrapurohit could you please test the scenario again? I've tested after the latest changes and it looks like it has been resolved.

Thanks!

jitendrapurohit · 2016-12-16T12:56:24Z

@Edzelopez # 1 seems to be fixed as it shows correct pid instead of %%pid%% :-) though I think # 2 and # 3 still need to be addressed ?

Edzelopez · 2016-12-16T13:13:50Z

@jitendrapurohit

Point. 2 looks fine to me

For point. 3 I don't think a scenario should arise to prompt one to create a Pending Refund contribution directly. Currently, core has only handled status change for Pending Refund contributions. @JoeMurray could you think of any case where one would need to create a Pending Refund contribution? If not, we should likely disallow the user to do so.

jitendrapurohit · 2016-12-19T07:22:57Z

Point 2 still fails to update participant status for me :(. Note that the contribution Record Payment link is the one which does not update the Participant status. It works fine on Record Payment link from Edit Participation Form.

I think both forms are meant for the same functionality but have a different display and params -

Edit Event Participation Form -> Record Payment
URL - civicrm/payment?action=add&reset=1&component=event&id=56&cid=202

Contribution Form -> Record Payment
URL - civicrm/payment?reset=1&id=100&cid=202&action=add&component=contribution

Should this be included/fixed in the PR?

Edzelopez · 2016-12-19T08:47:35Z

@jitendrapurohit Thanks for specifying the issue in detail. I can replicate it now. Will submit a fix soon.

EDIT: Fix submitted. @jitendrapurohit could you please let me know if the issue is resolved?

---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189

…r deferred payments ---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189 Conflicts: CRM/Core/BAO/FinancialTrxn.php

---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189

… pending pay later and partially paid contribution ---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189 Conflicts: CRM/Contribute/Form/AdditionalPayment.php

---------------------------------------- * CRM-16189: https://issues.civicrm.org/jira/browse/CRM-16189 Conflicts: CRM/Contribute/Form/AdditionalPayment.php

---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189

---------------------------------------- * CRM-16189: https://issues.civicrm.org/jira/browse/CRM-16189

---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189

Edzelopez · 2016-12-27T06:30:40Z

@jitendrapurohit any news on this?

jitendrapurohit

All noted issues seems to be fixed. Thanks :-)

pradpnayak · 2016-12-27T10:09:28Z

Thanks :)

civicrm-builder added the master label Aug 11, 2016

pradpnayak force-pushed the CRM-16189-10 branch from 451ce63 to 7952d5b Compare August 11, 2016 07:51

pradpnayak changed the title ~~CRM-16189, Code to add 'Record Payment' link on Contribution View and Contribution tab~~ [ready-for-core-team-review]CRM-16189, Code to add 'Record Payment' link on Contribution View and Contribution tab Aug 11, 2016

JoeMurray reviewed Aug 12, 2016
View reviewed changes

pradpnayak force-pushed the CRM-16189-10 branch from 7952d5b to fe8acfd Compare August 20, 2016 15:55

pradpnayak force-pushed the CRM-16189-10 branch from fe8acfd to 2d0d9bc Compare August 29, 2016 12:55

pradpnayak force-pushed the CRM-16189-10 branch from 2d0d9bc to 65bf969 Compare September 20, 2016 10:49

pradpnayak force-pushed the CRM-16189-10 branch from 829802b to c5e6ce6 Compare September 22, 2016 13:26

pradpnayak force-pushed the CRM-16189-10 branch from c5e6ce6 to f792bb7 Compare September 26, 2016 14:13

yashodha added the needs-work-not-review-ready Submitter required to take action, will be closed after 1-2 weeks in this state label Sep 28, 2016

Edzelopez force-pushed the CRM-16189-10 branch from f792bb7 to 4e8bd63 Compare December 15, 2016 13:40

pradpnayak and others added 15 commits December 19, 2016 14:58

CRM-16189, added link on contribution view form

f862cea

---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189

CRM-16189, Added add payment link on contribution search

c5c270e

---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189

CRM-16189, changed the label

0869cad

---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189

CRM-16189, changed code to return participant id in query

fedcd5e

---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189

CRM-16189, fee amount is not a payment

87647fe

---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189

CRM-16189, changed function defination

ae3a964

---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189

CRM-16189, fixed style and removed white space

a3a7037

---------------------------------------- * CRM-16189: https://issues.civicrm.org/jira/browse/CRM-16189 Conflicts: CRM/Contribute/Form/AdditionalPayment.php

CRM-16189, fixed url link

b979e6b

---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189

CRM-16189, used api

2848105

---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189

CRM-16189, fixed white spaces

deaf00c

---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189

CRM-16189, fixed jenkins test

4ba3c75

---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189

CRM-16189, fixed buutton link for record payment

8e50d64

---------------------------------------- * CRM-16189: https://issues.civicrm.org/jira/browse/CRM-16189

CRM-16189 Fixed participant payment bug

545ca07

---------------------------------------- * CRM-16189: Improve support for Accrual Method bookkeeping https://issues.civicrm.org/jira/browse/CRM-16189

Edzelopez force-pushed the CRM-16189-10 branch from 4e8bd63 to 545ca07 Compare December 19, 2016 09:30

jitendrapurohit approved these changes Dec 27, 2016

View reviewed changes

monishdeb removed the needs-work-not-review-ready Submitter required to take action, will be closed after 1-2 weeks in this state label Dec 27, 2016

monishdeb merged commit fab6656 into civicrm:master Dec 27, 2016

pradpnayak deleted the CRM-16189-10 branch February 22, 2017 11:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ready-for-core-team-review]CRM-16189, Code to add 'Record Payment' link on Contribution View and Contribution tab #8870

[ready-for-core-team-review]CRM-16189, Code to add 'Record Payment' link on Contribution View and Contribution tab #8870

pradpnayak commented Aug 11, 2016 •

edited by civicrm-builder

Loading

jitendrapurohit commented Aug 12, 2016 •

edited

Loading

JoeMurray Aug 12, 2016

pradpnayak commented Sep 20, 2016

monishdeb commented Sep 20, 2016

monishdeb commented Sep 21, 2016 •

edited

Loading

pradpnayak commented Sep 23, 2016

monishdeb commented Sep 23, 2016

jitendrapurohit commented Sep 26, 2016 •

edited

Loading

yashodha commented Sep 28, 2016

Edzelopez commented Dec 15, 2016

Edzelopez commented Dec 16, 2016

Edzelopez commented Dec 16, 2016

jitendrapurohit commented Dec 16, 2016

Edzelopez commented Dec 16, 2016 •

edited

Loading

jitendrapurohit commented Dec 19, 2016

Edzelopez commented Dec 19, 2016 •

edited

Loading

Edzelopez commented Dec 27, 2016

jitendrapurohit left a comment

pradpnayak commented Dec 27, 2016

[ready-for-core-team-review]CRM-16189, Code to add 'Record Payment' link on Contribution View and Contribution tab #8870

[ready-for-core-team-review]CRM-16189, Code to add 'Record Payment' link on Contribution View and Contribution tab #8870

Conversation

pradpnayak commented Aug 11, 2016 • edited by civicrm-builder Loading

jitendrapurohit commented Aug 12, 2016 • edited Loading

JoeMurray Aug 12, 2016

Choose a reason for hiding this comment

pradpnayak commented Sep 20, 2016

monishdeb commented Sep 20, 2016

monishdeb commented Sep 21, 2016 • edited Loading

pradpnayak commented Sep 23, 2016

monishdeb commented Sep 23, 2016

jitendrapurohit commented Sep 26, 2016 • edited Loading

yashodha commented Sep 28, 2016

Edzelopez commented Dec 15, 2016

Edzelopez commented Dec 16, 2016

Edzelopez commented Dec 16, 2016

jitendrapurohit commented Dec 16, 2016

Edzelopez commented Dec 16, 2016 • edited Loading

jitendrapurohit commented Dec 19, 2016

Edzelopez commented Dec 19, 2016 • edited Loading

Edzelopez commented Dec 27, 2016

jitendrapurohit left a comment

Choose a reason for hiding this comment

pradpnayak commented Dec 27, 2016

pradpnayak commented Aug 11, 2016 •

edited by civicrm-builder

Loading

jitendrapurohit commented Aug 12, 2016 •

edited

Loading

monishdeb commented Sep 21, 2016 •

edited

Loading

jitendrapurohit commented Sep 26, 2016 •

edited

Loading

Edzelopez commented Dec 16, 2016 •

edited

Loading

Edzelopez commented Dec 19, 2016 •

edited

Loading