Включил логику возможности редактирования категорий по флагу у магазина

parent 5c20245b
......@@ -279,8 +279,8 @@ class Cabinet extends Common
$reports_list[$report_name] = $report_value['title'];
}
//$shop_edit_enable = $shop->getEditEnable();
$shop_edit_enable = true;
$shop_edit_enable = $shop->getEditEnable();
//$shop_edit_enable = true;
$data['lang'] = $request->getAttribute('layoutInfo')->getLang();
$data['feeds_cats'] = $feeds_cats;
......
......@@ -102,6 +102,17 @@ class Statistics
//$data_stats['AdMoney'][] = 224 * $data['Orders']; // временно
}
function AddDataStatsFixedAdMoney(&$data_stats, $data, $date_type)
{
foreach ($data as $cat=>$value) {
if ($cat == 'AdMoney') {
$data_stats['AdMoney'][] = 224 * $data['Orders'];
} else {
$data_stats[$cat][] = $value;
}
}
}
// Формируем пустые данные для временного промежутка
function AddDataStatsNull(&$data_stats, $cats)
{
......@@ -220,7 +231,12 @@ class Statistics
if (($item>= $stat_from)) {
$period[] = $day_item;
if ($stats['data']['Day'][$day_item]) {
//AddDataStats($dataStats, $stats['data']['Day'][$day_item], $dataStats['type']);
if (strtotime($day_item)< strtotime('2019-04-01')) {
AddDataStatsFixedAdMoney($dataStats, $stats['data']['Day'][$day_item], $dataStats['type']);
} else {
AddDataStats($dataStats, $stats['data']['Day'][$day_item], $dataStats['type']);
}
} else {
AddDataStatsNull($dataStats, $stat_cats);
}
......@@ -245,8 +261,14 @@ class Statistics
$dataStats['Timestamp'][] = $item['Timestamp'];
$dataStats['OrderSum'][] = $item['OrderSum'];
$dataStats['Basket'][] = $item['Basket'];
//$dataStats['AdMoney'][] = $item['AdMoney'];
if (strtotime($item['Timestamp'])< strtotime('2019-04-01')) {
$dataStats['AdMoney'][] = 224;
} else {
$dataStats['AdMoney'][] = $item['AdMoney'];
}
}
}
$stats = $dataStats;
......
......@@ -69,9 +69,11 @@ if (!$error) {
</div>
</div>
<?php if ($edit_enable): ?>
<div style="float: right; font-size: 12px; color: #697075; font-style: italic;">
Значение указывается с точностью 0.1 %
</div>
<?php endif; ?>
<?php
......
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