Commit c6c0a743 authored by Patrick Schmalstig's avatar Patrick Schmalstig
Browse files

Fixed MANTIS-6279 (Country filtering on stats broken)

parent 6d8e4aef

sources/hooks/modules/admin_stats/banners.php

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class Hook_admin_stats_banners extends CMSStatsProvider 
                'filters' => [

                    'banner_clicks__month_range' => new CMSStatsDateMonthRangeFilter('banner_clicks__month_range', do_lang_tempcode('DATE_RANGE'), null, $for_kpi),

                    'banner_clicks__banner' => new CMSStatsListFilter('banner_clicks__banner', do_lang_tempcode('BANNER'), $banners),

                    'banner_clicks__country' => has_geolocation_data() ? new CMSStatsListFilter('banner_clicks__country', do_lang_tempcode('VISITOR_COUNTRY'), find_countries()) : null,

                    'banner_clicks__country' => has_geolocation_data() ? new CMSStatsCountryFilter('banner_clicks__country', do_lang_tempcode('VISITOR_COUNTRY')) : null,

                ],

                'pivot' => new CMSStatsDatePivot('banner_clicks__pivot', $this->get_date_pivots(!$for_kpi)),

                'support_kpis' => self::KPI_HIGH_IS_GOOD,

sources/hooks/modules/admin_stats/cns_members.php

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ class Hook_admin_stats_cns_members extends CMSStatsProvider 
                'category' => 'conversions',

                'filters' => [

                    'members__month_range' => new CMSStatsDateMonthRangeFilter('members__month_range', do_lang_tempcode('DATE_RANGE'), null, $for_kpi),

                    'members__country' => has_geolocation_data() ? new CMSStatsListFilter('members__country', do_lang_tempcode('VISITOR_COUNTRY'), find_countries()) : null,

                    'members__country' => has_geolocation_data() ? new CMSStatsCountryFilter('members__country', do_lang_tempcode('VISITOR_COUNTRY')) : null,

                ],

                'pivot' => new CMSStatsDatePivot('members__pivot', $this->get_date_pivots(!$for_kpi)),

                'support_kpis' => self::KPI_HIGH_IS_GOOD,

sources/hooks/modules/admin_stats/downloads.php

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ class Hook_admin_stats_downloads extends CMSStatsProvider 
                'category' => 'feedback_and_engagement',

                'filters' => [

                    'downloads__month_range' => new CMSStatsDateMonthRangeFilter('downloads__month_range', do_lang_tempcode('DATE_RANGE'), null, $for_kpi),

                    'downloads__country' => has_geolocation_data() ? new CMSStatsListFilter('downloads__country', do_lang_tempcode('VISITOR_COUNTRY'), find_countries()) : null,

                    'downloads__country' => has_geolocation_data() ? new CMSStatsCountryFilter('downloads__country', do_lang_tempcode('VISITOR_COUNTRY')) : null,

                ],

                'pivot' => new CMSStatsDatePivot('downloads__pivot', $this->get_date_pivots(!$for_kpi)),

                'support_kpis' => self::KPI_HIGH_IS_GOOD,

sources/hooks/modules/admin_stats/events.php

+4 −4
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ class Hook_admin_stats_events extends CMSStatsProvider 
                'category' => 'conversions',

                'filters' => [

                    'events__month_range' => new CMSStatsDateMonthRangeFilter('events__month_range', do_lang_tempcode('DATE_RANGE'), null, $for_kpi),

                    'events__country' => new CMSStatsListFilter('events__country', do_lang_tempcode('VISITOR_COUNTRY'), find_countries()),

                    'events__country' => new CMSStatsCountryFilter('events__country', do_lang_tempcode('VISITOR_COUNTRY')),

                    'events__event' => new CMSStatsListFilter('events__event', do_lang_tempcode('STATS_EVENT'), $top_events),

                ],

                'pivot' => new CMSStatsDatePivot('events__pivot', $this->get_date_pivots(!$for_kpi)),
@@ -103,7 +103,7 @@ class Hook_admin_stats_events extends CMSStatsProvider 
                'category' => 'conversions',

                'filters' => [

                    'tracking_code_usage__month_range' => new CMSStatsDateMonthRangeFilter('tracking_code_usage__month_range', do_lang_tempcode('DATE_RANGE'), null, $for_kpi),

                    'tracking_code_usage__country' => new CMSStatsListFilter('tracking_code_usage__country', do_lang_tempcode('VISITOR_COUNTRY'), find_countries()),

                    'tracking_code_usage__country' => new CMSStatsCountryFilter('tracking_code_usage__country', do_lang_tempcode('VISITOR_COUNTRY')),

                    'tracking_code_usage__event' => new CMSStatsListFilter('tracking_code_usage__tracking_code', do_lang_tempcode('TRACKING_CODE'), $top_tracking_codes),

                ],

                'pivot' => new CMSStatsDatePivot('tracking_code_usage__pivot', $this->get_date_pivots(!$for_kpi)),
@@ -114,7 +114,7 @@ class Hook_admin_stats_events extends CMSStatsProvider 
                'category' => 'conversions',

                'filters' => [

                    'conversion_rates__month_range' => new CMSStatsDateMonthRangeFilter('conversion_rates__month_range', do_lang_tempcode('DATE_RANGE'), null, $for_kpi),

                    'conversion_rates__country' => new CMSStatsListFilter('conversion_rates__country', do_lang_tempcode('VISITOR_COUNTRY'), find_countries()),

                    'conversion_rates__country' => new CMSStatsCountryFilter('conversion_rates__country', do_lang_tempcode('VISITOR_COUNTRY')),

                    'conversion_rates__event' => new CMSStatsListFilter('conversion_rates__event', do_lang_tempcode('STATS_EVENT'), $top_events),

                ],

                'pivot' => new CMSStatsDatePivot('conversion_rates__pivot', $this->get_date_pivots(!$for_kpi)),
@@ -125,7 +125,7 @@ class Hook_admin_stats_events extends CMSStatsProvider 
                'category' => 'conversions',

                'filters' => [

                    'tracking_code_conversion_rates__month_range' => new CMSStatsDateMonthRangeFilter('tracking_code_conversion_rates__month_range', do_lang_tempcode('DATE_RANGE'), null, $for_kpi),

                    'tracking_code_conversion_rates__country' => new CMSStatsListFilter('tracking_code_conversion_rates__country', do_lang_tempcode('VISITOR_COUNTRY'), find_countries()),

                    'tracking_code_conversion_rates__country' => new CMSStatsCountryFilter('tracking_code_conversion_rates__country', do_lang_tempcode('VISITOR_COUNTRY')),

                    'tracking_code_conversion_rates__event' => new CMSStatsListFilter('tracking_code_conversion_rates__event', do_lang_tempcode('STATS_EVENT'), $top_events),

                    'tracking_code_conversion_rates_usage__event' => new CMSStatsListFilter('tracking_code_conversion_rates_usage__tracking_code', do_lang_tempcode('TRACKING_CODE'), $top_tracking_codes),

                ],

sources/hooks/modules/admin_stats/links.php

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ class Hook_admin_stats_links extends CMSStatsProvider 
                'filters' => [

                    'link_tracking__month_range' => new CMSStatsDateMonthRangeFilter('link_tracking__month_range', do_lang_tempcode('DATE_RANGE'), null, $for_kpi),

                    'link_tracking__url' => new CMSStatsListFilter('link_tracking__url', do_lang_tempcode('URL'), $top_urls),

                    'link_tracking__country' => has_geolocation_data() ? new CMSStatsListFilter('link_tracking__country', do_lang_tempcode('VISITOR_COUNTRY'), find_countries()) : null,

                    'link_tracking__country' => has_geolocation_data() ? new CMSStatsCountryFilter('link_tracking__country', do_lang_tempcode('VISITOR_COUNTRY')) : null,

                ],

                'pivot' => new CMSStatsDatePivot('link_tracking__pivot', $this->get_date_pivots(!$for_kpi)),

            ],