[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add link directly to contribution

2017-10-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386638 )

Change subject: Add link directly to contribution
..


Add link directly to contribution

Bug: T178000Z
Change-Id: I90cc19697df31e647fc9750fb96e8573d3107ab5
---
M sites/all/modules/large_donation/large_donation.module
M sites/all/modules/large_donation/templates/html/notification.en.html
2 files changed, 14 insertions(+), 7 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/large_donation/large_donation.module 
b/sites/all/modules/large_donation/large_donation.module
index eeaa051..ca966f8 100644
--- a/sites/all/modules/large_donation/large_donation.module
+++ b/sites/all/modules/large_donation/large_donation.module
@@ -200,7 +200,7 @@
  * @param stdClass $notification
  */
 function large_donation_notification_send( $contribution, $notification ) {
-$contribution_link = CRM_Utils_System::url(
+$contact_link = CRM_Utils_System::url(
 'civicrm/contact/view',
 array(
 'selectedChild' => 'contribute',
@@ -211,11 +211,22 @@
 'Contributions'
 );
 
+$contribution_link = CRM_Utils_System::url(
+'civicrm/contact/view/contribution',
+array(
+'action' => 'view',
+'id' => $contribution->id,
+'reset' => 1,
+),
+true
+);
+
 $to = $notification->addressee;
 
 $params = array(
 'threshold' => floatval( $notification->threshold ),
 'contribution' => $contribution,
+'contact_link' => $contact_link,
 'contribution_link' => $contribution_link,
 );
 
diff --git 
a/sites/all/modules/large_donation/templates/html/notification.en.html 
b/sites/all/modules/large_donation/templates/html/notification.en.html
index 3edc28b..62012c2 100644
--- a/sites/all/modules/large_donation/templates/html/notification.en.html
+++ b/sites/all/modules/large_donation/templates/html/notification.en.html
@@ -2,16 +2,12 @@
 
 A large donation was made (over {{ threshold }} USD):
 
-contact_id: {{ contribution.contact_id }}
-
-contribution_id: {{ contribution.id }}
-
 converted amount: {{ contribution.total_amount }} USD
 
 original amount: {{ contribution.source }}
 
-Contact contribution in CiviCRM:
+View Contributions from Contact in 
CiviCRM
 
-{{ contribution_link|raw }}
+View Contribution in CiviCRM
 
 You may need to examine this donation.

-- 
To view, visit https://gerrit.wikimedia.org/r/386638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I90cc19697df31e647fc9750fb96e8573d3107ab5
Gerrit-PatchSet: 7
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Mepps 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add link directly to contribution Need to test

2017-10-26 Thread Mepps (Code Review) 
Mepps has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386638 )

Change subject: Add link directly to contribution Need to test
..

Add link directly to contribution
Need to test

Bug: T178000Z
Change-Id: I90cc19697df31e647fc9750fb96e8573d3107ab5
---
M sites/all/modules/large_donation/large_donation.module
M sites/all/modules/large_donation/templates/html/notification.en.html
2 files changed, 16 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/38/386638/1

diff --git a/sites/all/modules/large_donation/large_donation.module 
b/sites/all/modules/large_donation/large_donation.module
index eeaa051..559e85b 100644
--- a/sites/all/modules/large_donation/large_donation.module
+++ b/sites/all/modules/large_donation/large_donation.module
@@ -200,7 +200,7 @@
  * @param stdClass $notification
  */
 function large_donation_notification_send( $contribution, $notification ) {
-$contribution_link = CRM_Utils_System::url(
+$contact_link = CRM_Utils_System::url(
 'civicrm/contact/view',
 array(
 'selectedChild' => 'contribute',
@@ -211,11 +211,21 @@
 'Contributions'
 );
 
+$contribution_link = CRM_Utils_System::url(
+'civicrm/contact/view/contribution',
+array(
+'id' => $contribution->id,
+'reset' => 1,
+),
+true,
+);
+
 $to = $notification->addressee;
 
 $params = array(
 'threshold' => floatval( $notification->threshold ),
 'contribution' => $contribution,
+'contract_link' => $contact_link,
 'contribution_link' => $contribution_link,
 );
 
diff --git 
a/sites/all/modules/large_donation/templates/html/notification.en.html 
b/sites/all/modules/large_donation/templates/html/notification.en.html
index 3edc28b..5d39eaf 100644
--- a/sites/all/modules/large_donation/templates/html/notification.en.html
+++ b/sites/all/modules/large_donation/templates/html/notification.en.html
@@ -10,7 +10,11 @@
 
 original amount: {{ contribution.source }}
 
-Contact contribution in CiviCRM:
+View Contact in CiviCRM:
+
+{{ contact_link|raw }}
+
+View Contribution in CiviCRM:
 
 {{ contribution_link|raw }}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/386638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I90cc19697df31e647fc9750fb96e8573d3107ab5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Mepps 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits