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

parent 0e71a59a
...@@ -106,6 +106,7 @@ class Statistics ...@@ -106,6 +106,7 @@ class Statistics
} }
// Логика формирования данных по временному интервалу: // Логика формирования данных по временному интервалу:
/*
if (false) { if (false) {
if ($timeDiff == 0) // Одни сутки if ($timeDiff == 0) // Одни сутки
{ {
...@@ -187,6 +188,7 @@ class Statistics ...@@ -187,6 +188,7 @@ class Statistics
} }
} }
} }
*/
$dataStats['type'] = 'interval'; $dataStats['type'] = 'interval';
......
...@@ -171,23 +171,26 @@ if (!$error) { ...@@ -171,23 +171,26 @@ if (!$error) {
<?php if($current_report == 'common'): ?> <?php if($current_report == 'common'): ?>
<b class="main-cat date selected"><?= _t('Дата')?></b> <b class="main-cat date selected"><?= _t('Дата')?></b>
<?php /* ?>/ <b class="main-cat campaign"><?= _t('Кампания')?></b><?php */ ?> <?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> <b class="main-cat date selected not-sorted"><?= _t('#OrderID')?></b>
<?php endif; ?> <?php endif; ?>
</th> </th>
<?php foreach($report_cats as $name => $title): ?> <?php foreach($report_cats as $name => $title): ?>
<th class="<?= $name ?>" data-id="<?= $name ?>"> <th class="<?= $name ?>" data-id="<?= $name ?>">
<?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'): ?> <?php if ($name == 'Basket'): ?>
<b class="cat not-sorted" id="<?= $name ?>"><?= _t($title)?></b><br /> <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> <b class="basket-link not-sorted">Товар</b> <b class="quantity not-sorted">Кол-во</b> <b class="price not-sorted">Цена</b>
<?php else: ?> <?php else: ?>
<?php if ($current_report == 'common'): ?> <b class="cat" id="<?= $name ?>"><?= _t($title)?><b class="arrow asc">&#9650;</b><b class="arrow desc">&#9660;</b></b>
<span style="border-color: <?= $colors_active_lines[$name] ?>;">
<input type="checkbox" data-field="<?= $name ?>" checked />
</span>
<?php endif; ?> <?php endif; ?>
<b class="cat" id="<?= $name ?>"><?= _t($title)?><?php if ($current_report == 'transaction'): ?><b class="arrow asc">&#9650;</b><b class="arrow desc">&#9660;</b><?php endif; ?></b>
<?php endif; ?> <?php endif; ?>
</th> </th>
<?php endforeach; ?> <?php endforeach; ?>
......
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