Issue/1716 #1740

mehul0810 · 2017-05-26T06:01:58Z

Description

This PR is for #1716

How Has This Been Tested?

I've tested this on donation detail page as well as donation listing page with the below scenarios:

Donor name entered on donation form and donor name stored in WP_User are same

In this case it will display Mehul Gohil on Donation listing page

Donor name entered on donation form and donor name stored in WP_User are different

In this case it will display John Doe (Mehul Gohil) on Donation listing page where Mehul Gohil is linked with WP_User profile

Screenshots (jpeg or gifs if applicable):

Types of changes

Bug fix (non-breaking change which fixes an issue)

Checklist:

My code is tested.
My code follows the WordPress code style.
My code follows has proper inline documentation.

Release/1.8.9

…ting page as well

ravinderk · 2017-05-26T09:11:40Z

includes/admin/payments/class-payments-table.php

@@ -538,14 +538,28 @@ public function get_payment_id( $payment ) {
 	 */
 	public function get_donor( $payment ) {

-		$customer_id = give_get_payment_customer_id( $payment->ID );
+		$customer_id    = give_get_payment_customer_id( $payment->ID );


@mehul0810 instead of $customer_id, update it to $donor_id

@ravinderk changed naming terminology as per your suggestion

ravinderk · 2017-05-26T09:12:13Z

includes/admin/payments/class-payments-table.php

@@ -538,14 +538,28 @@ public function get_payment_id( $payment ) {
 	 */
 	public function get_donor( $payment ) {

-		$customer_id = give_get_payment_customer_id( $payment->ID );
+		$customer_id    = give_get_payment_customer_id( $payment->ID );
+        $donor_name     = give_get_donor_name_by( $payment->ID, 'donation');


@mehul0810 $donor_name should be $donor_billing_name

@ravinderk changed naming terminology as per your suggestion

ravinderk · 2017-05-26T09:12:32Z

includes/admin/payments/class-payments-table.php

-		$customer_id = give_get_payment_customer_id( $payment->ID );
+		$customer_id    = give_get_payment_customer_id( $payment->ID );
+        $donor_name     = give_get_donor_name_by( $payment->ID, 'donation');
+        $customer_name  = give_get_donor_name_by( $customer_id, 'donor');


@mehul0810 $customer_name should be $donor_name

@ravinderk changed naming terminology as per your suggestion

ravinderk · 2017-05-26T09:13:06Z

includes/user-functions.php

+ * Retrieves the donor name based on the id and the name of the user or donation
+ *
+ * @access      public
+ * @since       1.0


@mehul0810 @since must say 1.8.8

@ravinderk This is a minor issue which is missed. However, i'll make sure that this will be double checked by me next time submitting a PR.

ravinderk · 2017-05-26T09:13:31Z

includes/user-functions.php

+ * @param       int     $id     The ID of donation or donor
+ * @param       string  $from   From will be a string to be passed as donation or donor
+ *
+ * @return      array


@mehul0810 this function must return string

@ravinderk This is a minor issue which is missed. However, i'll make sure that this will be double checked by me next time submitting a PR.

ravinderk · 2017-05-26T09:15:55Z

includes/user-functions.php

+        case 'donation':
+
+            $user_info = give_get_payment_meta_user_info( $id );
+            $name = $user_info['first_name'] . ' ' . $user_info['last_name'];


@mehul0810 use trim function on $name because it is not necessary that donor will have last name, so we do not want to add space after name

@ravinderk Used trim while returning the $name string

@ravinderk This is a minor issue which need to be taken care of. However, while coding i'll make sure that the string can contain spaces and there are possibilities of using trim when the string is filled by an actual user.

ravinderk · 2017-05-26T09:16:23Z

includes/user-functions.php

+
+        case 'donor':
+
+            $customer = new Give_Customer( $id );


@mehul0810 start using donor term instead of customer

@ravinderk Sure. I'll make sure of that now.

ravinderk · 2017-05-26T09:16:40Z

includes/admin/payments/view-order-details.php

@@ -512,7 +512,17 @@
 										<div class="column">
 											<p>
 												<strong><?php esc_html_e( 'Donor Name:', 'give' ); ?></strong><br>
-												<?php echo $customer->name; ?>
+												<?php
+                                                $donor_name = give_get_donor_name_by( $payment_id, 'donation' );


@mehul0810 $donor_name should be $donor_billing_name

@ravinderk changed naming terminology as per your suggestion

ravinderk · 2017-05-26T09:16:56Z

includes/admin/payments/view-order-details.php

-												<?php echo $customer->name; ?>
+												<?php
+                                                $donor_name = give_get_donor_name_by( $payment_id, 'donation' );
+                                                $customer_name = give_get_donor_name_by( $customer_id, 'donor' );


@mehul0810 $customer_name should be $donor_name

@ravinderk changed naming terminology as per your suggestion

ravinderk · 2017-05-26T09:17:55Z

includes/admin/payments/view-order-details.php

+                                                $customer_name = give_get_donor_name_by( $customer_id, 'donor' );
+
+                                                // Check whether the donor name and WP_User name is same or not.
+                                                if( sanitize_title( $donor_name ) != sanitize_title( $customer_name ) ){


@mehul0810 output donor billing name + donor name

@ravinderk Updated code with outputing donor billing name + donor name on detail page as well and similar to listing page

mehul0810 added 4 commits May 26, 2017 08:50

Merge pull request #8 from WordImpress/release/1.8.9

e0daa59

Release/1.8.9

Corrected donor name on donation detail page

0d238c2

updated code as per discussion over call to correct donor name on lis…

a728de5

…ting page as well

Improved Code and added a new function for retrieving donor name

cf87921

ravinderk reviewed May 26, 2017

View reviewed changes

mehul0810 added 2 commits May 26, 2017 16:12

Corrected naming terminology as per comments

8673acb

Updated since to 1.8.9 as this issue is related to release 1.8.9

7ab094c

DevinWalker merged commit 6207441 into impress-org:release/1.8.9 May 26, 2017

mehul0810 deleted the issue/1716 branch December 8, 2017 10:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue/1716 #1740

Issue/1716 #1740

mehul0810 commented May 26, 2017

ravinderk May 26, 2017

mehul0810 May 26, 2017

ravinderk May 26, 2017

mehul0810 May 26, 2017

ravinderk May 26, 2017

mehul0810 May 26, 2017

ravinderk May 26, 2017

mehul0810 May 26, 2017

ravinderk May 26, 2017

mehul0810 May 26, 2017

ravinderk May 26, 2017

mehul0810 May 26, 2017

mehul0810 May 26, 2017

ravinderk May 26, 2017

mehul0810 May 26, 2017

ravinderk May 26, 2017

mehul0810 May 26, 2017

ravinderk May 26, 2017

mehul0810 May 26, 2017

ravinderk May 26, 2017

mehul0810 May 26, 2017

Issue/1716 #1740

Issue/1716 #1740

Conversation

mehul0810 commented May 26, 2017

Description

How Has This Been Tested?

Screenshots (jpeg or gifs if applicable):

Types of changes

Checklist:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment