Правка в структуре для передачи feedId в шаблон

parent 83c7d45a
......@@ -158,8 +158,8 @@ $(document).ready(function(){
if (dataLineChartStat.report == 'transactions') {
var
feedId = item['ViewID'][0],
orderId = item['period'],
feedId = item['period'][1],
orderId = item['period'][0],
ordersStatus = dataLineChartStat.ordersStatus,
orderStatus = (ordersStatus[feedId] && ordersStatus[feedId][orderId]) ? ordersStatus[feedId][orderId] : null,
trClass;
......@@ -181,22 +181,20 @@ $(document).ready(function(){
$row = $('<tr class="transaction-item ' + trClass + '">');
$row.append($('<td class="status">').append(templateOrderStatusContent({
data: {
feedId: item['ViewID'][0],
orderId: item['period'],
feedId: feedId,
orderId: orderId,
confirmed: (orderStatus && !orderStatus.confirmed) ? '' : 'checked',
approved: (orderStatus && orderStatus.approved) ? 'disabled' : '',
}
})));
$row.append($('<td class="OrderID">').append(templateOrderIDContent({
data: {
feedId: item['ViewID'][0],
orderId: item['period'],
//confirmed: (orderStatus && !orderStatus.confirmed) ? '' : 'checked',
//approved: (orderStatus && orderStatus.approved) ? 'disabled' : '',
feedId: feedId,
orderId: orderId,
}
})));
$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']));
} else {
......@@ -216,7 +214,7 @@ $(document).ready(function(){
$rowExcel.append($('<td class="Timestamp">').append(item[line]));
} else if (line == 'ViewID') {
$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 {
currentActiveLine = line;
......
......@@ -258,8 +258,8 @@ class Statistics
// Данные для отчета 'transactions':
if ($report_type == 'transactions') {
foreach ($stats['data'] as $item) {
$dataStats['period'][] = $item['ForeignID'];
$dataStats['ViewID'][] = [$item['FeedID'], $item['ViewID']];
$dataStats['period'][] = [$item['ForeignID'], $item['FeedID']];
$dataStats['ViewID'][] = $item['ViewID'];
$dataStats['Timestamp'][] = $item['Timestamp'];
$dataStats['OrderSum'][] = $item['OrderSum'];
$dataStats['Basket'][] = $item['Basket'];
......
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