From 9c2e6fa30b938c9405f267a9f77503c2275eb94a Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Tue, 31 Dec 2013 16:28:53 +0100 Subject: [PATCH 1/3] [FIX] Properly display pool fee in dashboard Fixes #1178 once merged. --- public/templates/mpos/dashboard/account_data.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/mpos/dashboard/account_data.tpl b/public/templates/mpos/dashboard/account_data.tpl index c03165c7..2c835d62 100644 --- a/public/templates/mpos/dashboard/account_data.tpl +++ b/public/templates/mpos/dashboard/account_data.tpl @@ -6,7 +6,7 @@ {if $GLOBAL.userdata.no_fees} You are mining without any pool fees applied and {else if $GLOBAL.fees > 0} - You are mining at {$GLOBAL.fees|escape}% pool fee and + You are mining at {$GLOBAL.fees|escape|number_format:"8"}% pool fee and {else} This pool does not apply fees and {/if} From e9c780f2ee328525db27ef1f457881d4c9c6cdba Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Tue, 31 Dec 2013 16:32:57 +0100 Subject: [PATCH 2/3] [FIX] Don not show decimals > 0.0001 fee --- public/templates/mpos/dashboard/account_data.tpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/templates/mpos/dashboard/account_data.tpl b/public/templates/mpos/dashboard/account_data.tpl index 2c835d62..6af78c57 100644 --- a/public/templates/mpos/dashboard/account_data.tpl +++ b/public/templates/mpos/dashboard/account_data.tpl @@ -5,8 +5,10 @@ {if $GLOBAL.userdata.no_fees} You are mining without any pool fees applied and -{else if $GLOBAL.fees > 0} +{else if $GLOBAL.fees > 0 && $GLOBAL.fees < 0.0001} You are mining at {$GLOBAL.fees|escape|number_format:"8"}% pool fee and +{else if $GLOBAL.fees > 0} + You are mining at {$GLOBAL.fees|escape}% pool fee and {else} This pool does not apply fees and {/if} From 2675a9573f02ad2513693bb218c32f44b0f1d905 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Tue, 31 Dec 2013 16:34:37 +0100 Subject: [PATCH 3/3] [FIX] Better version --- public/templates/mpos/dashboard/account_data.tpl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/public/templates/mpos/dashboard/account_data.tpl b/public/templates/mpos/dashboard/account_data.tpl index 6af78c57..52a93f0b 100644 --- a/public/templates/mpos/dashboard/account_data.tpl +++ b/public/templates/mpos/dashboard/account_data.tpl @@ -5,10 +5,8 @@ {if $GLOBAL.userdata.no_fees} You are mining without any pool fees applied and -{else if $GLOBAL.fees > 0 && $GLOBAL.fees < 0.0001} - You are mining at {$GLOBAL.fees|escape|number_format:"8"}% pool fee and {else if $GLOBAL.fees > 0} - You are mining at {$GLOBAL.fees|escape}% pool fee and + You are mining at {if $GLOBAL.fees < 0.0001}{$GLOBAL.fees|escape|number_format:"8"}{else}{$GLOBAL.fees|escape}{/if}% pool fee and {else} This pool does not apply fees and {/if}