Добавил названия категорий таблицы

parent b8ea7962
...@@ -110,7 +110,14 @@ class Cabinet extends Common ...@@ -110,7 +110,14 @@ class Cabinet extends Common
//$stats = $statsDaysModel->findAll(['FeedID' => $feed_id_list])->toArray(); //$stats = $statsDaysModel->findAll(['FeedID' => $feed_id_list])->toArray();
$periodStats = $statsDaysModel->getStatsByDate($feed_id_list, $dates); $periodStats = $statsDaysModel->getStatsByDate($feed_id_list, $dates);
$campaignStats = $statsDaysModel->getStatsByFeeds($feed_id_list, $dates); $campaignStats = $statsDaysModel->getStatsByFeeds($feed_id_list, $dates);
$cats = ['shows','clicks','transactions','salemoney','admoney'];
$cats = [
'shows' => 'Показы',
'clicks' => 'Клики',
'transactions' => 'Транзакции',
'salemoney' => 'salemoney',
'admoney' => 'admoney'
];
if ($campaignStats || count($campaignStats['period'])>0) { if ($campaignStats || count($campaignStats['period'])>0) {
$feeds_names = []; $feeds_names = [];
...@@ -126,12 +133,15 @@ class Cabinet extends Common ...@@ -126,12 +133,15 @@ class Cabinet extends Common
/** @var \App\Model\Feeds $transactionsModel */ /** @var \App\Model\Feeds $transactionsModel */
$transactionsModel = $this->container->get(Transactions::class); $transactionsModel = $this->container->get(Transactions::class);
$transactionStats = $transactionsModel->getStatsByTransactions($feed_id_list, $dates); $transactionStats = $transactionsModel->getStatsByTransactions($feed_id_list, $dates);
$cats = ['localmoney','usdollarmoney']; $cats = [
'localmoney' => 'localmoney',
'usdollarmoney' => 'usdollarmoney'
];
if ($transactionStats || count($transactionStats['period'])>0) { if ($transactionStats || count($transactionStats['period'])>0) {
$transactions_names = []; $transactions_names = [];
foreach($transactionStats['period'] as $transaction_id) { foreach($transactionStats['period'] as $transaction_id) {
$transactions_names[] = 'transaction #'.$transaction_id; $transactions_names[] = 'транзакция #'.$transaction_id;
} }
$transactionStats['period'] = $transactions_names; $transactionStats['period'] = $transactions_names;
} }
...@@ -277,7 +287,7 @@ class Cabinet extends Common ...@@ -277,7 +287,7 @@ class Cabinet extends Common
if ($transactionStats || count($transactionStats['period'])>0) { if ($transactionStats || count($transactionStats['period'])>0) {
$transactions_names = []; $transactions_names = [];
foreach($transactionStats['period'] as $transaction_id) { foreach($transactionStats['period'] as $transaction_id) {
$transactions_names[] = 'transaction #'.$transaction_id; $transactions_names[] = 'транзакция #'.$transaction_id;
} }
$transactionStats['period'] = $transactions_names; $transactionStats['period'] = $transactions_names;
} }
......
...@@ -94,7 +94,7 @@ $system_link = $this->url('adm.system.actions'); ...@@ -94,7 +94,7 @@ $system_link = $this->url('adm.system.actions');
<?php else: ?> <?php else: ?>
<textarea id="period-stats"><?= ($periodStats ? json_encode($periodStats) : '')?></textarea> <textarea id="period-stats"><?= ($periodStats ? json_encode($periodStats, JSON_UNESCAPED_UNICODE) : '')?></textarea>
<textarea id="campaign-stats"><?= ($campaignStats ? json_encode($campaignStats) : '')?></textarea> <textarea id="campaign-stats"><?= ($campaignStats ? json_encode($campaignStats) : '')?></textarea>
<section class="b-content__work"> <section class="b-content__work">
...@@ -166,14 +166,14 @@ $system_link = $this->url('adm.system.actions'); ...@@ -166,14 +166,14 @@ $system_link = $this->url('adm.system.actions');
<?php endif; ?> <?php endif; ?>
</th> </th>
<?php foreach($cats as $name): ?> <?php foreach($cats as $name => $title): ?>
<th> <th>
<?php if ($report == 'common'): ?> <?php if ($report == 'common'): ?>
<span style="border-color: <?= $colors_active_lines[$name] ?>;"> <span style="border-color: <?= $colors_active_lines[$name] ?>;">
<input type="checkbox" data-field="<?= $name ?>" checked /> <input type="checkbox" data-field="<?= $name ?>" checked />
</span> </span>
<?php endif; ?> <?php endif; ?>
<b class="cat" id="<?= $name ?>"><?= _t($name)?><!--<b class="arrow asc">&and;</b><b class="arrow desc">&or;</b>--></b> <b class="cat" id="<?= $name ?>"><?= _t($title)?><!--<b class="arrow asc">&and;</b><b class="arrow desc">&or;</b>--></b>
</th> </th>
<?php endforeach; ?> <?php endforeach; ?>
</tr> </tr>
......
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