Add condition for null-data transactions stats

src/src/App/Action/User/Cabinet.php

@@ -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);
@@ -144,7 +143,7 @@ class Cabinet extends Common
                             $data['error'] = _t('Извините, тип отчета "'. $report_type .'" недоступен');
                             break;
                     }
-
+                    
                     // Добавляем спец. категории для сводного отчета по магазину:
                     if ($report_type == 'common') {
                         $periodStats = $this->addStatsSpecialCats($periodStats);
@@ -152,17 +151,19 @@ class Cabinet extends Common
                     
                     // Добавляем данные о статусах заказов:
                     if ($report_type == 'transactions') {
-                        /** @var \App\Model\Feeds $ordersStatusModel */
-                        $ordersStatusModel = $this->container->get(OrdersStatus::class);
-                        $ordersStatus = $ordersStatusModel->findAll(['feed_id' => $feed_id_list])->toArray();
-                        $statuses = [];
-                        foreach($ordersStatus as $order_item) {
-                            $statuses[$order_item['feed_id']][$order_item['order_id']] = array(
-                                'confirmed' => $order_item['confirmed'] ? 1 : 0,
-                                'approved' => $order_item['approved'] ? 1 : 0
-                            );
+                        if ($periodStats) {
+                            /** @var \App\Model\Feeds $ordersStatusModel */
+                            $ordersStatusModel = $this->container->get(OrdersStatus::class);
+                            $ordersStatus = $ordersStatusModel->findAll(['feed_id' => $feed_id_list])->toArray();
+                            $statuses = [];
+                            foreach($ordersStatus as $order_item) {
+                                $statuses[$order_item['feed_id']][$order_item['order_id']] = array(
+                                    'confirmed' => $order_item['confirmed'] ? 1 : 0,
+                                    'approved' => $order_item['approved'] ? 1 : 0
+                                );
+                            }
+                            $periodStats['ordersStatus'] = $statuses;
                         }
-                        $periodStats['ordersStatus'] = $statuses;
                     }
                     
                     $data['shop_title'] = $shop_title;
@@ -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);