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
0ab32e07
Commit
0ab32e07
authored
Feb 04, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Правка по коду для условий выбора отчетав шаблонах
parent
0e71a59a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
9 deletions
+14
-9
Statistics.php
src/src/App/Model/Statistics.php
+3
-1
cabinet-feed.phtml
src/templates/app/user/cabinet-feed.phtml
+11
-8
No files found.
src/src/App/Model/Statistics.php
View file @
0ab32e07
...
...
@@ -106,6 +106,7 @@ class Statistics
}
// Логика формирования данных по временному интервалу:
/*
if (false) {
if ($timeDiff == 0) // Одни сутки
{
...
...
@@ -187,7 +188,8 @@ class Statistics
}
}
}
*/
$dataStats
[
'type'
]
=
'interval'
;
// Спискок всех дат из запроса стастистики:
...
...
src/templates/app/user/cabinet-feed.phtml
View file @
0ab32e07
...
...
@@ -171,23 +171,26 @@ if (!$error) {
<?php
if
(
$current_report
==
'common'
)
:
?>
<b
class=
"main-cat date selected"
>
<?=
_t
(
'Дата'
)
?>
</b>
<?php
/* ?>/ <b class="main-cat campaign"><?= _t('Кампания')?></b><?php */
?>
<?php
else
:
?>
<?php
endif
;
?>
<?php
if
(
$current_report
==
'transaction'
)
:
?>
<b
class=
"main-cat date selected not-sorted"
>
<?=
_t
(
'#OrderID'
)
?>
</b>
<?php
endif
;
?>
</th>
<?php
foreach
(
$report_cats
as
$name
=>
$title
)
:
?>
<th
class=
"
<?=
$name
?>
"
data-id=
"
<?=
$name
?>
"
>
<?php
if
(
$name
==
'Basket'
)
:
?>
<b
class=
"cat not-sorted"
id=
"
<?=
$name
?>
"
>
<?=
_t
(
$title
)
?>
</b><br
/>
<b
class=
"basket-link not-sorted"
>
Товар
</b>
<b
class=
"quantity not-sorted"
>
Кол-во
</b>
<b
class=
"price not-sorted"
>
Цена
</b>
<?php
else
:
?>
<?php
if
(
$current_report
==
'common'
)
:
?>
<?php
if
(
$current_report
==
'common'
)
:
?>
<span
style=
"border-color:
<?=
$colors_active_lines
[
$name
]
?>
;"
>
<input
type=
"checkbox"
data-field=
"
<?=
$name
?>
"
checked
/>
</span>
<b
class=
"cat"
id=
"
<?=
$name
?>
"
>
<?=
_t
(
$title
)
?>
</b>
<?php
endif
;
?>
<?php
if
(
$current_report
==
'transaction'
)
:
?>
<?php
if
(
$name
==
'Basket'
)
:
?>
<b
class=
"cat not-sorted"
id=
"
<?=
$name
?>
"
>
<?=
_t
(
$title
)
?>
</b><br
/>
<b
class=
"basket-link not-sorted"
>
Товар
</b>
<b
class=
"quantity not-sorted"
>
Кол-во
</b>
<b
class=
"price not-sorted"
>
Цена
</b>
<?php
else
:
?>
<b
class=
"cat"
id=
"
<?=
$name
?>
"
>
<?=
_t
(
$title
)
?>
<b
class=
"arrow asc"
>
▲
</b><b
class=
"arrow desc"
>
▼
</b></b>
<?php
endif
;
?>
<b
class=
"cat"
id=
"
<?=
$name
?>
"
>
<?=
_t
(
$title
)
?><?php
if
(
$current_report
==
'transaction'
)
:
?>
<b
class=
"arrow asc"
>
▲
</b><b
class=
"arrow desc"
>
▼
</b>
<?php
endif
;
?>
</b>
<?php
endif
;
?>
</th>
<?php
endforeach
;
?>
...
...
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