RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #116 from maraoz/bug/fee-grammar

Browse Source 
feeds->fees
This commit is contained in:
Manuel Aráoz 2014-01-21 11:51:58 -08:00
commit e5d4327f94
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/Transaction.js
View File

@ -322,7 +322,7 @@ TransactionSchema.statics.queryInfo = function(txid, cb) {
if ( !tx.isCoinBase() ) { if ( !tx.isCoinBase() ) {
info.valueIn = valueIn / util.COIN; info.valueIn = valueIn / util.COIN;
info.feeds = (valueIn - valueOut) / util.COIN; info.fees = (valueIn - valueOut) / util.COIN;
} }
else { else {
var reward = BitcoreBlock.getBlockValue(info.height) / util.COIN; var reward = BitcoreBlock.getBlockValue(info.height) / util.COIN;

2
public/views/transaction.html
View File

@ -43,7 +43,7 @@
</tr> </tr>
<tr> <tr>
<td><strong>Fees</strong></td> <td><strong>Fees</strong></td>
<td class="text-muted text-right">{{tx.feeds}} BTC</td> <td class="text-muted text-right">{{tx.fees}} BTC</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

2
public/views/transaction/tx.html
View File

@ -92,7 +92,7 @@
</button> </button>
<button type="button" class="btn btn-primary">{{tx.valueOut}} BTC</button> <button type="button" class="btn btn-primary">{{tx.valueOut}} BTC</button>
</div> </div>
<small data-ng-show="!tx.isCoinBase" class="text-muted">Feeds: {{tx.feeds}}</small> <small data-ng-show="!tx.isCoinBase" class="text-muted">Fees: {{tx.fees}}</small>
</div> </div>
</div> </div>