From bba3781ebfc6fb9f713b2c8c67bed3031d3d2d69 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Tue, 4 Mar 2014 11:48:28 +0100 Subject: [PATCH 1/3] [FIX] Wallet Balance Newmint Calc Fix --- public/templates/mpos/admin/wallet/default.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/mpos/admin/wallet/default.tpl b/public/templates/mpos/admin/wallet/default.tpl index 033336e89..479c0b2de 100644 --- a/public/templates/mpos/admin/wallet/default.tpl +++ b/public/templates/mpos/admin/wallet/default.tpl @@ -19,7 +19,7 @@ Liquid Assets - {($BALANCE - $LOCKED - $UNCONFIRMED + $NEWMINT|default:"0")|number_format:"8"} + {($BALANCE - $LOCKED - $UNCONFIRMED {if $NEWMINT >= 0}+ $NEWMINT|default:"0")}|number_format:"8"} {if $NEWMINT >= 0} From c2747a183bee6487b6e4b1981a5ae4ada0a4c89d Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Tue, 4 Mar 2014 11:51:36 +0100 Subject: [PATCH 2/3] [FIX] closing if --- public/templates/mpos/admin/wallet/default.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/mpos/admin/wallet/default.tpl b/public/templates/mpos/admin/wallet/default.tpl index 479c0b2de..21fe96ec8 100644 --- a/public/templates/mpos/admin/wallet/default.tpl +++ b/public/templates/mpos/admin/wallet/default.tpl @@ -19,7 +19,7 @@ Liquid Assets - {($BALANCE - $LOCKED - $UNCONFIRMED {if $NEWMINT >= 0}+ $NEWMINT|default:"0")}|number_format:"8"} + {($BALANCE - $LOCKED - $UNCONFIRMED {if $NEWMINT >= 0}+ $NEWMINT|default:"0"){/if}}|number_format:"8"} {if $NEWMINT >= 0} From 5cab31468901b8d535c611024460dfe5d2587237 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Tue, 4 Mar 2014 11:59:10 +0100 Subject: [PATCH 3/3] [FIX] changed template and calc --- public/templates/mpos/admin/wallet/default.tpl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/public/templates/mpos/admin/wallet/default.tpl b/public/templates/mpos/admin/wallet/default.tpl index 21fe96ec8..f536ee462 100644 --- a/public/templates/mpos/admin/wallet/default.tpl +++ b/public/templates/mpos/admin/wallet/default.tpl @@ -17,15 +17,20 @@ Unconfirmed {$UNCONFIRMED|number_format:"8"} +{if $NEWMINT >= 0} Liquid Assets - {($BALANCE - $LOCKED - $UNCONFIRMED {if $NEWMINT >= 0}+ $NEWMINT|default:"0"){/if}}|number_format:"8"} + {($BALANCE - $LOCKED - $UNCONFIRMED + $NEWMINT|default:"0")|number_format:"8"} -{if $NEWMINT >= 0} PoS New Mint {$NEWMINT|number_format:"8"} +{else} + + Liquid Assets + {($BALANCE - $LOCKED - $UNCONFIRMED)|number_format:"8"} + {/if}