Skip to content

A
addcpm-json
Commit 01221e85 authored by Александр Чаплыгин's avatar Александр Чаплыгин
Browse files
Options

Вынес в конфиг категории для отчетов

parent f9664726
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 79 deletions
src/config/autoload/feeds.global.php
View file @ 01221e85
......@@ -25,6 +25,32 @@ return [
'Orders' => '#1F77B4',
'OrderSum' => '#FF7F0E',
'AdMoney' => '#9467BD',
],
'reports' => [
'common' => [
'cats' => [
'Views' => 'Показы',
'Clicks' => 'Клики',
'Orders' => 'Заказы',
'OrderSum' => 'Заказы на сумму',
'AdMoney' => 'Комиссия AddCPM'
]
],
'transaction' => [
'cats' => [
'Views' => 'Показы',
'Clicks' => 'Клики',
'Orders' => 'Заказы',
'OrderSum' => 'Заказы на сумму',
'AdMoney' => 'Комиссия AddCPM'
]
/*
$cats => [
'localmoney' => 'localmoney',
'usdollarmoney' => 'usdollarmoney'
];
*/
],
]
]
];
src/src/App/Action/Admin/SystemAction.php
View file @ 01221e85
......@@ -91,54 +91,6 @@ class SystemAction extends Common
private function renderFeedTestData(ServerRequestInterface $request)
{
return new JsonResponse(123);
/** @var \App\Model\Offers $landingsModel */
$landingsModel = $this->container->get(\App\Model\Offers\Landings::class);
$landings = $landingsModel->findAll();
/** @var \App\Model\Offers $templatesModel */
$templatesModel = $this->container->get(\App\Model\Offers\Templates::class);
/** @var DelegatingHydrator $hydrator */
$hydrator = $this->container->get(DelegatingHydrator::class);
$land_ids = [];
foreach($landings as $land) {
if ($land->getTpl())
{
$land_tpl = $land->getTpl();
if ($land_tpl != 'null' && $land_tpl != 'NULL')
{
$land_ids[] = $land->getId();
$land_tpl_val = json_decode($land_tpl, true);
foreach($land_tpl_val as $id => $price) {
$data = array(
'disabled' => false,
'landing_id' => $land->getId(),
'ad_data_id' => $id,
'price' => $price['price'],
);
$template = $hydrator->hydrate($data, new Template());
$templatesModel->createListItem($template);
}
}
}
}
return new JsonResponse($land_ids);
}
}
\ No newline at end of file
src/src/App/Action/User/Cabinet.php
View file @ 01221e85
......@@ -110,34 +110,9 @@ class Cabinet extends Common
case 'common':
$periodStats = $stats->getFeedStatData($report_type, $feed_id_list, $dates);
//$campaignStats = $statsDaysModel->getStatsByFeeds($feed_id_list, $dates);
$cats = [
'Views' => 'Показы',
'Clicks' => 'Клики',
'Orders' => 'Заказы',
'OrderSum' => 'Заказы на сумму',
'AdMoney' => 'Комиссия AddCPM'
];
break;
case 'transaction':
$periodStats = $stats->getFeedStatData($report_type, $feed_id_list, $dates);
/*
$cats = [
'localmoney' => 'localmoney',
'usdollarmoney' => 'usdollarmoney'
];
*/
$cats = [
'Views' => 'Показы',
'Clicks' => 'Клики',
'Orders' => 'Заказы',
'OrderSum' => 'Заказы на сумму',
'AdMoney' => 'Комиссия AddCPM'
];
break;
default:
$data['error'] = _t('Извините, тип отчета "'. $report_type .'" недоступен');
......@@ -150,7 +125,7 @@ class Cabinet extends Common
$data['dates'] = $dates;
$data['periodStats'] = $periodStats;
//$data['campaignStats'] = $campaignStats;
$data['cats'] = $cats;
$data['cats'] = $cats = $this->container->get('config')['feed_conf']['reports'][$report_type]['cats'];
$data['periods_list'] = $this->container->get('config')['feed_conf']['periods_list'];
$data['colors_active_lines'] = $this->container->get('config')['feed_conf']['colors_active_lines'];
......
src/templates/app/user/cabinet-feed.phtml
View file @ 01221e85
......@@ -100,15 +100,17 @@ if (!$error) {
<?php else: ?>
<textarea id="period-stats"><?= ($periodStats ? json_encode($periodStats, JSON_UNESCAPED_UNICODE) : '')?></textarea>
<?php /* ?>
<textarea id="campaign-stats"><?= ($campaignStats ? json_encode($campaignStats) : '')?></textarea>
<?php */ ?>
<section class="b-content__work">
<div class="wrapp" style="position: relative;">
<div class="b-feeds-stat_data-loading"></div>
<!--
<?php /* ?>
<a class="btn btn-primary service-action feed-test-data" href="<?= $system_link ?>">Сформировать тестовые данные</a>
-->
<?php */ ?>
<div class="b-feeds-stat_controls form-group">
<?php /* Переключатель отчетов */ ?>
......@@ -143,6 +145,7 @@ if (!$error) {
<?php endforeach; ?>
</select>
</span>
</div>
<div class="chart-graph-stat-info">
......@@ -166,11 +169,11 @@ if (!$error) {
<tr>
<th>
<?php if($report == 'common'): ?>
<b class="main-cat date selected"><?= _t('Дата')?></b><?php /* ?> / <b class="main-cat campaign"><?= _t('Кампания')?></b><?php */ ?>
<b class="main-cat date selected"><?= _t('Дата')?></b>
<?php /* ?>/ <b class="main-cat campaign"><?= _t('Кампания')?></b><?php */ ?>
<?php else: ?>
<b class="main-cat date selected"><?= _t('Транзакция')?></b>
<?php endif; ?>
</th>
<?php foreach($cats as $name => $title): ?>
<th>
......
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