total profit decimal place

binary-com · ashkanx · Jul 16, 2019 · Jun 28, 2019 · Jun 28, 2019 · Jun 28, 2019
commit ce39c3e3a22b35badef21c6e4caa39c6a60c3366
diff --git a/src/botPage/bot/Interface/MiscInterface.js b/src/botPage/bot/Interface/MiscInterface.js
@@ -29,7 +29,8 @@ export default Interface =>
                 notifyTelegram: this.notifyTelegram,
                 getTotalRuns  : () => this.tradeEngine.getTotalRuns(),
                 getBalance    : type => this.tradeEngine.getBalance(type),
-                getTotalProfit: () => this.tradeEngine.getTotalProfit(),
+                getTotalProfit: (...args) =>
+                    this.tradeEngine.getTotalProfit(...args, this.tradeEngine.tradeOptions.currency),
             };
         }
     };
diff --git a/src/botPage/bot/TradeEngine/Total.js b/src/botPage/bot/TradeEngine/Total.js
@@ -86,9 +86,14 @@ export default Engine =>
             const accountStat = this.getAccountStat();
             return accountStat.totalRuns;
         }
-        getTotalProfit() {
+        getTotalProfit(toString = false, currency) {
             const accountStat = this.getAccountStat();
-            return Number(accountStat.totalProfit);
+            return toString
+                ? roundBalance({
+                    currency,
+                    balance: +accountStat.totalProfit,
+                })
+                : +accountStat.totalProfit;
         }
         /* eslint-enable */
         checkLimits(tradeOption) {

diff --git a/src/botPage/view/blockly/blocks/tools/total_profit.js b/src/botPage/view/blockly/blocks/tools/total_profit.js
@@ -10,4 +10,15 @@ Blockly.Blocks.total_profit = {
         this.setHelpUrl('https://github.com/binary-com/binary-bot/wiki');
     },
 };
-Blockly.JavaScript.total_profit = () => ['Bot.getTotalProfit()', Blockly.JavaScript.ORDER_ATOMIC];
+Blockly.JavaScript.total_profit = () => ['Bot.getTotalProfit(false)', Blockly.JavaScript.ORDER_ATOMIC];
+
+Blockly.Blocks.total_profit_string = {
+    init: function init() {
+        this.appendDummyInput().appendField(translate('Total Profit String'));
+        this.setOutput(true, 'String');
+        this.setColour('#dedede');
+        this.setTooltip(translate('Return the total profit (String)'));
+        this.setHelpUrl('https://github.com/binary-com/binary-bot/wiki');
+    },
+};
+Blockly.JavaScript.total_profit_string = () => ['Bot.getTotalProfit(true)', Blockly.JavaScript.ORDER_ATOMIC];
diff --git a/static/xml/toolbox.xml b/static/xml/toolbox.xml
@@ -424,6 +424,7 @@
             <category name="Misc." i18n-text="Misc.">
                 <block type="balance"></block>
                 <block type="total_profit"></block>
+                <block type="total_profit_string"></block>
                 <block type="total_runs"></block>
                 <block type="notify">
                     <field name="NOTIFICATION_TYPE">success</field>