Add condition for null-data transactions stats

parent 415e2852
......@@ -135,7 +135,6 @@ class Cabinet extends Common
switch ($report_type) {
case 'common':
$periodStats = $stats->getFeedStatData($report_type, $feed_id_list, $dates, $report_conf);
//$campaignStats = $statsDaysModel->getStatsByFeeds($feed_id_list, $dates);
break;
case 'transactions':
$periodStats = $stats->getFeedStatData($report_type, $feed_id_list, $dates, $report_conf);
......@@ -152,6 +151,7 @@ class Cabinet extends Common
// Добавляем данные о статусах заказов:
if ($report_type == 'transactions') {
if ($periodStats) {
/** @var \App\Model\Feeds $ordersStatusModel */
$ordersStatusModel = $this->container->get(OrdersStatus::class);
$ordersStatus = $ordersStatusModel->findAll(['feed_id' => $feed_id_list])->toArray();
......@@ -164,6 +164,7 @@ class Cabinet extends Common
}
$periodStats['ordersStatus'] = $statuses;
}
}
$data['shop_title'] = $shop_title;
$data['feeds'] = $feeds;
......@@ -171,7 +172,6 @@ class Cabinet extends Common
$data['current_period'] = $current_period;
$data['dates'] = $dates;
$data['periodStats'] = $periodStats;
//$data['campaignStats'] = $campaignStats;
$data['report_conf'] = $report_conf;
$data['reports_list'] = $reports_list;
$data['periods_list'] = $this->container->get('config')['feed_conf']['periods_list'];
......@@ -493,14 +493,12 @@ class Cabinet extends Common
switch ($report_type) {
case 'common':
$periodStats = $stats->getFeedStatData($report_type, $feed_id_list, $dates, $report_conf);
//$campaignStats = $statsDaysModel->getStatsByFeeds($feed_id_list, $dates);
break;
case 'transactions':
$periodStats = $stats->getFeedStatData($report_type, $feed_id_list, $dates, $report_conf);
break;
default:
$periodStats = null;
$campaignStats = null;
break;
}
......@@ -528,17 +526,6 @@ class Cabinet extends Common
$periodStats['ordersStatus'] = $statuses;
}
/*
if ($periodStats || $companyStats) {
$data = array(
'period' => $periodStats,
'campaign' => $campaignStats,
);
} else {
$data = null;
}
*/
$data = $periodStats;
return new JsonResponse($data);
......
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