diff --git a/src/Model/Table/StateUsersTable.php b/src/Model/Table/StateUsersTable.php index a28162d6a..387fa0697 100644 --- a/src/Model/Table/StateUsersTable.php +++ b/src/Model/Table/StateUsersTable.php @@ -61,10 +61,10 @@ class StateUsersTable extends Table $this->hasMany('TransactionSendCoins', [ 'foreignKey' => 'state_user_id' ]); - $this->hasMany('TransactionReceiveCoins', [ + /*$this->hasMany('TransactionReceiveCoins', [ 'className' => 'TransactionSendCoins', 'foreignKey' => 'receiver_user_id' - ]); + ]);*/ } /** diff --git a/src/Model/Table/TransactionSendCoinsTable.php b/src/Model/Table/TransactionSendCoinsTable.php index 2a0849cde..87ebb72f4 100644 --- a/src/Model/Table/TransactionSendCoinsTable.php +++ b/src/Model/Table/TransactionSendCoinsTable.php @@ -47,6 +47,7 @@ class TransactionSendCoinsTable extends Table 'joinType' => 'INNER' ]); $this->belongsTo('ReceiverUsers', [ + 'className' => 'StateUsers', 'foreignKey' => 'receiver_user_id', 'joinType' => 'INNER' ]); diff --git a/src/Model/Transactions/TransactionTransfer.php b/src/Model/Transactions/TransactionTransfer.php index 7c2b8eb74..cfb6f204e 100644 --- a/src/Model/Transactions/TransactionTransfer.php +++ b/src/Model/Transactions/TransactionTransfer.php @@ -176,11 +176,11 @@ class TransactionTransfer extends TransactionBase { return false; } - $finalSenderBalance = $this->updateStateBalance($senderUserId, -$senderAmount->amount()); + $finalSenderBalance = $this->updateStateBalance($senderUserId, -$senderAmount->getAmount()); if(false === $finalSenderBalance) { return false; } - if(false === $this->updateStateBalance($receiverUserId, $receiverAmount->amount())) { + if(false === $this->updateStateBalance($receiverUserId, $receiverAmount->getAmount())) { return false; } @@ -189,7 +189,7 @@ class TransactionTransfer extends TransactionBase { $transactionTransferEntity->state_user_id = $senderUserId; $transactionTransferEntity->receiver_public_key = $receiverAmount->getEd25519ReceiverPubkey(); $transactionTransferEntity->receiver_user_id = $receiverUserId; - $transactionTransferEntity->amount = $senderAmount->amount(); + $transactionTransferEntity->amount = $senderAmount->getAmount(); $transactionTransferEntity->sender_final_balance = $finalSenderBalance; if(!$transactionTransferTable->save($transactionTransferEntity)) {