Убрал тестовый вывод категорий фидов

parent 12a485dd
...@@ -31,7 +31,7 @@ return [ ...@@ -31,7 +31,7 @@ return [
'title' => 'Сводный отчет', 'title' => 'Сводный отчет',
'type' => 'feed_stat', 'type' => 'feed_stat',
//'fields' => ['Views','Clicks','Orders','OrderSum', 'AdMoney'], //'fields' => ['Views','Clicks','Orders','OrderSum', 'AdMoney'],
'fields' => ['Views','Clicks','Orders','OrderSum'], 'fields' => ['Views','Clicks','Orders','OrderSum'], // временно
'main_cat' => [ 'main_cat' => [
['name' => 'date', 'title' => 'Дата', 'isSorted' => true], ['name' => 'date', 'title' => 'Дата', 'isSorted' => true],
//['name' => 'campaign','title' => 'Кампания','isSorted' => true] //['name' => 'campaign','title' => 'Кампания','isSorted' => true]
......
...@@ -240,11 +240,11 @@ class Cabinet extends Common ...@@ -240,11 +240,11 @@ class Cabinet extends Common
// Определяем список категорий фида: // Определяем список категорий фида:
$cats_list = $categoriesModel->findAll(['FeedID' => $feed_id], 'Title ASC') -> toArray(); $cats_list = $categoriesModel->findAll(['FeedID' => $feed_id], 'Title ASC') -> toArray();
$feed_cats = []; $feed_cats = [];
foreach ($cats_list as $cat) { foreach ($cats_list as $cat) {
if ($cat['parentid'] == 0) { if ($cat['parentid'] == 0) {
$cat_percent = $cat['orderpercent']; $cat_percent = $cat['orderpercent'];
$is_own = 1; $is_own = 1;
if ($cat_percent < 0) { if ($cat_percent < 0) {
...@@ -262,7 +262,7 @@ class Cabinet extends Common ...@@ -262,7 +262,7 @@ class Cabinet extends Common
$feed_cats[] = $cat; $feed_cats[] = $cat;
} }
} }
$feeds_cats[] = array( $feeds_cats[] = array(
'id' => $feed_id, 'id' => $feed_id,
'title' => $feed_title, 'title' => $feed_title,
...@@ -287,6 +287,7 @@ class Cabinet extends Common ...@@ -287,6 +287,7 @@ class Cabinet extends Common
$data['reports_list'] = $reports_list; $data['reports_list'] = $reports_list;
$data['edit_enable'] = $shop_edit_enable; $data['edit_enable'] = $shop_edit_enable;
} else { } else {
$data['error'] = _t('Извините, у магазинов пользователя нет фидов '); $data['error'] = _t('Извините, у магазинов пользователя нет фидов ');
} }
......
...@@ -56,12 +56,6 @@ if (!$error) { ...@@ -56,12 +56,6 @@ if (!$error) {
<?php else: ?> <?php else: ?>
<div style="display: none;">
<?php print_r($feeds_cats)?>
</div>
<section class="b-content__work"> <section class="b-content__work">
<div class="wrapp" style="position: relative; margin-bottom: 10px;"> <div class="wrapp" style="position: relative; margin-bottom: 10px;">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment