Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
A
addcpm-json
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Александр Чаплыгин
addcpm-json
Commits
149ae217
Commit
149ae217
authored
Apr 11, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Убрал тестовый вывод категорий фидов
parent
12a485dd
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
feeds.global.php
src/config/autoload/feeds.global.php
+1
-1
Cabinet.php
src/src/App/Action/User/Cabinet.php
+2
-1
cabinet-cats.phtml
src/templates/app/user/cabinet-cats.phtml
+0
-6
No files found.
src/config/autoload/feeds.global.php
View file @
149ae217
...
...
@@ -31,7 +31,7 @@ return [
'title'
=>
'Сводный отчет'
,
'type'
=>
'feed_stat'
,
//'fields' => ['Views','Clicks','Orders','OrderSum', 'AdMoney'],
'fields'
=>
[
'Views'
,
'Clicks'
,
'Orders'
,
'OrderSum'
],
'fields'
=>
[
'Views'
,
'Clicks'
,
'Orders'
,
'OrderSum'
],
// временно
'main_cat'
=>
[
[
'name'
=>
'date'
,
'title'
=>
'Дата'
,
'isSorted'
=>
true
],
//['name' => 'campaign','title' => 'Кампания','isSorted' => true]
...
...
src/src/App/Action/User/Cabinet.php
View file @
149ae217
...
...
@@ -243,8 +243,8 @@ class Cabinet extends Common
$feed_cats
=
[];
foreach
(
$cats_list
as
$cat
)
{
if
(
$cat
[
'parentid'
]
==
0
)
{
if
(
$cat
[
'parentid'
]
==
0
)
{
$cat_percent
=
$cat
[
'orderpercent'
];
$is_own
=
1
;
if
(
$cat_percent
<
0
)
{
...
...
@@ -287,6 +287,7 @@ class Cabinet extends Common
$data
[
'reports_list'
]
=
$reports_list
;
$data
[
'edit_enable'
]
=
$shop_edit_enable
;
}
else
{
$data
[
'error'
]
=
_t
(
'Извините, у магазинов пользователя нет фидов '
);
}
...
...
src/templates/app/user/cabinet-cats.phtml
View file @
149ae217
...
...
@@ -56,12 +56,6 @@ if (!$error) {
<?php
else
:
?>
<div
style=
"display: none;"
>
<?php
print_r
(
$feeds_cats
)
?>
</div>
<section
class=
"b-content__work"
>
<div
class=
"wrapp"
style=
"position: relative; margin-bottom: 10px;"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment