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
27d27cda
Commit
27d27cda
authored
May 30, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Правка в структуре для передачи feedId в шаблон
parent
83c7d45a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
12 deletions
+10
-12
script-feeds-stat-table.js
src/public/js/script-feeds-stat-table.js
+8
-10
Statistics.php
src/src/App/Model/Statistics.php
+2
-2
No files found.
src/public/js/script-feeds-stat-table.js
View file @
27d27cda
...
@@ -158,8 +158,8 @@ $(document).ready(function(){
...
@@ -158,8 +158,8 @@ $(document).ready(function(){
if
(
dataLineChartStat
.
report
==
'transactions'
)
{
if
(
dataLineChartStat
.
report
==
'transactions'
)
{
var
var
feedId
=
item
[
'
ViewID'
][
0
],
feedId
=
item
[
'
period'
][
1
],
orderId
=
item
[
'period'
],
orderId
=
item
[
'period'
]
[
0
]
,
ordersStatus
=
dataLineChartStat
.
ordersStatus
,
ordersStatus
=
dataLineChartStat
.
ordersStatus
,
orderStatus
=
(
ordersStatus
[
feedId
]
&&
ordersStatus
[
feedId
][
orderId
])
?
ordersStatus
[
feedId
][
orderId
]
:
null
,
orderStatus
=
(
ordersStatus
[
feedId
]
&&
ordersStatus
[
feedId
][
orderId
])
?
ordersStatus
[
feedId
][
orderId
]
:
null
,
trClass
;
trClass
;
...
@@ -181,22 +181,20 @@ $(document).ready(function(){
...
@@ -181,22 +181,20 @@ $(document).ready(function(){
$row
=
$
(
'<tr class="transaction-item '
+
trClass
+
'">'
);
$row
=
$
(
'<tr class="transaction-item '
+
trClass
+
'">'
);
$row
.
append
(
$
(
'<td class="status">'
).
append
(
templateOrderStatusContent
({
$row
.
append
(
$
(
'<td class="status">'
).
append
(
templateOrderStatusContent
({
data
:
{
data
:
{
feedId
:
item
[
'ViewID'
][
0
]
,
feedId
:
feedId
,
orderId
:
item
[
'period'
]
,
orderId
:
orderId
,
confirmed
:
(
orderStatus
&&
!
orderStatus
.
confirmed
)
?
''
:
'checked'
,
confirmed
:
(
orderStatus
&&
!
orderStatus
.
confirmed
)
?
''
:
'checked'
,
approved
:
(
orderStatus
&&
orderStatus
.
approved
)
?
'disabled'
:
''
,
approved
:
(
orderStatus
&&
orderStatus
.
approved
)
?
'disabled'
:
''
,
}
}
})));
})));
$row
.
append
(
$
(
'<td class="OrderID">'
).
append
(
templateOrderIDContent
({
$row
.
append
(
$
(
'<td class="OrderID">'
).
append
(
templateOrderIDContent
({
data
:
{
data
:
{
feedId
:
item
[
'ViewID'
][
0
],
feedId
:
feedId
,
orderId
:
item
[
'period'
],
orderId
:
orderId
,
//confirmed: (orderStatus && !orderStatus.confirmed) ? '' : 'checked',
//approved: (orderStatus && orderStatus.approved) ? 'disabled' : '',
}
}
})));
})));
$rowExcel
=
$
(
'<tr class="order-item '
+
trClass
+
'" data-feed-id="'
+
item
[
'ViewID'
][
0
]
+
'" data-order-id="'
+
item
[
'period'
]
+
'">'
);
$rowExcel
=
$
(
'<tr class="order-item '
+
trClass
+
'" data-feed-id="'
+
feedId
+
'" data-order-id="'
+
orderId
+
'">'
);
$rowExcel
.
append
(
$
(
'<td>'
).
html
(
item
[
'period'
]));
$rowExcel
.
append
(
$
(
'<td>'
).
html
(
item
[
'period'
]));
}
else
{
}
else
{
...
@@ -216,7 +214,7 @@ $(document).ready(function(){
...
@@ -216,7 +214,7 @@ $(document).ready(function(){
$rowExcel
.
append
(
$
(
'<td class="Timestamp">'
).
append
(
item
[
line
]));
$rowExcel
.
append
(
$
(
'<td class="Timestamp">'
).
append
(
item
[
line
]));
}
else
if
(
line
==
'ViewID'
)
{
}
else
if
(
line
==
'ViewID'
)
{
$row
.
append
(
$
(
'<td class="'
+
line
+
'">'
).
append
(
templateViewIDContent
({
$row
.
append
(
$
(
'<td class="'
+
line
+
'">'
).
append
(
templateViewIDContent
({
data
:
{
feedId
:
item
[
line
][
0
],
viewId
:
item
[
line
][
1
]}
data
:
{
feedId
:
item
[
'period'
][
1
],
viewId
:
item
[
'ViewID'
]}
})));
})));
}
else
{
}
else
{
currentActiveLine
=
line
;
currentActiveLine
=
line
;
...
...
src/src/App/Model/Statistics.php
View file @
27d27cda
...
@@ -258,8 +258,8 @@ class Statistics
...
@@ -258,8 +258,8 @@ class Statistics
// Данные для отчета 'transactions':
// Данные для отчета 'transactions':
if
(
$report_type
==
'transactions'
)
{
if
(
$report_type
==
'transactions'
)
{
foreach
(
$stats
[
'data'
]
as
$item
)
{
foreach
(
$stats
[
'data'
]
as
$item
)
{
$dataStats
[
'period'
][]
=
$item
[
'ForeignID'
];
$dataStats
[
'period'
][]
=
[
$item
[
'ForeignID'
],
$item
[
'FeedID'
]
];
$dataStats
[
'ViewID'
][]
=
[
$item
[
'FeedID'
],
$item
[
'ViewID'
]
];
$dataStats
[
'ViewID'
][]
=
$item
[
'ViewID'
];
$dataStats
[
'Timestamp'
][]
=
$item
[
'Timestamp'
];
$dataStats
[
'Timestamp'
][]
=
$item
[
'Timestamp'
];
$dataStats
[
'OrderSum'
][]
=
$item
[
'OrderSum'
];
$dataStats
[
'OrderSum'
][]
=
$item
[
'OrderSum'
];
$dataStats
[
'Basket'
][]
=
$item
[
'Basket'
];
$dataStats
[
'Basket'
][]
=
$item
[
'Basket'
];
...
...
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