Skip to content

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

выбор активной категории, удалил неиспользуемые поля в данных статистики,… 

выбор активной категории, удалил неиспользуемые поля в данных статистики, почистил стили стр. кампании
parent 70084c7e
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 245 deletions
src/public/css/styles-amsystem.css
View file @ 279c5501
......@@ -25,17 +25,6 @@ input[type="radio"]
vertical-align: -2px;
}
.edited {
min-width: 100px;
min-height: 20px;
}
input.editing {
display: none;
background-color: transparent;
border: 1px solid #ccc;
}
.b-left
{
float: left;
......@@ -64,45 +53,6 @@ table.campaigns tbody tr td.stat {
{
font-size: 16px;
}
input.campaign-title {
padding: 0 12px;
line-height: 34px;
color: #697075;
}
.campaign-title.edited {
display: inline-block;
padding: 0 13px;
min-width: 600px;
height: 36px;
line-height: 36px;
color: #337ab7;
font-weight: bold;
}
.campaign-title.editing {
margin-left: 4px;
width: 600px;
}
.form-control.user-id
{
display: inline-block;
width: 250px;
}
.user-new
{
display: none;
margin-left: 10px;
}
.user-new input
{
display: inline;
width: 300px;
}
.form-group.url .value-show,
.form-group.tracking_pixels .value-show div.url
......@@ -126,20 +76,6 @@ input.campaign-title {
{
color: #BCBCBC;
}
.btn.btn-primary.save-item,
.btn.btn-primary.cancel-item
{
float: none;
margin: 0;
}
.form-group .value-edit,
.form-group .save-item,
.form-group .cancel-item
{
display: none;
}
.form-group .value-show span
{
......@@ -151,36 +87,12 @@ input.campaign-title {
{
color: #23527c;
}
.form-group.state-edit .value-show,
.form-group.state-edit .edit-item
{
display: none;
}
.form-group.state-edit .value-edit
{
display: block;
}
.form-group.state-edit .save-item,
.form-group.state-edit .cancel-item
{
display: inline-block;
}
.panel-heading h1
{
display: inline-block;
}
.panel-heading__controls
{
float: right;
}
.form-control.date-value,
.form-control.price,
......@@ -233,11 +145,6 @@ input.campaign-title {
font-weight: normal;
}
.form-group .tracking_pixels_item .add-row
{
display: inline;
}
.form-group .tracking_pixels_urls .url-item
{
margin-bottom: 4px;
......@@ -250,109 +157,6 @@ input.campaign-title {
float: left;
width: 100%;
}
.form-group .tracking_pixels_urls .delete-item {
float: right;
margin-right: -20px;
height: 32px;
width: 15px;
font-size: 27px;
line-height: 32px;
vertical-align: -4px;
color: #383838;
cursor: pointer;
}
.form-control#targeting_geo_country
{
display: inline-block;
width: 200px;
margin-bottom: 6px;
margin-right: 4px;
}
.geo_country .b-exclude label
{
font-weight: normal;
font-size: 13px;
}
.geo_region,
.geo_city
{
float: left;
padding: 4px 6px 0;
margin-bottom: 5px;
width: 100%;
border: 1px solid #CCC;
border-radius: 4px;
}
.geo_region .b-exclude,
.geo_city .b-exclude
{
float: right;
}
.geo_region-city .filters-select
{
float: left;
padding-right: 3px;
width: 50%;
height: 200px;
}
.geo_region-city .filters-values {
float: right;
padding-left: 3px;
width: 50%;
height: 200px;
}
.geo_region-city .region-val-geo {
line-height: 32px;
}
.geo_region #region-filter {
display: inline-block;
float: none;
margin-right: 0;
}
.geo_region-city .filters-select .filter {
margin-bottom: 8px;
}
.geo_region-city .filters-select .list-filters-wrap {
display: inline-block;
width: 100%;
border: 1px solid #CCCCCC;
border-radius: 4px;
}
.geo_region-city .list-filter {
padding-left: 4px;
height: 150px;
overflow-x: hidden;
overflow-y: scroll;
}
.geo_region-city .list-filter label,
.geo_region-city .values-string-list label
{
font-weight: normal;
}
.geo_region-city .values-string-list {
padding: 2px 6px;
height: 194px;
min-height: 34px;
border: 1px solid #CCCCCC;
border-radius: 4px;
overflow-y: scroll;
}
table.campaigns tbody tr.disabled
{
......@@ -415,60 +219,22 @@ table.campaign-banners tbody tr td {
color: #000000;
}
.b-popup-content b
.b-popup-content h2 b
{
color: #39B54A;
}
.b-popup-content span
.b-popup-content h2 span
{
font-family: 'RalewayRegular', sans-serif;
}
.b-popup__window.preview .form-group {
margin-bottom: 0;
}
.b-popup__window.preview .banner-img {
text-align: center;
}
.b-popup__window.preview .form-group .controls {
display: none;
}
.form-group.banners .form-pattern,
.form-group.banners input#img
{
display: none;
}
.form-group .image-controls,
.form-group .image-wrap
{
margin-bottom: 5px;
}
.form-group .image-wrap
{
display: none;
padding: 10px 0;
text-align: center;
}
.form-group .form-control.banner-size
{
display: inline-block;
width: 170px;
}
.form-group .btn.select-image
{
float: right;
}
.b-popup__window.preview .banner-img {
text-align: center;
}
#campaign-stat
textarea#campaign-stat
{
display: none;
}
......
src/src/App/Action/User/CabinetAmSystem.php
View file @ 279c5501
......@@ -145,6 +145,8 @@ class CabinetAmSystem extends Common
$dates = [$date_begin, $date_end];
$campaign_stat = $stats->getCampaignsStat([(int)$campaign_id], $campaign->getTargetAction(), $dates);
$active_line = 'views';
$campaign_banners_id = $campaign->getBanners();
if ($campaign_banners_id) {
$banners_id = json_decode($campaign_banners_id);
......@@ -186,6 +188,7 @@ class CabinetAmSystem extends Common
$data['banners'] = $banners;
$data['banners_stats'] = $banners_stats;
$data['campaign_stat'] = $campaign_stat;
$data['active_line'] = $active_line;
} else {
$data['error'] = _t('Извините, данная кампания закреплена за другим пользователем');
......
src/src/App/Model/Statistics.php
View file @ 279c5501
......@@ -380,6 +380,9 @@ class Statistics
} else {
$stats['reach'] = $stats['reach_view'];
}
unset($stats['loads']);
unset($stats['reach_load']);
unset($stats['reach_view']);
$views = $stats['views'];
$money = $stats['money'];
......
src/templates/app/user/campaign_item.phtml
View file @ 279c5501
......@@ -100,7 +100,7 @@ if (!$error) {
<!-- Активность и Название -->
<div class="form-group title">
<input type="checkbox" id="campaign-active" name="campaign-active" <?php if ($campaign_active): ?>checked<?php endif; ?>>
<span class="campaign-title edited" data-field="campaign-title" title="Название кампании"><?= $campaign_title ?></span>
<label class="campaign-title"><?= $campaign_title ?></label>
</div>
<!-- Даты проведения -->
......@@ -157,7 +157,7 @@ if (!$error) {
</div>
<!-- Ограничения на посетителя -->
<div class="form-group campaign-visitor-limit__wrap" data-type="visitor-limit">
<div class="form-group campaign-visitor-limit__wrap">
<label><?= _t('Ограничения на посетителя')?></label><br />
<div class="value-show">
<?php
......@@ -191,7 +191,7 @@ if (!$error) {
</div>
<!-- Бюджет -->
<div class="form-group campaign-money-limit" data-type="money-limit">
<div class="form-group campaign-money-limit">
<label><?= _t('Бюджет')?></label><br />
<div class="value-show">
<?php
......@@ -222,7 +222,7 @@ if (!$error) {
</div>
<!-- Гео -->
<div class="form-group geo" data-type="geo">
<div class="form-group geo">
<label><?= _t('Гео (таргетинг)')?></label>
<div class="value-show">
<?php if ($campaign_geo): ?>
......@@ -262,7 +262,7 @@ if (!$error) {
</div>
<!-- Трекинг -->
<div class="form-group tracking_pixels" data-type="tracking-pixels" data-value="">
<div class="form-group tracking_pixels">
<label><?= _t('Трекинг')?></label>
<div class="value-show">
<?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