From 1ffcba8b51b45c0148d7f9d0e703b8c78a4957f8 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Thu, 28 Nov 2013 11:52:15 +0100
Subject: [PATCH] [ADDED] RPC txid to Transaction lists

---
 public/include/classes/transaction.class.php   |  1 +
 .../mpos/account/transactions/default.tpl      | 18 ++++++++++--------
 .../mpos/admin/transactions/default.tpl        | 18 ++++++++++--------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/public/include/classes/transaction.class.php b/public/include/classes/transaction.class.php
index 4c29cc3f..71aeb95c 100644
--- a/public/include/classes/transaction.class.php
+++ b/public/include/classes/transaction.class.php
@@ -112,6 +112,7 @@ class Transaction extends Base {
         t.amount AS amount,
         t.coin_address AS coin_address,
         t.timestamp AS timestamp,
+        t.txid AS txid,
         b.height AS height,
         b.blockhash AS blockhash,
         b.confirmations AS confirmations
diff --git a/public/templates/mpos/account/transactions/default.tpl b/public/templates/mpos/account/transactions/default.tpl
index a761f825..2b936780 100644
--- a/public/templates/mpos/account/transactions/default.tpl
+++ b/public/templates/mpos/account/transactions/default.tpl
@@ -68,14 +68,15 @@
     <table cellspacing="0" class="tablesorter" width="100%">
       <thead>
         <tr>
-          <th align="center">TX #</th>
-          <th >Account</th>
-          <th >Date</th>
-          <th >TX Type</th>
+          <th align="center">ID</th>
+          <th>Account</th>
+          <th>Date</th>
+          <th>TX Type</th>
           <th align="center">Status</th>
-          <th >Payment Address</th>
-          <th >Block #</th>
-          <th >Amount</th>
+          <th>Payment Address</th>
+          <th>TX #</th>
+          <th>Block #</th>
+          <th>Amount</th>
         </tr>
       </thead>
       <tbody style="font-size:12px;">
@@ -97,7 +98,8 @@
             {else if $TRANSACTIONS[transaction].confirmations == -1}<span class="orphan">Orphaned</span>
             {else}<span class="unconfirmed">Unconfirmed</span>{/if}
           </td>
-          <td>{$TRANSACTIONS[transaction].coin_address}</td>
+          <td>{$TRANSACTIONS[transaction].coin_address|truncate:20:"...":true:true}</td>
+          <td>{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}</td>
           <td>{if $TRANSACTIONS[transaction].height == 0}n/a{else}<a href="{$smarty.server.PHP_SELF}?page=statistics&action=round&height={$TRANSACTIONS[transaction].height}">{$TRANSACTIONS[transaction].height}</a>{/if}</td>
           <td><font color="{if $TRANSACTIONS[transaction].type == 'Credit' or $TRANSACTIONS[transaction].type == 'Credit_PPS' or $TRANSACTIONS[transaction].type == 'Bonus'}green{else}red{/if}">{$TRANSACTIONS[transaction].amount|number_format:"8"}</td>
         </tr>
diff --git a/public/templates/mpos/admin/transactions/default.tpl b/public/templates/mpos/admin/transactions/default.tpl
index 9a88324f..364fa511 100644
--- a/public/templates/mpos/admin/transactions/default.tpl
+++ b/public/templates/mpos/admin/transactions/default.tpl
@@ -75,14 +75,15 @@
     <table cellspacing="0" class="tablesorter" width="100%">
       <thead>
         <tr>
-          <th align="center">TX #</th>
-          <th >Account</th>
-          <th >Date</th>
-          <th >TX Type</th>
+          <th align="center">ID</th>
+          <th>Account</th>
+          <th>Date</th>
+          <th>TX Type</th>
           <th align="center">Status</th>
-          <th >Payment Address</th>
-          <th >Block #</th>
-          <th >Amount</th>
+          <th>Payment Address</th>
+          <th>TX #</th>
+          <th>Block #</th>
+          <th>Amount</th>
         </tr>
       </thead>
       <tbody style="font-size:12px;">
@@ -104,7 +105,8 @@
             {else if $TRANSACTIONS[transaction].confirmations == -1}<span class="orphan">Orphaned</span>
             {else}<span class="unconfirmed">Unconfirmed</span>{/if}
           </td>
-          <td>{$TRANSACTIONS[transaction].coin_address}</td>
+          <td>{$TRANSACTIONS[transaction].coin_address|truncate:20:"...":true:true}</td>
+          <td>{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}</td>
           <td>{if $TRANSACTIONS[transaction].height == 0}n/a{else}<a href="{$smarty.server.PHP_SELF}?page=statistics&action=round&height={$TRANSACTIONS[transaction].height}">{/if}{$TRANSACTIONS[transaction].height}</a></td>
           <td><font color="{if $TRANSACTIONS[transaction].type == 'Credit' or $TRANSACTIONS[transaction].type == 'Credit_PPS' or $TRANSACTIONS[transaction].type == 'Bonus'}green{else}red{/if}">{$TRANSACTIONS[transaction].amount|number_format:"8"}</td>
         </tr>