Merge remote branch 'core/emarketing-dashboard-charts' into development

cykod · Dec 7, 2010 · a644199 · a644199
2 parents cc29b51 + e41c5c6
commit a644199
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/emarketing_controller.rb b/app/controllers/emarketing_controller.rb
@@ -85,7 +85,7 @@ def referrer_sources(display=true)
         :total_value => total_value,
         :hits => hits,
         :visits => visits,
-        :user_levels => [(visits - (subscribers + leads + conversions)), subscribers, leads, conversions],
+        :user_levels => [(visits - (subscribers + leads + conversions)), conversions, leads, subscribers],
         :sources => @sources.collect { |source| stats[source[:id]] ? stats[source[:id]].visits : 0 }
       }
     end

diff --git a/app/views/emarketing/_referrer_sources.html.erb b/app/views/emarketing/_referrer_sources.html.erb
@@ -152,7 +152,7 @@
 
 SourcesCharts.chart = WebivaStatsChart(
 {
-user_level_types: ['Subscribers', 'Leads', 'Conversions'],
+user_level_types: ['Conversions', 'Leads', 'Subscribers'],
 user_level_colors: ['#BE1E2D', '#754C28', '#C7CB2D'],
 
 source_types: <%= @sources.collect{ |s| s[:name] }.to_json %>,