From b88a7dd029886a54316bddc74bcf5c96ed7f10b8 Mon Sep 17 00:00:00 2001
From: einhornimmond <dario.rekowski@gmx.de>
Date: Mon, 3 May 2021 11:51:27 +0200
Subject: [PATCH] give balance as float value in GDD (not lpnger GDD cent)

---
 community_server/src/Controller/AppRequestsController.php | 2 +-
 community_server/src/Model/Entity/StateBalance.php        | 8 +++++++-
 community_server/src/Model/Table/TransactionsTable.php    | 8 ++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/community_server/src/Controller/AppRequestsController.php b/community_server/src/Controller/AppRequestsController.php
index dfc11d4a2..bc9512abc 100644
--- a/community_server/src/Controller/AppRequestsController.php
+++ b/community_server/src/Controller/AppRequestsController.php
@@ -286,7 +286,7 @@ class AppRequestsController extends AppController
         $now = new FrozenTime();
         return $this->returnJson([
             'state' => 'success',
-            'balance' => $state_balance->amount,
+            'balance' => $state_balance->amount_float,
             'decay' => $state_balance->partDecay($now),
             'decay_date' => $now
         ]);
diff --git a/community_server/src/Model/Entity/StateBalance.php b/community_server/src/Model/Entity/StateBalance.php
index 0860d15b7..a4407613d 100644
--- a/community_server/src/Model/Entity/StateBalance.php
+++ b/community_server/src/Model/Entity/StateBalance.php
@@ -34,7 +34,7 @@ class StateBalance extends Entity
         'state_user' => true
     ];
     
-    protected $_virtual = ['decay'];
+    protected $_virtual = ['decay','amount_float'];
     
     private function convertToTimestamp($dateOrTime)
     {
@@ -67,6 +67,12 @@ class StateBalance extends Entity
       return intval($this->amount * pow(0.99999997802044727, $decay_duration));
         
     }
+    
+    protected function _getAmountFloat()
+    {
+        return floatval($this->amount) / 10000.0;
+    }
+            
     public function partDecay($target_date)
     {
         $decay_duration = intval($this->convertToTimestamp($target_date) - $this->convertToTimestamp($this->record_date));
diff --git a/community_server/src/Model/Table/TransactionsTable.php b/community_server/src/Model/Table/TransactionsTable.php
index 00f00b904..933c52b1c 100644
--- a/community_server/src/Model/Table/TransactionsTable.php
+++ b/community_server/src/Model/Table/TransactionsTable.php
@@ -188,7 +188,7 @@ class TransactionsTable extends Table
                     //echo "prev balance: " . $prev->balance . ", diff_amount: $diff_amount, summe: " . (-intval($prev->balance - $diff_amount)) . "<br>";
                     $final_transactions[] = [ 
                         'type' => 'decay',
-                        'balance' => -intval($prev->balance - $diff_amount),
+                        'balance' => floatval(-intval($prev->balance - $diff_amount)) / 10000.0,
                         'decay_duration' => $interval->format('%a days, %H hours, %I minutes, %S seconds'),
                         'memo' => ''
                     ];
@@ -212,7 +212,7 @@ class TransactionsTable extends Table
                   'type' => 'creation',
                   'transaction_id' => $transaction->id,
                   'date' => $creation->target_date,
-                  'balance' => $creation->amount,
+                  'balance' => $creation->amount_float,
                   'memo' => $transaction->memo
                 ];
             } else if($su_transaction->transaction_type_id == 2) { // transfer or send coins
@@ -245,7 +245,7 @@ class TransactionsTable extends Table
                  'type' => $type,
                  'transaction_id' => $sendCoins->transaction_id,
                  'date' => $transaction->received,
-                 'balance' => $sendCoins->amount,
+                 'balance' => $sendCoins->amount_float,
                  'memo' => $transaction->memo,
                  'pubkey' => $other_user_public
                 ];
@@ -256,7 +256,7 @@ class TransactionsTable extends Table
                 $state_balance->record_date = $su_transaction->balance_date;
                 $final_transactions[] = [
                     'type' => 'decay',
-                    'balance' => -intval($su_transaction->balance - $state_balance->decay),
+                    'balance' => floatval(-intval($su_transaction->balance - $state_balance->decay)) / 10000,
                     'decay_duration' => $su_transaction->balance_date->timeAgoInWords(),
                     'memo' => ''
                 ];