Вывод значения комиссии по заказы в отчете транзакций

src/config/autoload/feeds.global.php

@@ -30,8 +30,8 @@ return [
             'common' => [
                 'title' => 'Сводный отчет',
                 'type' => 'feed_stat',
-                //'fields' => ['Views','Clicks','Orders','OrderSum', 'AdMoney'],
-                'fields' => ['Views','Clicks','Orders','OrderSum'], // временно
+                'fields' => ['Views','Clicks','Orders','OrderSum', 'AdMoney'],
+                //'fields' => ['Views','Clicks','Orders','OrderSum'], // временно
                 'main_cat' => [
                     ['name' => 'date', 'title' => 'Дата', 'isSorted' => true],
                     //['name' => 'campaign','title' => 'Кампания','isSorted' => true]
@@ -47,7 +47,8 @@ return [
             'transactions' => [
                 'title' => 'Транзакции',
                 'type' => 'feed_transactions',
-                'fields' => ['Views','Clicks','Orders','OrderSum'],
+                'fields' => ['Views','Clicks','Orders','OrderSum', 'AdMoney'],
+                //'fields' => ['Views','Clicks','Orders','OrderSum'], // временно
                 'main_cat' => [
                     ['name' => 'order', 'title' => '#OrderID', 'isSorted' => false]
                 ],
@@ -56,6 +57,7 @@ return [
                     'Basket' => 'Состав корзины',
                     'ViewID' => 'ViewID',
                     'OrderSum' => 'Сумма',
+                    'AdMoney' => 'Комиссия'
                 ]
                 /*
                 $cats => [

src/public/css/styles-feeds-cats.css

@@ -53,7 +53,8 @@
         text-align: right;
         }
         
-        .table.feeds-cats tbody tr td.percent .edited
+        .table.feeds-cats tbody tr td.percent .edited,
+        .table.feeds-cats thead tr th.percent .edited
             {
             cursor: pointer;
             border-bottom: 1px dashed #697075;
@@ -74,23 +75,20 @@
             text-decoration: line-through;
             }
             
-            
-        .table.feeds-cats tbody tr td.percent .editing-wrap
+        .table.feeds-cats tbody tr td.percent .editing-wrap,
+        .table.feeds-cats thead tr th.percent .editing-wrap
             {
             display: none;
             }
         
-        .table.feeds-cats tbody tr td.percent input.percent-input
+        .table.feeds-cats tbody tr td.percent input.percent-input,
+        .table.feeds-cats thead tr th.percent input.percent-input
             {
             margin-top: -2px;
             width: 45px;
             text-align: right;
             }
         
-        .table.feeds-cats tbody tr td.percent
-            {
-            
-            }
         .table.feeds-cats tbody tr td.percent.own
             {
             font-family: 'RobotoCondensed-Bold', sans-serif;

src/public/css/styles-feeds-stat.css

@@ -295,6 +295,11 @@ input[type="checkbox"]
         text-align: right;
         }
         
+    .table.table-striped.admin.transactions td.AdMoney
+        {
+        text-align: right;
+        }
+        
     .table.table-striped.admin.transactions td.Pages
         {
         text-align: center;

src/public/js/feed-cats.js

@@ -193,7 +193,6 @@ $(document).ready(function () {
             var
                 textInput = $input.val(),
                 textField = textInput,
-                typeValue,
                 match, regex;
 
             // Убираем пробелы, разделитель точкой:
@@ -248,13 +247,11 @@ $(document).ready(function () {
                 $field.addClass('was-edited');
                 $oldValue.show();
             } else {
-                //$field.removeClass('was-edited');
                 if (valueType != oldType) {
                     $field.addClass('was-edited');
                 } else {
                     $field.removeClass('was-edited');
                 }
-                
                 $oldValue.hide();
             }
 
@@ -264,7 +261,6 @@ $(document).ready(function () {
 
         function SetChildInheritedValue(id, val)
         {
-            
             var
                 $childTrs = $('tbody tr[data-parent="' + id + '"]', $tableCats);
                         

src/src/App/Model/Statistics.php

@@ -99,7 +99,7 @@ class Statistics
                 foreach ($data as $cat=>$value) {
                     $data_stats[$cat][] = $value/$min_koef;
                 }
-                $data_stats['AdMoney'][] = 224 * $data['Orders']; // временно
+                //$data_stats['AdMoney'][] = 224 * $data['Orders']; // временно
             }
 
             // Формируем пустые данные для временного промежутка
@@ -108,7 +108,7 @@ class Statistics
                 foreach ($cats as $cat) {
                     $data_stats[$cat][] = 0;
                 }
-                $data_stats['AdMoney'][] = 0; // временно
+                //$data_stats['AdMoney'][] = 0; // временно
             }
 
             // Логика формирования данных по временному интервалу:
@@ -245,6 +245,7 @@ class Statistics
                 $dataStats['Timestamp'][] = $item['Timestamp'];
                 $dataStats['OrderSum'][] = $item['OrderSum'];
                 $dataStats['Basket'][] = $item['Basket'];
+                $dataStats['AdMoney'][] = $item['AdMoney'];
             }
         }
         

src/templates/app/user/cabinet-cats.phtml

@@ -90,7 +90,6 @@ if (!$error) {
                         <span class="cat-title" style="padding-left: <?= ($i-1)*40 ?>px;"><?= $symb ?><?= $cat['title'] ?> <span class="foreign-id" data-id="<?= $cat['foreignid'] ?>">[<?= $cat['foreignid'] ?>]</span></span>
                     </td>
                     <td class="percent <?= ($cat['own']) ? 'own': 'inherited' ?>" data-old-type="<?= ($cat['own']) ? 'own': 'inherited' ?>">
-                        
                         <span class="<?= $edited_class ?>" data-old-value="<?= $cat['percent'] ?>"><span class="percent-value"><?= $cat['percent'] ?></span>&nbsp;%</span>
                         <span class="editing-wrap"><input class="percent-input editing" value="<?= $cat['percent'] ?>">&nbsp;%</span>
                         <br /><span class="old-value"><?= $cat['percent'] ?>&nbsp;%</span>
@@ -132,6 +131,14 @@ if (!$error) {
                                     </span>
                             </th>
                             <th class="data"><span>Процент</span></th>
+                            <?php /*?>
+                            <th class="data percent">
+                                <span>Процент</span><br />
+                                <span class="<?= $edited_class ?>"><span class="percent-value"><?= $feeds_cat['percent'] ?></span>&nbsp;%</span>
+                                <span class="editing-wrap"><input class="percent-input editing" value="<?= $feeds_cat['percent'] ?>">&nbsp;%</span>
+                            </th>
+                            <?php */?>
+                            
                             <?php /*?>
                             <th class="data"><span>Показы</span></th>
                             <th class="data"><span>Клики</span></th>