Show eth transfers.

lexa-m · lexa-m · commit f70b9d2fbfd5 · 2018-07-09T17:40:57.000+07:00
diff --git a/js/ethplorer.js b/js/ethplorer.js
@@ -58,7 +58,7 @@ Ethplorer = {
                 }
             }
         }
-        Ethplorer.showTx = Ethplorer.Storage.get('showTx', null);
+        Ethplorer.showTx = Ethplorer.Storage.get('showTx', 'all');
         var showTxHash = window.location.hash.substr(1);
         if(showTxHash){
             aShowTxHash = showTxHash.split('=');
@@ -102,7 +102,7 @@ Ethplorer = {
             if(href.indexOf('&hash') == -1){
                 href += '&hash=' + md5($(this).attr("href") + hashDate);
             }
-            var showTx = Ethplorer.Storage.get('showTx', null);
+            var showTx = Ethplorer.Storage.get('showTx', 'all');
             if(showTx){
                 href += '&showTx=' + showTx;
             }
diff --git a/service/lib/ethplorer.php b/service/lib/ethplorer.php
@@ -110,7 +110,7 @@ class Ethplorer {
      *
      * @var string
      */
-    protected $showTx = self::SHOW_TX_TOKENS;
+    protected $showTx = self::SHOW_TX_ALL;
 
     /**
      * Cache for getTokens
@@ -1249,7 +1249,7 @@ public function getContract($address, $calculateTransactions = TRUE){
      * @param string $address  Contract address
      * @return int
      */
-    public function countOperations($address, $useFilter = TRUE, $showTx = self::SHOW_TX_TOKENS){        
+    public function countOperations($address, $useFilter = TRUE, $showTx = self::SHOW_TX_ALL){        
         evxProfiler::checkpoint('countOperations', 'START', 'address=' . $address . ', useFilter = ' . ($useFilter ? 'ON' : 'OFF'));
         $cache = 'countOperations-' . $address . '-' . $showTx;
         $result = $this->oCache->get($cache, false, true, 30);
@@ -1492,7 +1492,7 @@ public function getLastTransfers(array $options = array(), $showEth = FALSE){
      * @param int $limit       Maximum number of records
      * @return array
      */
-    public function getAddressOperations($address, $limit = 10, $offset = FALSE, array $aTypes = NULL, $showTx = self::SHOW_TX_TOKENS){
+    public function getAddressOperations($address, $limit = 10, $offset = FALSE, array $aTypes = NULL, $showTx = self::SHOW_TX_ALL){
         evxProfiler::checkpoint('getAddressOperations', 'START', 'address=' . $address . ', limit=' . $limit . ', offset=' . (is_array($offset) ? print_r($offset, TRUE) : (int)$offset));
 
         $result = array();

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ Ethplorer = {`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`}`
`61`		`- Ethplorer.showTx = Ethplorer.Storage.get('showTx', null);`
	`61`	`+ Ethplorer.showTx = Ethplorer.Storage.get('showTx', 'all');`
`62`	`62`	`var showTxHash = window.location.hash.substr(1);`
`63`	`63`	`if(showTxHash){`
`64`	`64`	`aShowTxHash = showTxHash.split('=');`
`@@ -102,7 +102,7 @@ Ethplorer = {`
`102`	`102`	`if(href.indexOf('&hash') == -1){`
`103`	`103`	`href += '&hash=' + md5($(this).attr("href") + hashDate);`
`104`	`104`	`}`
`105`		`- var showTx = Ethplorer.Storage.get('showTx', null);`
	`105`	`+ var showTx = Ethplorer.Storage.get('showTx', 'all');`
`106`	`106`	`if(showTx){`
`107`	`107`	`href += '&showTx=' + showTx;`
`108`	`108`	`}`