dev/core#890 - Multiple line item shown on view contribution if parti… #16956

jitendrapurohit · 2020-04-02T10:30:53Z

…cipant is transferred to another contact

Overview

Reopened #14104 with some changes to financial item entries as per #14104 (comment) (Solution 1 proposal).

Multiple line item shown on view contribution if participant is transferred to another contact

Before

To replicate -

Create a priceset for an event with Text / Numeric Quantity field type. Amount = $10.
Register contact A to the event using the above price option.
Transfer the event participation to another contact B.
View contribution on the main contact, it displays double line items for the participation.

I think the older participant status is set to "transferred" so it should remove the contribution link from the line item table?

After

Line item is displayed correctly.

Comments

Gitlab - https://lab.civicrm.org/dev/core/issues/890

civibot · 2020-04-02T10:30:55Z

(Standard links)

If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

eileenmcnaughton · 2020-04-02T23:09:08Z

@jitendrapurohit the test fail relates

jitendrapurohit · 2020-04-03T05:16:12Z

Have updated the PR with the test fix @eileenmcnaughton

This is the extraction portion of civicrm#16956 On testing that I hit an error but getting the extraction merged first should make it easierr to review future iterations as it will reduce noise in the code. Note I made the function non-static since it is still on the form & passed in event ID since we have it but it's otherwise pretty much the same as the extraction part of that PR

eileenmcnaughton · 2020-04-04T01:29:01Z

