mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
update state users view send coins in both directions
This commit is contained in:
Dario Rekowski on RockPI
parent
5b803c804d
commit
f67d720102
@ -443,7 +443,11 @@ class StateUsersController extends AppController
|
||||
public function view($id = null)
|
||||
{
|
||||
$stateUser = $this->StateUsers->get($id, [
|
||||
'contain' => ['StateBalances', 'TransactionCreations' => ['Transactions'], 'TransactionSendCoins' => ['Transactions']]
|
||||
'contain' => [
|
||||
'StateBalances',
|
||||
'TransactionCreations' => ['Transactions'],
|
||||
'TransactionSendCoins' => ['Transactions', 'ReceiverUsers'],
|
||||
'TransactionReceivedCoins' => ['Transactions', 'StateUsers']]
|
||||
]);
|
||||
|
||||
$this->set('stateUser', $stateUser);
|
||||
|
||||
@ -61,10 +61,10 @@ class StateUsersTable extends Table
|
||||
$this->hasMany('TransactionSendCoins', [
|
||||
'foreignKey' => 'state_user_id'
|
||||
]);
|
||||
/*$this->hasMany('TransactionReceiveCoins', [
|
||||
$this->hasMany('TransactionReceivedCoins', [
|
||||
'className' => 'TransactionSendCoins',
|
||||
'foreignKey' => 'receiver_user_id'
|
||||
]);*/
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* @var \App\Model\Entity\StateUser $stateUser
|
||||
*/
|
||||
?>
|
||||
<nav class="large-3 medium-4 columns" id="actions-sidebar">
|
||||
<nav class="large-2 medium-3 columns" id="actions-sidebar">
|
||||
<ul class="side-nav">
|
||||
<li class="heading"><?= __('Actions') ?></li>
|
||||
<li><?= $this->Html->link(__('Edit State User'), ['action' => 'edit', $stateUser->id]) ?> </li>
|
||||
@ -21,7 +21,7 @@
|
||||
<li><?= $this->Html->link(__('New Transaction Send Coin'), ['controller' => 'TransactionSendCoins', 'action' => 'add']) ?> </li>
|
||||
</ul>
|
||||
</nav>
|
||||
<div class="stateUsers view large-9 medium-8 columns content">
|
||||
<div class="stateUsers view large-10 medium-9 columns content">
|
||||
<h3><?= h($stateUser->first_name) ?> <?= h($stateUser->last_name) ?> <<?= h($stateUser->email) ?>></h3>
|
||||
<div class="related">
|
||||
<h4><?= __('Related State Balances') ?></h4>
|
||||
@ -77,31 +77,68 @@
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<div class="related">
|
||||
<h4><?= __('Related Transaction Send Coins') ?></h4>
|
||||
<h4><?= __('Versendete Überweisungen') ?></h4>
|
||||
<?php if (!empty($stateUser->transaction_send_coins)): ?>
|
||||
<table cellpadding="0" cellspacing="0">
|
||||
<tr>
|
||||
<th scope="col"><?= __('Transaction') ?></th>
|
||||
<th scope="col"><?= __('Receiver Public Key') ?></th>
|
||||
<th scope="col"><?= __('Receiver User Id') ?></th>
|
||||
<th scope="col"><?= __('Amount') ?></th>
|
||||
<th scope="col"><?= __('Sender Final Balance') ?></th>
|
||||
<th scope="col"><?= __('Überweisung') ?></th>
|
||||
<th scope="col"><?= __('Erhalten') ?></th>
|
||||
<th scope="col"><?= __('Empfänger ') ?></th>
|
||||
<th scope="col"><?= __('Betrag') ?></th>
|
||||
<th scope="col"><?= __('Verwendungszweck') ?></th>
|
||||
<th scope="col"><?= __('Betrag nach Senden') ?></th>
|
||||
<th scope="col" class="actions"><?= __('Actions') ?></th>
|
||||
</tr>
|
||||
<?php foreach ($stateUser->transaction_send_coins as $transactionSendCoins):
|
||||
$txHash = bin2hex(stream_get_contents($transactionSendCoins->transaction->tx_hash));
|
||||
<?php foreach ($stateUser->transaction_send_coins as $transactionReceiveCoins):
|
||||
$txHash = bin2hex(stream_get_contents($transactionReceiveCoins->transaction->tx_hash));
|
||||
$memo = $transactionReceiveCoins->transaction->memo;
|
||||
//var_dump($transactionSendCoins);
|
||||
?>
|
||||
<tr>
|
||||
<td><?= $this->Html->link(substr($txHash, 0, 12), ['controller' => 'Transactions', 'action' => 'view', $transactionSendCoins->transaction_id]) ?></td>
|
||||
<td><?= h($transactionSendCoins->state_user_id) ?></td>
|
||||
<td><?= h($transactionSendCoins->receiver_public_key) ?></td>
|
||||
<td><?= h($transactionSendCoins->receiver_user_id) ?></td>
|
||||
<td><?= $this->element('printGradido', ['number' =>$transactionSendCoins->amount]) ?></td>
|
||||
<td><?= h($transactionSendCoins->sender_final_balance) ?></td>
|
||||
<td title="<?= $txHash ?>"><?= $this->Html->link(substr($txHash, 0, 12) . '...', ['controller' => 'Transactions', 'action' => 'view', $transactionReceiveCoins->transaction_id]) ?></td>
|
||||
<td><?= h($transactionReceiveCoins->transaction->received) ?></td>
|
||||
<td><?= $this->Html->link($transactionReceiveCoins->receiver_user->getEmailWithName(), ['controller' => 'StateUsers', 'action' => 'view', $transactionReceiveCoins->receiver_user_id]) ?></td>
|
||||
<td><?= $this->element('printGradido', ['number' =>$transactionReceiveCoins->amount]) ?></td>
|
||||
<td title="<?= $memo ?>"><?= h(substr($memo, 0, 20). '...') ?></td>
|
||||
<td><?= $this->element('printGradido', ['number' => $transactionReceiveCoins->sender_final_balance]) ?></td>
|
||||
<td class="actions">
|
||||
<?= $this->Html->link(__('View'), ['controller' => 'TransactionSendCoins', 'action' => 'view', $transactionSendCoins->id]) ?>
|
||||
<?= $this->Html->link(__('Edit'), ['controller' => 'TransactionSendCoins', 'action' => 'edit', $transactionSendCoins->id]) ?>
|
||||
<?= $this->Form->postLink(__('Delete'), ['controller' => 'TransactionSendCoins', 'action' => 'delete', $transactionSendCoins->id], ['confirm' => __('Are you sure you want to delete # {0}?', $transactionSendCoins->id)]) ?>
|
||||
<?= $this->Html->link(__('View'), ['controller' => 'TransactionSendCoins', 'action' => 'view', $transactionReceiveCoins->id]) ?>
|
||||
<?= $this->Html->link(__('Edit'), ['controller' => 'TransactionSendCoins', 'action' => 'edit', $transactionReceiveCoins->id]) ?>
|
||||
<?= $this->Form->postLink(__('Delete'), ['controller' => 'TransactionSendCoins', 'action' => 'delete', $transactionReceiveCoins->id], ['confirm' => __('Are you sure you want to delete # {0}?', $transactionReceiveCoins->id)]) ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
</table>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<!-- TransactionReceivedCoins -->
|
||||
<div class="related">
|
||||
<h4><?= __('Empfangende Überweisungen') ?></h4>
|
||||
<?php if (!empty($stateUser->transaction_received_coins)): ?>
|
||||
<table cellpadding="0" cellspacing="0">
|
||||
<tr>
|
||||
<th scope="col"><?= __('Überweisung') ?></th>
|
||||
<th scope="col"><?= __('Erhalten') ?></th>
|
||||
<th scope="col"><?= __('Sender') ?></th>
|
||||
<th scope="col"><?= __('Betrag') ?></th>
|
||||
<th scope="col"><?= __('Verwendungszweck') ?></th>
|
||||
<th scope="col" class="actions"><?= __('Actions') ?></th>
|
||||
</tr>
|
||||
<?php foreach ($stateUser->transaction_received_coins as $transactionReceiveCoins):
|
||||
$txHash = bin2hex(stream_get_contents($transactionReceiveCoins->transaction->tx_hash));
|
||||
$memo = $transactionReceiveCoins->transaction->memo;
|
||||
//var_dump($transactionReceiveCoins);
|
||||
?>
|
||||
<tr>
|
||||
<td title="<?= $txHash ?>"><?= $this->Html->link(substr($txHash, 0, 12).'...', ['controller' => 'Transactions', 'action' => 'view', $transactionReceiveCoins->transaction_id]) ?></td>
|
||||
<td><?= h($transactionReceiveCoins->transaction->received) ?></td>
|
||||
<td><?= $this->Html->link($transactionReceiveCoins->state_user->getEmailWithName(), ['controller' => 'StateUsers', 'action' => 'view', $transactionReceiveCoins->state_user_id]) ?></td>
|
||||
<td><?= $this->element('printGradido', ['number' =>$transactionReceiveCoins->amount]) ?></td>
|
||||
<td title="<?= $memo ?>"><?= h(substr($memo, 0, 20). '...') ?></td>
|
||||
<td class="actions">
|
||||
<?= $this->Html->link(__('View'), ['controller' => 'TransactionSendCoins', 'action' => 'view', $transactionReceiveCoins->id]) ?>
|
||||
<?= $this->Html->link(__('Edit'), ['controller' => 'TransactionSendCoins', 'action' => 'edit', $transactionReceiveCoins->id]) ?>
|
||||
<?= $this->Form->postLink(__('Delete'), ['controller' => 'TransactionSendCoins', 'action' => 'delete', $transactionReceiveCoins->id], ['confirm' => __('Are you sure you want to delete # {0}?', $transactionReceiveCoins->id)]) ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach ($transactionSendCoins as $transactionSendCoin): ?>
|
||||
<?php foreach ($transactionReceiveCoins as $transactionSendCoin): ?>
|
||||
<tr>
|
||||
<td><?= $this->Number->format($transactionSendCoin->id) ?></td>
|
||||
<td><?= $transactionSendCoin->has('transaction') ? $this->Html->link($transactionSendCoin->transaction->id, ['controller' => 'Transactions', 'action' => 'view', $transactionSendCoin->transaction->id]) : '' ?></td>
|
||||
|
||||
@ -210,19 +210,19 @@
|
||||
<th scope="col"><?= __('Sender Final Balance') ?></th>
|
||||
<th scope="col" class="actions"><?= __('Actions') ?></th>
|
||||
</tr>
|
||||
<?php foreach ($transaction->transaction_send_coins as $transactionSendCoins): ?>
|
||||
<?php foreach ($transaction->transaction_send_coins as $transactionReceiveCoins): ?>
|
||||
<tr>
|
||||
<td><?= h($transactionSendCoins->id) ?></td>
|
||||
<td><?= h($transactionSendCoins->transaction_id) ?></td>
|
||||
<td><?= h($transactionSendCoins->state_user_id) ?></td>
|
||||
<td><?= h($transactionSendCoins->receiver_public_key) ?></td>
|
||||
<td><?= h($transactionSendCoins->receiver_user_id) ?></td>
|
||||
<td><?= h($transactionSendCoins->amount) ?></td>
|
||||
<td><?= h($transactionSendCoins->sender_final_balance) ?></td>
|
||||
<td><?= h($transactionReceiveCoins->id) ?></td>
|
||||
<td><?= h($transactionReceiveCoins->transaction_id) ?></td>
|
||||
<td><?= h($transactionReceiveCoins->state_user_id) ?></td>
|
||||
<td><?= h($transactionReceiveCoins->receiver_public_key) ?></td>
|
||||
<td><?= h($transactionReceiveCoins->receiver_user_id) ?></td>
|
||||
<td><?= h($transactionReceiveCoins->amount) ?></td>
|
||||
<td><?= h($transactionReceiveCoins->sender_final_balance) ?></td>
|
||||
<td class="actions">
|
||||
<?= $this->Html->link(__('View'), ['controller' => 'TransactionSendCoins', 'action' => 'view', $transactionSendCoins->id]) ?>
|
||||
<?= $this->Html->link(__('Edit'), ['controller' => 'TransactionSendCoins', 'action' => 'edit', $transactionSendCoins->id]) ?>
|
||||
<?= $this->Form->postLink(__('Delete'), ['controller' => 'TransactionSendCoins', 'action' => 'delete', $transactionSendCoins->id], ['confirm' => __('Are you sure you want to delete # {0}?', $transactionSendCoins->id)]) ?>
|
||||
<?= $this->Html->link(__('View'), ['controller' => 'TransactionSendCoins', 'action' => 'view', $transactionReceiveCoins->id]) ?>
|
||||
<?= $this->Html->link(__('Edit'), ['controller' => 'TransactionSendCoins', 'action' => 'edit', $transactionReceiveCoins->id]) ?>
|
||||
<?= $this->Form->postLink(__('Delete'), ['controller' => 'TransactionSendCoins', 'action' => 'delete', $transactionReceiveCoins->id], ['confirm' => __('Are you sure you want to delete # {0}?', $transactionReceiveCoins->id)]) ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user