From f7318d64fc4efd244e6df9474002de82f7bf3b77 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Fri, 21 Dec 2018 13:42:57 +0100
Subject: [PATCH] Improved block page queries

---
 src/Controller/MainController.php | 16 +++++++---------
 src/Template/Main/blocks.ctp      |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index aa52061..f8e812a 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -327,9 +327,7 @@ class MainController extends AppController {
             }
 
             // Get the basic block transaction info
-            $txs = $this->Transactions->find()->select(['id', 'input_count', 'output_count', 'hash', 'version'])->where(['block_hash_id' => $block->hash])->toArray();
-            
-
+            $txs = $this->Transactions->find()->select(['Transactions.id', 'Transactions.input_count', 'Transactions.output_count', 'Transactions.hash', 'Transactions.version'])->select(['value' => 'sum(O.value)'])->leftJoin(['O' => 'output'], ['O.transaction_id = Transactions.id'])->where(['Transactions.block_hash_id' => $block->hash])->toArray();
             $this->set('block', $block);
             $this->set('blockTxs', $txs);
         }
@@ -400,7 +398,7 @@ class MainController extends AppController {
         $this->loadModel('Addresses');
 
         // exclude bHW58d37s1hBjj3wPBkn5zpCX3F8ZW3uWf (genesis block)
-        $richList = $this->Addresses->find()->where(['Address <>' => 'bHW58d37s1hBjj3wPBkn5zpCX3F8ZW3uWf'])->order(['Balance' => 'DESC'])->limit(500)->toArray();
+        $richList = $this->Addresses->find()->where(['address <>' => 'bHW58d37s1hBjj3wPBkn5zpCX3F8ZW3uWf'])->order(['Balance' => 'DESC'])->limit(500)->toArray();
 
         $priceRate = 0;
         //$priceInfo = json_decode($this->redis->get(self::lbcPriceKey));
@@ -456,11 +454,11 @@ class MainController extends AppController {
 
         $tagRequestAmount = 0;
         // Check for pending tag request
-        $this->loadModel('TagAddressRequests');
-        $pending = $this->TagAddressRequests->find()->where(['Address' => $addr, 'IsVerified <>' => 1])->first();
-        if (!$pending) {
-            $tagRequestAmount = '25.' . rand(11111111, 99999999);
-        }
+        //$this->loadModel('TagAddressRequests');
+        //$pending = $this->TagAddressRequests->find()->where(['Address' => $addr, 'IsVerified <>' => 1])->first();
+        //if (!$pending) {
+        //    $tagRequestAmount = '25.' . rand(11111111, 99999999);
+        //}
 
         $address = $this->Addresses->find()->where(['address' => $addr])->first();
         if (!$address) {
diff --git a/src/Template/Main/blocks.ctp b/src/Template/Main/blocks.ctp
index 442b897..45429a0 100644
--- a/src/Template/Main/blocks.ctp
+++ b/src/Template/Main/blocks.ctp
@@ -112,7 +112,7 @@
                             <td class="w300"><div><a href="/tx/<?php echo $tx->hash ?>"><?php echo $tx->hash ?></a></div></td>
                             <td class="right"><?php echo $tx->input_count ?></td>
                             <td class="right"><?php echo $tx->output_count ?></td>
-                            <td class="right"><div title="<?php echo $tx->value() ?> LBC"><?php echo $this->Amount->formatCurrency($tx->value()) ?> LBC</div></td>
+                            <td class="right"><div title="<?php echo $tx->value ?> LBC"><?php echo $this->Amount->formatCurrency($tx->value()) ?> LBC</div></td>
                         </tr>
                         <?php endforeach; ?>
                     </tbody>