@jitendrapurohit I tested this with a different field type and got an error :-(

Since I worked through the code change I pulled out the extraction into a separate PR to get that merged & make it easier to work through this - #16976

jitendrapurohit · 2020-04-09T11:21:10Z

@eileenmcnaughton Have updated the PR and fixed the test. I tried to replicate the above db error but wasn't able to see any problems with different combinations of fields.

From the backtrace, it seems event id was not retrieved on your side. This PR also modifies its value so it should already be handled. Can you pls confirm if you still notice the above error?

Thanks.

eileenmcnaughton · 2020-04-10T02:19:31Z

CRM/Event/Form/SelfSvcTransfer.php

@@ -247,8 +247,6 @@ public static function checkProfileComplete($fields, &$errors, $self) {
    }
    if (!$email && !(CRM_Utils_Array::value('first_name', $fields) &&
      CRM_Utils_Array::value('last_name', $fields))) {
-      $defaults = $params = ['id' => $eventId];


Why is this removed?

Unnecessary lines. $eventId is an undeclared variable.

eileenmcnaughton · 2020-04-10T02:23:10Z

CRM/Event/Form/SelfSvcTransfer.php

   *
   * @throws \CRM_Core_Exception
   * @throws \CiviCRM_API3_Exception
   */
-  public function transferParticipantRegistration($toContactID, $fromParticipantID, $eventID) {
-    $query = 'select role_id, source, fee_level, is_test, is_pay_later, fee_amount, discount_id, fee_currency,campaign_id, discount_amount from civicrm_participant where id = ' . $fromParticipantID;
+  protected function transferParticipantRegistration($toContactID) {


So in terms of where we are going with this code - I'm hoping it would be moved to the BAO at some point as a move() function & called from the api. I mention this because this change makes the function more rather than less tied to the form it is on - which is the opposite direction

cool. I've updated the PR to keep the fromParticipantID param :)

eileenmcnaughton · 2020-04-10T02:25:10Z

CRM/Event/Form/SelfSvcTransfer.php

@@ -522,7 +518,7 @@ public function transferParticipantRegistration($toContactID, $fromParticipantID
      $value_to['fee_amount'] = $dao->fee_amount;
    }
    $value_to['contact_id'] = $toContactID;
-    $value_to['event_id'] = $eventID;
+    $value_to['event_id'] = $this->_event_id;


given the above query we should probably just get event_id in the query

done. Have updated with the api4 call and created the toParticipant with the retrieved params 👍

eileenmcnaughton · 2020-04-10T02:59:18Z

@jitendrapurohit OK - the fatal errors occur when there is no associated contribution

jaapjansma · 2020-04-20T09:19:59Z

test this please

jaapjansma · 2020-04-20T10:32:35Z

@jitendrapurohit can you have a look at the failing test?

jitendrapurohit · 2020-04-20T11:38:54Z

Hmm, it looks like the details page does not display any specific test which is failing.

From the console output https://test.civicrm.org/job/CiviCRM-Core-PR/33503/console, It seems the failure is resulted during the execution of EventTest::testTemplateFilterByDefault function?

not ok 1 - Error: EventTest::testTemplateFilterByDefault

API_Exception: Unknown api parameter: getHaving in /home/jenkins/bknix-dfl/build/core-16956-mxxj/web/sites/all/modules/civicrm/Civi/Api4/Generic/AbstractAction.php on line 215

I tried executing the same on my local and it displays a success message on completion.

jitendra$ phpunit5 tests/phpunit/api/v4/Action/EventTest.php           
Parsing schema description /Users/jitendra/src/civicrm/xml/schema/Schema.xml
Extracting database information
Extracting table information
PHPUnit 5.7.27 by Sebastian Bergmann and contributors.

.                                                                   1 / 1 (100%)

Time: 1.18 seconds, Memory: 28.00MB

OK (1 test, 1 assertion)

jitendrapurohit · 2020-04-20T11:39:03Z

retest this please

jaapjansma · 2020-05-25T07:51:13Z

@jitendrapurohit are you able to fix the conflicting files?

…cipant is transferred to another contact

jitendrapurohit · 2020-06-09T07:51:46Z

@jaapjansma Sorry for the delay. I've now updated the PR with the conflict fixes. Thanks.

jitendrapurohit · 2020-06-24T12:11:47Z

@jaapjansma can you pls remove the needs work label from this PR? This was updated with the conflict fixes and also passes the jenkin test process.

eileenmcnaughton · 2020-06-27T07:07:34Z

I re-tested this & it seems to work fine. Issues from previous comments have been addressed. Merging

civibot bot added the master label Apr 2, 2020

jitendrapurohit mentioned this pull request Apr 2, 2020

dev/core#890 - Multiple line item shown on view contribution if parti… #14104

Closed

jitendrapurohit force-pushed the core-890 branch from 0167cbf to b1e9ba4 Compare April 3, 2020 05:14

eileenmcnaughton mentioned this pull request Apr 4, 2020

[REF] Extract transferParticipantRegistration function #16976

Merged

jitendrapurohit force-pushed the core-890 branch 2 times, most recently from 75d6311 to 14ebbd7 Compare April 9, 2020 11:16

eileenmcnaughton reviewed Apr 10, 2020

View reviewed changes

jitendrapurohit force-pushed the core-890 branch from 14ebbd7 to 16834ac Compare April 13, 2020 07:33

jaapjansma added the needs-work-not-review-ready Submitter required to take action, will be closed after 1-2 weeks in this state label Jun 8, 2020

dev/core#890 - Multiple line item shown on view contribution if parti…

99afef6

…cipant is transferred to another contact

jitendrapurohit force-pushed the core-890 branch from 16834ac to 99afef6 Compare June 9, 2020 07:49

mattwire added ready for review and removed needs-work-not-review-ready Submitter required to take action, will be closed after 1-2 weeks in this state labels Jun 24, 2020

eileenmcnaughton merged commit aef4c7b into civicrm:master Jun 27, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dev/core#890 - Multiple line item shown on view contribution if parti… #16956

dev/core#890 - Multiple line item shown on view contribution if parti… #16956

jitendrapurohit commented Apr 2, 2020

civibot bot commented Apr 2, 2020

eileenmcnaughton commented Apr 2, 2020

jitendrapurohit commented Apr 3, 2020

eileenmcnaughton commented Apr 4, 2020

jitendrapurohit commented Apr 9, 2020

eileenmcnaughton Apr 10, 2020

jitendrapurohit Apr 13, 2020

eileenmcnaughton Apr 10, 2020

jitendrapurohit Apr 13, 2020

eileenmcnaughton Apr 10, 2020

jitendrapurohit Apr 13, 2020

eileenmcnaughton commented Apr 10, 2020

jaapjansma commented Apr 20, 2020

jaapjansma commented Apr 20, 2020

jitendrapurohit commented Apr 20, 2020

jitendrapurohit commented Apr 20, 2020

jaapjansma commented May 25, 2020

jitendrapurohit commented Jun 9, 2020

jitendrapurohit commented Jun 24, 2020

eileenmcnaughton commented Jun 27, 2020

dev/core#890 - Multiple line item shown on view contribution if parti… #16956

dev/core#890 - Multiple line item shown on view contribution if parti… #16956

Conversation

jitendrapurohit commented Apr 2, 2020

Overview

Before

After

Comments

civibot bot commented Apr 2, 2020

eileenmcnaughton commented Apr 2, 2020

jitendrapurohit commented Apr 3, 2020

eileenmcnaughton commented Apr 4, 2020

jitendrapurohit commented Apr 9, 2020

eileenmcnaughton Apr 10, 2020

Choose a reason for hiding this comment

jitendrapurohit Apr 13, 2020

Choose a reason for hiding this comment

eileenmcnaughton Apr 10, 2020

Choose a reason for hiding this comment

jitendrapurohit Apr 13, 2020

Choose a reason for hiding this comment

eileenmcnaughton Apr 10, 2020

Choose a reason for hiding this comment

jitendrapurohit Apr 13, 2020

Choose a reason for hiding this comment

eileenmcnaughton commented Apr 10, 2020

jaapjansma commented Apr 20, 2020

jaapjansma commented Apr 20, 2020

jitendrapurohit commented Apr 20, 2020

jitendrapurohit commented Apr 20, 2020

jaapjansma commented May 25, 2020

jitendrapurohit commented Jun 9, 2020

jitendrapurohit commented Jun 24, 2020

eileenmcnaughton commented Jun 27, 2020