dev/core#346 - Online Pay Now error when used from dashboard checksum link

diff --git a/CRM/Contact/Page/View/UserDashBoard.php b/CRM/Contact/Page/View/UserDashBoard.php
index 9ecf6863b6224d28033e09d466b9f4a388593fc2..d294e002737708bffd32d6490a4c67540cf72ac0 100644 (file)
--- a/CRM/Contact/Page/View/UserDashBoard.php
+++ b/CRM/Contact/Page/View/UserDashBoard.php
@@ -72,6 +72,7 @@ class CRM_Contact_Page_View_UserDashBoard extends CRM_Core_Page {
     $userChecksum = CRM_Utils_Request::retrieve('cs', 'String', $this);
     $validUser = FALSE;
     if (empty($userID) && $this->_contactId && $userChecksum) {
+      $this->assign('userChecksum', $userChecksum);
       $validUser = CRM_Contact_BAO_Contact_Utils::validChecksum($this->_contactId, $userChecksum);
     }
 

diff --git a/templates/CRM/Contribute/Page/UserDashboard.tpl b/templates/CRM/Contribute/Page/UserDashboard.tpl
index d4c7323cd385480d71951032656d7e02da64abc9..086db9f3bb856be3b33d0011688fa5cd17932d28 100644 (file)
--- a/templates/CRM/Contribute/Page/UserDashboard.tpl
+++ b/templates/CRM/Contribute/Page/UserDashboard.tpl
@@ -76,8 +76,12 @@
                         {/if}
                         {if $defaultInvoicePage && $row.contribution_status_name == 'Pending' }
                           <td>
+                            {assign var='checksum_url' value=""}
+                            {if $userChecksum}
+                              {assign var='checksum_url' value="&cid=$contactId&cs=$userChecksum"}
+                            {/if}
                             {assign var='id' value=$row.contribution_id}
-                            {capture assign=payNowLink}{crmURL p='civicrm/contribute/transact' q="reset=1&id=`$defaultInvoicePage`&ccid=`$id`"}{/capture}
+                            {capture assign=payNowLink}{crmURL p='civicrm/contribute/transact' q="reset=1&id=`$defaultInvoicePage`&ccid=`$id`$checksum_url"}{/capture}
                             <a class="button" href="{$payNowLink}"><span class='nowrap'>{ts}Pay Now{/ts}</span></a>
                           </td>
                         {/if}