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
3eeeb1b1
Commit
3eeeb1b1
authored
Jan 18, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Убрал ссылку на отчет "транзакции"
parent
933792fe
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
2 deletions
+8
-2
script-feeds-stat-charts.js
src/public/js/script-feeds-stat-charts.js
+1
-1
script-feeds-stat.js
src/public/js/script-feeds-stat.js
+2
-0
Cabinet.php
src/src/App/Action/User/Cabinet.php
+3
-1
cabinet-feed.phtml
src/templates/app/user/cabinet-feed.phtml
+2
-0
No files found.
src/public/js/script-feeds-stat-charts.js
View file @
3eeeb1b1
...
...
@@ -93,7 +93,7 @@ $(document).ready(function(){
$
.
extend
({
ChartStat
:
{
DateStat
:
function
(
dataLineChartStat
)
{
console
.
log
(
'AAA DateStat: '
,
dataLineChartStat
);
//
console.log('AAA DateStat: ', dataLineChartStat);
//activeLines = ['shows', 'clicks', 'transactions', 'salemoney', 'admoney'];
//activeLine = 'shows';
...
...
src/public/js/script-feeds-stat.js
View file @
3eeeb1b1
...
...
@@ -52,8 +52,10 @@ $(document).ready(function(){
// Установка стартовых значений дат:
if
(
$
(
'.b-feeds-stat_controls'
).
length
)
{
datepicker1
.
selectDate
(
new
Date
(
$dateFrom
.
val
()));
datepicker2
.
selectDate
(
new
Date
(
$dateTo
.
val
()));
}
isStartDatesSelected
=
true
;
...
...
src/src/App/Action/User/Cabinet.php
View file @
3eeeb1b1
...
...
@@ -143,8 +143,9 @@ class Cabinet extends Common
*/
break
;
/*
case 'transaction':
/
** @var \App\Model\Feeds $transactionsModel */
/
/ @var \App\Model\Feeds $transactionsModel
$transactionsModel = $this->container->get(Transactions::class);
$transactionStats = $transactionsModel->getStatsByTransactions($feed_id_list, $dates);
$cats = [
...
...
@@ -162,6 +163,7 @@ class Cabinet extends Common
$periodStats = $transactionStats;
break;
*/
default
:
$data
[
'error'
]
=
_t
(
'Извините, тип отчета "'
.
$report_type
.
'" недоступен'
);
break
;
...
...
src/templates/app/user/cabinet-feed.phtml
View file @
3eeeb1b1
...
...
@@ -106,6 +106,7 @@ $system_link = $this->url('adm.system.actions');
-->
<div
class=
"b-feeds-stat_controls form-group"
>
<?php
/* ?>
<div class="b-feeds-stat_controls-report">
<div class="dropdown" style="display:inline-block;">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
...
...
@@ -122,6 +123,7 @@ $system_link = $this->url('adm.system.actions');
</ul>
</div>
</div>
<?php */
?>
<span
class=
"b-feeds-stat_controls-period"
>
...
...
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