Merge pull request #22 from TheDMSGroup/bug/notices

Prevent bulk notices when visiting dashboard.
TheDMSGroup · Apr 2, 2018 · 2033d0e · 2033d0e
2 parents 4b3f217 + 2495f0b
commit 2033d0e
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/Entity/LedgerEntryRepository.php b/Entity/LedgerEntryRepository.php
@@ -45,6 +45,7 @@ public function getTableAlias()
      */
     public function getForRevenueChartData(Campaign $campaign, \DateTime $dateFrom, \DateTime $dateTo)
     {
+        $results        = [];
         $resultDateTime = null;
         $labels         = $costs = $revenues = $profits = [];
         $defaultDollars = self::formatDollar('0');
@@ -236,8 +237,8 @@ public function getDashboardRevenueWidgetData($params)
                     ','
                 ) : 0;
                 $financial['ecpm']      = number_format($financial['gm'] / 1000, 4, '.', ',');
-                $financial['received']  = intval($received[$financial['campaign_id']]['sum']);
-                $financial['converted'] = intval($converted[$financial['campaign_id']]['sum']);
+                $financial['received']  = isset($received[$financial['campaign_id']]['sum']) ? $received[$financial['campaign_id']]['sum'] : 0;
+                $financial['converted'] = isset($converted[$financial['campaign_id']]['sum']) ? $converted[$financial['campaign_id']]['sum'] : 0;
                 $results['rows'][]      = [
                     $financial['is_published'],
                     $financial['campaign_id'],
@@ -292,7 +293,8 @@ private function getConvertedByCampaign($leads = [])
         $c->setParameter('ContactClient', 'ContactClient');
         $c->setParameter('MAUTIC_CONVERSION_LABEL', self::MAUTIC_CONTACT_LEDGER_STATUS_CONVERTED);
 
-        $results = $c->execute()->fetchAll();
+        $results     = $c->execute()->fetchAll();
+        $campaignSum = [];
 
         foreach ($results as $row) {
             $campaignSum[$row['campaign_id']]['sum']          = isset($campaignSum[$row['campaign_id']]['sum']) ? $campaignSum[$row['campaign_id']]['sum'] += $row['converted'] : $row['converted'];
@@ -435,8 +437,8 @@ public function getDashboardSourceRevenueWidgetData($params)
                     ','
                 ) : 0;
                 $financial['ecpm']      = number_format($financial['gm'] / 1000, 4, '.', ',');
-                $financial['received']  = intval($received[$financial['campaign_id']][$financial['source_id']]);
-                $financial['converted'] = intval($converted[$financial['campaign_id']][$financial['source_id']]);
+                $financial['received']  = isset($received[$financial['campaign_id']][$financial['source_id']]) ? $received[$financial['campaign_id']][$financial['source_id']] : 0;
+                $financial['converted'] = isset($converted[$financial['campaign_id']][$financial['source_id']]) ? $converted[$financial['campaign_id']][$financial['source_id']] : 0;
                 $results['rows'][]      = [
                     $financial['is_published'],
                     $financial['campaign_id'],