Отчет по статистике по транзакциям

src/config/autoload/feeds.global.php

@@ -41,14 +41,12 @@ return [
             ],
             'transaction' => [
                 'title' => 'Транзакции',
-                'type' => 'feed_stat',
+                'type' => 'feed_transactions',
                 'fields' => ['Views','Clicks','Orders','OrderSum'],
                 'cats' => [
-                    'Views' => 'Показы',
-                    'Clicks' => 'Клики',
-                    'Orders' => 'Заказы',
-                    'OrderSum' => 'Заказы на сумму',
-                    'AdMoney' => 'Комиссия AddCPM'
+                    'Timestamp' => 'Дата и время',
+                    'OrderSum' => 'Сумма',
+                    'BasketCount' => 'Количество товаров'
                 ]
                 /*
                 $cats => [

src/public/js/script-feeds-stat-table.js

@@ -12,10 +12,16 @@ $(document).ready(function(){
     {
         var
             currencyFields = ['admoney', 'salemoney', 'usdollarmoney', 'localmoney', 'AdMoney', 'OrderSum'],
+            nonFormatFields = ['Timestamp'],
             isCurrencyValue = currencyFields.indexOf(currentActiveLine) > -1,
+            isNonFormatValue = nonFormatFields.indexOf(currentActiveLine) > -1,
             //format = (isCurrencyValue) ? d3.format(',.2f') : d3.format(',.0f');
             format = (isCurrencyValue) ? d3.format(',.0f') : d3.format(',.0f');
     
+        if (isNonFormatValue) {
+            return value;
+        }
+    
         if (isCurrencyValue) {
             return format(value) + ' грн.';
         } else {
@@ -27,6 +33,9 @@ $(document).ready(function(){
     function RenderInterval(dataLineChartStat)
     {
         var dataPeriod = dataLineChartStat['period'];
+        
+        var notSumFields = ['Timestamp'];
+            
 
         dataTable = dataLineChartStat;
 
@@ -36,9 +45,15 @@ $(document).ready(function(){
         activeLines.forEach(function(item){
             currentActiveLine = item;
             
-            var totalValue = 0;
-            for(var i = dataPeriod.length-1; i >= 0; i--) {
-                totalValue += dataTable[item][i];
+            var isNotSumValue = notSumFields.indexOf(currentActiveLine) > -1;
+            
+            if (!isNotSumValue) {
+                var totalValue = 0;
+                for(var i = dataPeriod.length-1; i >= 0; i--) {
+                    totalValue += dataTable[item][i];
+                }
+            } else {
+                totalValue = '';
             }
 
             $row.append($('<td>').html(valueFormat(totalValue)));
@@ -129,7 +144,7 @@ $(document).ready(function(){
                 });
                
                 console.log('AAA TableStat render: ', dataLineChartStat);
-                //console.log('AAA activeLines: ', activeLines);
+                console.log('AAA activeLines: ', activeLines);
 
                 dataTable = {};
                 activeLines.forEach(function(item){
@@ -140,6 +155,10 @@ $(document).ready(function(){
                     RenderInterval(dataLineChartStat);
                 }
 
+                if (dataLineChartStat.report == 'transaction') {
+                    RenderInterval(dataLineChartStat);
+                }
+
                 $tableBody.html('').append($tableContent.children());
                 
             },