Commit 05368c61 authored by Balint Pekker's avatar Balint Pekker Committed by Brady
Browse files

Issue #3299971: Fixed variable namings, added missing configuration

parent e92d53a0

modules/sendgrid_integration_reports/src/Api.php

+14 −4
Original line number Diff line number Diff line
@@ -278,6 +278,11 @@ class Api { 
      return [];

    }



    // Get config.

    $config = $this

      ->configFactory

      ->get('sendgrid_integration_reports.settings')

      ->get();

    // Set start date and end date for global stats - default 30 days back.

    $start_date = empty($config['start_date']) ? date('Y-m-d', strtotime('today - 30 days')) : $config['start_date'];

    $end_date = empty($config['end_date']) ? date('Y-m-d', strtotime('today')) : $config['end_date'];
@@ -291,14 +296,14 @@ class Api { 
    ];



    // Lets try and retrieve the browser statistics.

    $statsdata = $this->getResponse($path, $query);

    $stats_data = $this->getResponse($path, $query);

    if (!$stats_data) {

      return [];

    }

    $data = [];

    // Determine all browsers. Nested foreach to

    // iterate over all data returned per aggregation.

    foreach ($statsdata as $item) {

    foreach ($stats_data as $item) {

      foreach ($item->stats as $inneritem) {

        if (array_key_exists($inneritem->name, $data)) {

          $data[$inneritem->name] += $inneritem->metrics->clicks;
@@ -329,6 +334,11 @@ class Api { 
      return FALSE;

    }



    // Get config.

    $config = $this

      ->configFactory

      ->get('sendgrid_integration_reports.settings')

      ->get();

    // Set start date and end date for global stats - default 30 days back.

    $start_date = empty($config['start_date']) ? date('Y-m-d', strtotime('today - 30 days')) : $config['start_date'];

    $end_date = empty($config['end_date']) ? date('Y-m-d', strtotime('today')) : $config['end_date'];
@@ -343,14 +353,14 @@ class Api { 
    ];



    // Lets try and retrieve the browser statistics.

    $statsdata = $this->getResponse($path, $query);

    $stats_data = $this->getResponse($path, $query);

    if (!$stats_data) {

      return [];

    }

    $data = [];

    // Determine all browsers. Nested foreach to

    // iterate over all data returned per aggregation.

    foreach ($statsdata as $item) {

    foreach ($stats_data as $item) {

      foreach ($item->stats as $inneritem) {

        if (array_key_exists($inneritem->name, $data)) {

          $data[$inneritem->name] += $inneritem->metrics->opens;