Убрал ссылку на отчет "транзакции"

parent 933792fe
...@@ -93,7 +93,7 @@ $(document).ready(function(){ ...@@ -93,7 +93,7 @@ $(document).ready(function(){
$.extend({ $.extend({
ChartStat: { ChartStat: {
DateStat: function(dataLineChartStat) { DateStat: function(dataLineChartStat) {
console.log('AAA DateStat: ', dataLineChartStat); //console.log('AAA DateStat: ', dataLineChartStat);
//activeLines = ['shows', 'clicks', 'transactions', 'salemoney', 'admoney']; //activeLines = ['shows', 'clicks', 'transactions', 'salemoney', 'admoney'];
//activeLine = 'shows'; //activeLine = 'shows';
......
...@@ -52,8 +52,10 @@ $(document).ready(function(){ ...@@ -52,8 +52,10 @@ $(document).ready(function(){
// Установка стартовых значений дат: // Установка стартовых значений дат:
datepicker1.selectDate(new Date($dateFrom.val())); if ($('.b-feeds-stat_controls').length) {
datepicker2.selectDate(new Date($dateTo.val())); datepicker1.selectDate(new Date($dateFrom.val()));
datepicker2.selectDate(new Date($dateTo.val()));
}
isStartDatesSelected = true; isStartDatesSelected = true;
......
...@@ -143,8 +143,9 @@ class Cabinet extends Common ...@@ -143,8 +143,9 @@ class Cabinet extends Common
*/ */
break; break;
/*
case 'transaction': case 'transaction':
/** @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 = [ $cats = [
...@@ -162,6 +163,7 @@ class Cabinet extends Common ...@@ -162,6 +163,7 @@ class Cabinet extends Common
$periodStats = $transactionStats; $periodStats = $transactionStats;
break; break;
*/
default: default:
$data['error'] = _t('Извините, тип отчета "'. $report_type .'" недоступен'); $data['error'] = _t('Извините, тип отчета "'. $report_type .'" недоступен');
break; break;
......
...@@ -106,6 +106,7 @@ $system_link = $this->url('adm.system.actions'); ...@@ -106,6 +106,7 @@ $system_link = $this->url('adm.system.actions');
--> -->
<div class="b-feeds-stat_controls form-group"> <div class="b-feeds-stat_controls form-group">
<?php /* ?>
<div class="b-feeds-stat_controls-report"> <div class="b-feeds-stat_controls-report">
<div class="dropdown" style="display:inline-block;"> <div class="dropdown" style="display:inline-block;">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
...@@ -122,6 +123,7 @@ $system_link = $this->url('adm.system.actions'); ...@@ -122,6 +123,7 @@ $system_link = $this->url('adm.system.actions');
</ul> </ul>
</div> </div>
</div> </div>
<?php */ ?>
<span class="b-feeds-stat_controls-period"> <span class="b-feeds-stat_controls-period">
......
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