rfcommerce_dash 0.0.3

data/Gemfile

@@ -0,0 +1,35 @@
+source 'http://rubygems.org'
+
+group :test do
+  gem 'rspec-rails', '= 2.5.0'
+  gem 'factory_girl', '= 1.3.3'
+  gem 'factory_girl_rails', '= 1.0.1'
+  gem 'simplecov'
+  gem 'shoulda'
+  gem 'faker'
+  if RUBY_VERSION < "1.9"
+    gem "ruby-debug"
+  else
+    gem "ruby-debug19"
+  end
+end
+
+group :cucumber do
+  gem 'cucumber-rails'
+  gem 'database_cleaner', '= 0.6.7'
+  gem 'nokogiri'
+  gem 'capybara', '= 0.4.1.2'
+  gem 'factory_girl', '= 1.3.3'
+  gem 'factory_girl_rails', '= 1.0.1'
+  gem 'faker'
+  gem 'launchy'
+
+  if RUBY_VERSION < "1.9"
+    gem "ruby-debug"
+  else
+    gem "ruby-debug19"
+  end
+end
+gem 'spree_core', :path => '/home/santhosh/Downloads/Skype Downloads/rfcommerce/dash/../core'
+gem 'spree_dash', :path => '/home/santhosh/Downloads/Skype Downloads/rfcommerce/dash'
+gem 'sqlite3-ruby'

data/LICENSE

@@ -0,0 +1,26 @@
+Copyright (c) 2007-2010, Rails Dog LLC and other contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name Spree nor the names of its contributors may be used to
+      endorse or promote products derived from this software without specific
+      prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -0,0 +1,14 @@
+= Overview Dashboard
+
+Core extension to display basic graphs and charts on store activity. Can be deleted if you don't require the dashboard.
+
+Running Tests
+-------------
+
+You need to do a quick one-time creation of a test application and then you can use it to run the tests.
+
+    rake test_app
+
+Then run the tests
+
+    rake spec

data/app/controllers/admin/overview_controller.rb

@@ -0,0 +1,152 @@
+# this clas was inspired (heavily) from the mephisto admin architecture
+
+class Admin::OverviewController < Admin::BaseController
+  before_filter :check_json_authenticity, :only => :get_report_data
+  #todo, add rss feed of information that is happening
+
+  def index
+    @show_dashboard = show_dashboard
+    return unless @show_dashboard
+
+    p = {:from => (Time.new().to_date  - 1.week).to_s(:db), :value => "Count"}
+    @orders_by_day = orders_by_day(p)
+    @orders_line_total = orders_line_total(p)
+    @orders_total = orders_total(p)
+    @orders_adjustment_total = orders_adjustment_total(p)
+    @orders_credit_total = orders_credit_total(p)
+
+    @best_selling_variants = best_selling_variants
+    @top_grossing_variants = top_grossing_variants
+    @last_five_orders = last_five_orders
+    @biggest_spenders = biggest_spenders
+    @out_of_stock_products = out_of_stock_products
+    @best_selling_taxons = best_selling_taxons
+
+    @pie_colors = [ "#0093DA", "#FF3500", "#92DB00", "#1AB3FF", "#FFB800"]
+  end
+
+  def get_report_data
+    opts = case params[:name]
+      when "7_days" then {:from => (Time.new().to_date - 1.week).to_s(:db)}
+      when "14_days" then {:from => (Time.new().to_date - 2.week).to_s(:db)}
+      when "this_month" then {:from => Date.new(Time.now.year, Time.now.month, 1).to_s(:db), :to => Date.new(Time.now.year, Time.now.month, -1).to_s(:db)}
+      when "last_month" then {:from => (Date.new(Time.now.year, Time.now.month, 1) - 1.month).to_s(:db), :to => (Date.new(Time.now.year, Time.now.month, -1) - 1.month).to_s(:db)}
+      when "this_year" then {:from => Date.new(Time.now.year, 1, 1).to_s(:db)}
+      when "last_year" then {:from => Date.new(Time.now.year - 1, 1, 1).to_s(:db), :to => Date.new(Time.now.year - 1, 12, -1).to_s(:db)}
+    end
+
+    case params[:report]
+      when "orders_by_day"
+        opts[:value] = params[:value]
+
+        render :js => "[[" + orders_by_day(opts).map { |day| "['#{day[0]}',#{day[1]}]" }.join(",") + "]]"
+      when "orders_totals"
+        render :js => [:orders_total => orders_total(opts).to_i, :orders_line_total => orders_line_total(opts).to_i,
+          :orders_adjustment_total => orders_adjustment_total(opts).to_i, :orders_credit_total => orders_credit_total(opts).to_i ].to_json
+    end
+  end
+
+  private
+  def show_dashboard
+    Order.count > 50
+  end
+
+  def conditions(params)
+      if params.key? :to
+        ["completed_at >= ? AND completed_at <= ? AND state <> 'canceled'", params[:from], params[:to]]
+      else
+        ["completed_at >= ? AND state <> 'canceled'", params[:from]]
+      end
+  end
+
+  def fill_empty_entries(orders, params)
+    from_date = params[:from].to_date
+    to_date = (params[:to] || Time.now).to_date
+    (from_date..to_date).each do |date|
+      orders[date] ||= []
+    end
+  end
+
+  def orders_by_day(params)
+
+    if params[:value] == "Count"
+      orders = Order.select(:created_at).where(conditions(params))
+      orders = orders.group_by { |o| o.created_at.to_date }
+      fill_empty_entries(orders, params)
+      orders.keys.sort.map {|key| [key.strftime('%Y-%m-%d'), orders[key].size ]}
+    else
+      orders = Order.select([:created_at, :total]).where(conditions(params))
+      orders = orders.group_by { |o| o.created_at.to_date }
+      fill_empty_entries(orders, params)
+      orders.keys.sort.map {|key| [key.strftime('%Y-%m-%d'), orders[key].inject(0){|s,o| s += o.total} ]}
+    end
+  end
+
+  def orders_line_total(params)
+    Order.sum(:item_total, :conditions => conditions(params))
+  end
+
+  def orders_total(params)
+    Order.sum(:total, :conditions => conditions(params))
+  end
+
+  def orders_adjustment_total(params)
+    Order.sum(:adjustment_total, :conditions => conditions(params))
+  end
+
+  def orders_credit_total(params)
+    Order.sum(:credit_total, :conditions => conditions(params))
+  end
+
+  def best_selling_variants
+    li = LineItem.includes(:order).where("orders.state = 'complete'").sum(:quantity, :group => :variant_id, :order => 'sum(quantity) desc', :limit => 5)
+    variants = li.map do |v|
+      variant = Variant.find(v[0])
+      [variant.name, v[1] ]
+    end
+    variants.sort { |x,y| y[1] <=> x[1] }
+  end
+
+  def top_grossing_variants
+    prices = LineItem.includes(:order).where("orders.state = 'complete'").sum("price * quantity", :group => :variant_id, :order => 'sum(price * quantity) desc', :limit => 5)
+    variants = prices.map do |v|
+      variant = Variant.find(v[0])
+      [variant.name, v[1]]
+    end
+
+    variants.sort { |x,y| y[1] <=> x[1] }
+  end
+
+  def best_selling_taxons
+    taxonomy = Taxonomy.last
+    taxons =  Taxon.connection.select_rows("select t.name, count(li.quantity) from line_items li inner join variants v on
+           li.variant_id = v.id inner join products p on v.product_id = p.id inner join products_taxons pt on p.id = pt.product_id
+           inner join taxons t on pt.taxon_id = t.id where t.taxonomy_id = #{taxonomy.id} group by t.name order by count(li.quantity) desc limit 5;")
+  end
+
+  def last_five_orders
+    orders = Order.includes(:line_items).where("completed_at IS NOT NULL AND state <> 'canceled'").order("completed_at DESC").limit(5)
+    orders.map do |o|
+      qty = o.line_items.inject(0) {|sum,li| sum + li.quantity}
+
+      [o.email, qty, o.total]
+    end
+  end
+
+  def biggest_spenders
+    spenders = Order.sum(:total, :group => :user_id, :limit => 5, :order => "sum(total) desc", :conditions => "completed_at is not null and state <> 'canceled' and user_id is not null")
+    spenders = spenders.map do |o|
+      orders = User.find(o[0]).orders
+      qty = orders.size
+
+      [orders.first.email, qty, o[1]]
+
+    end
+
+    spenders.sort { |x,y| y[2] <=> x[2] }
+  end
+
+  def out_of_stock_products
+    Product.where(:count_on_hand => 0).limit(5)
+  end
+end

data/app/views/admin/overview/index.html.erb

@@ -0,0 +1,174 @@
+<h1><%= t("overview") %></h1>
+
+<%= hook :admin_dashboard do %>
+  <% if @show_dashboard %>
+    <div class="dashboard">
+      <div class="dashboard_left">
+      <%= hook :admin_dashboard_left do %>
+        <div class="dashboard_small_wrapper">
+          <h2><%= t('best_selling_products') %></h2>
+          <div id="best_selling_products" style="width:50%;height:170px;float:left"></div>
+          <div id="pie_legend">
+            <% @best_selling_variants.each_with_index do |v,i| %>
+              <span style="background-color:<%= @pie_colors[i] %>">&nbsp;</span>
+              <label><%= truncate v[0], :length => 27 %></label>
+              <div><%= number_with_delimiter v[1] %> <%= t(:units) %></div>
+            <% end %>
+          </div>
+
+          <h2><%= t('top_grossing_products') %></h2>
+          <div id="top_grossing_products" style="width:50%;height:170px;float:left"></div>
+          <div id="pie_legend">
+            <% @top_grossing_variants.each_with_index do |v,i| %>
+              <span style="background-color:<%= @pie_colors[i] %>">&nbsp;</span>
+              <label><%= truncate v[0], :length => 27 %></label>
+              <div><%= number_to_currency v[1], :precision => 0 %></div>
+            <% end %>
+          </div>
+
+          <h2><%= t('best_selling_taxons') %></h2>
+          <div id="best_selling_taxons" style="width:50%;height:170px;float:left"></div>
+          <div id="pie_legend">
+            <% @best_selling_taxons.each_with_index do |t,i| %>
+              <span style="background-color:<%= @pie_colors[i] %>">&nbsp;</span>
+              <label><%= truncate t[0], :length => 27 %></label>
+              <div><%= number_with_delimiter t[1] %> <%= t(:units) %></div>
+            <% end %>
+          </div>
+
+        </div>
+      </div>
+    <% end %>
+    <%= hook :admin_dashboard_center do %>
+      <div class="dashboard_main">
+        <div class="dashboard_main_wrapper">
+          <h2 id="order_by_day_title"><%= t('orders') %> <%= t('count') %> <%= t('by_day') %> (<%= t('last_7_days') %>)</h2>
+
+          <table id="order_totals">
+            <tr>
+              <td style="width:23%;">
+                <p><%= t("number.currency.format.unit") %></p>
+                <label id="orders_total"><%= number_with_delimiter @orders_total.to_i %></label>
+                <span><%= t('order') %> <%= t('total') %></span>
+              </td>
+              <td class="spacer">|</td>
+              <td style="width:23%;">
+                <p><%= t("number.currency.format.unit") %></p>
+                <label id="orders_line_total"><%= number_with_delimiter @orders_line_total.to_i %></label>
+                <span><%= t('item') %> <%= t('total') %></span>
+              </td>
+              <td class="spacer">|</td>
+              <td style="width:23%;">
+                <p><%= t("number.currency.format.unit") %></p>
+                <label id="orders_adjustment_total"><%= number_with_delimiter @orders_adjustment_total.to_i %></label>
+                <span><%= t('adjustments') %></span>
+              </td>
+              <td class="spacer">|</td>
+              <td style="width:22%">
+                <p><%= t("number.currency.format.unit") %></p>
+                <label id="orders_adjustment_total"><%= number_with_delimiter @orders_credit_total.to_i %></label>
+                <span><%= t('credits') %></span>
+              </td>
+            </tr>
+          </table>
+
+          <div id="orders_by_day" style="width:100%;height:240px;"></div>
+
+          <div id="orders_by_day_options">
+            <label><%= t('range') %>:</label>
+            <%= select_tag "orders_by_day_reports", options_for_select([[t('last_7_days'), "7_days"], [t('last_14_days'), "14_days"], [t('this_month'), "this_month"],
+                                                    [t('last_month'), "last_month"], [t('this_year'), "this_year"], [t('last_year'), "last_year"] ], "7_days") %>
+            <label><%= t('value') %>:</label>
+            <%= select_tag "orders_by_day_value", options_for_select({t('count') => 'Count', t('value') => 'Value'}, 'Count') %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+    <%= hook :admin_dashboard_right do %>
+      <div class="dashboard_right">
+          <h2><%= t('last_5_orders') %></h2>
+          <table>
+            <thead>
+              <tr>
+                <th><%= t('name') %></th>
+                <th class="text-right"><%= t('items') %></th>
+                <th class="text-right"><%= t('total') %></th>
+              </tr>
+            </thead>
+            <% @last_five_orders.each do |order| %>
+              <tr>
+                <td><%= truncate order[0], :length => 18 %></td>
+                <td class="text-right"><%= order[1] %></td>
+                <td class="text-right"><%= number_to_currency order[2] %></td>
+              </tr>
+            <% end %>
+          </table>
+
+          <h2><%= t('5_biggest_spenders') %></h2>
+          <table>
+            <thead>
+              <tr>
+                <th><%= t('name') %></th>
+                <th class="text-right"><%= t('ord_qty') %></th>
+                <th class="text-right"><%= t('ord_total') %></th>
+              </tr>
+            </thead>
+            <% @biggest_spenders.each do |order| %>
+              <tr>
+                <td><%= truncate order[0], :length => 18 %></td>
+                <td class="text-right"><%= order[1] %></td>
+                <td class="text-right"><%= number_to_currency order[2] %></td>
+              </tr>
+            <% end %>
+          </table>
+
+          <h2><%= t('out_of_stock_products') %></h2>
+          <table>
+            <thead>
+              <tr>
+                <th><%= t('name') %></th>
+              </tr>
+            </thead>
+            <% @out_of_stock_products.each do |product| %>
+              <tr>
+                <td><%= product.name %></td>
+              </tr>
+            <% end %>
+          </table>
+        </div>
+      </div>
+    <% end %>
+    <p style="clear:both;">&nbsp;</p>
+  <% else %>
+    <%= hook :admin_dashboard_welcome do %>
+      <%== t('overview_welcome') %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<% content_for :head do %>
+  <%= hook :admin_dashboard_javascript do %>
+    <% if @show_dashboard %>
+       <script type="text/javascript">
+        var orders_by_day_points = [[<%== @orders_by_day.map { |day| "[\"#{day[0]}\",#{day[1]}]" }.join(",") %>]];
+        var best_selling_variants_points = [<%== @best_selling_variants.map { |v| "[\"#{h(v[0])}\",#{v[1]}]" }.join(",") %>];
+        var top_grossing_variants_points = [<%== @top_grossing_variants.map { |v| "[\"#{h(v[0])}\",#{v[1]}]" }.join(",") %>];
+        var best_selling_taxons_points = [<%== @best_selling_taxons.map { |t| "[\"#{h(t[0])}\",#{t[1]}]" }.join(",") %>];
+
+        var orders = "<%= t(:orders) %>";
+        var by_day = "<%= t(:by_day) %>";
+
+        var pie_colors = [<%== @pie_colors.map{|c| "'#{c}'"}.join(",") %>];
+       </script>
+
+      <%= javascript_include_tag 'jqPlot/jquery.jqplot.min.js', 'jqPlot/plugins/jqplot.dateAxisRenderer.min.js', 'jqPlot/plugins/jqplot.highlighter.min.js',
+        'jqPlot/plugins/jqplot.canvasAxisTickRenderer.min.js', 'jqPlot/plugins/jqplot.canvasTextRenderer.min.js', 'jqPlot/plugins/jqplot.canvasAxisLabelRenderer.min.js',
+        'jqPlot/plugins/jqplot.pieRenderer.min.js', 'dashboard.js' %>
+    <!--[if IE]><%= javascript_include_tag 'jqPlot/excanvas.min.js' %><![endif]-->
+    <% end %>
+  <% end %>
+
+  <%= hook :admin_dashboard_stylesheet do %>
+     <%= stylesheet_link_tag 'admin/dashboard.css' %>
+  <% end %>
+<% end %>

data/config/routes.rb

@@ -0,0 +1,4 @@
+Rails.application.routes.draw do
+  match '/admin' => 'admin/overview#index', :as => :admin
+  match '/admin/overview/get_report_data' => 'admin/overview#get_report_data'
+end

data/lib/spree_dash.rb

@@ -0,0 +1,6 @@
+require 'spree_core'
+
+module SpreeDash
+  class Engine < Rails::Engine
+  end
+end

data/lib/tasks/install.rake

@@ -0,0 +1,24 @@
+namespace :spree_dash do
+  desc "Copies all migrations and assets (NOTE: This will be obsolete with Rails 3.1)"
+  task :install do
+    Rake::Task['spree_dash:install:migrations'].invoke
+    Rake::Task['spree_dash:install:assets'].invoke
+  end
+
+  namespace :install do
+
+    desc "Copies all migrations (NOTE: This will be obsolete with Rails 3.1)"
+    task :migrations do
+      # no migrations to migrate
+    end
+
+    desc "Copies all assets (NOTE: This will be obsolete with Rails 3.1)"
+    task :assets do
+      source = File.join(File.dirname(__FILE__), '..', '..', 'public')
+      destination = File.join(Rails.root, 'public')
+      puts "INFO: Mirroring assets from #{source} to #{destination}"
+      Spree::FileUtilz.mirror_files(source, destination)
+    end
+
+  end
+end

data/public/javascripts/dashboard.js

@@ -0,0 +1,143 @@
+jQuery(document).ready(function(){  
+	function number_with_delimiter(number, delimiter, separator) {
+	  try {
+	    var delimiter = delimiter || ",";
+	    var separator = separator || ".";
+
+	    var parts = number.toString().split('.');
+	    parts[0] = parts[0].replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1" + delimiter);
+	    formatted_number = parts.join(separator);
+	
+			if(formatted_number.length>=6 && formatted_number.length<=9){
+				var arr = formatted_number.split(",");
+				return arr[0] + " k";
+			}else if(formatted_number.length==10){
+				var arr = formatted_number.split(",");
+				return arr[0] + " m";
+			}else{
+				return formatted_number
+			}
+	  } catch(e) {
+	    return number
+	  }
+	}
+	
+  function handle_orders_by_day(r){
+		var new_points = eval(r);
+
+		if(new_points[0].length>0){
+			orders_by_day_settings.axes.xaxis.min = new_points[0][0][0].replace(/-/g, "/");
+			orders_by_day_settings.axes.xaxis.max = new_points[0][new_points[0].length -1][0].replace(/-/g, "/");
+		}
+	
+		orders_by_day_settings.axes.yaxis.label = jQuery("#orders_by_day_value :selected").val();
+
+		jQuery("#order_by_day_title").text(orders + " " + jQuery("#orders_by_day_value :selected").val() + " " + by_day + " (" + jQuery("#orders_by_day_reports :selected").text() + ")");
+
+		$('#orders_by_day').empty();
+		$.jqplot('orders_by_day', new_points, orders_by_day_settings);
+
+	}
+	
+	function handle_orders_total(r){
+		var values = eval(r);
+		
+		jQuery('#orders_total').text(number_with_delimiter(values[0].orders_total));
+		jQuery('#orders_line_total').text(number_with_delimiter(values[0].orders_line_total));
+		jQuery('#orders_adjustment_total').text(number_with_delimiter(values[0].orders_adjustment_total));
+		jQuery('#orders_adjustment_total').text(number_with_delimiter(values[0].orders_adjustment_total));
+	}
+
+	var orders_by_day_settings = {
+		title: {
+			textColor: '#476D9B',
+			fontSize: '12pt',
+		}, 
+		grid: {background:'#fff', gridLineColor:'#fff',borderColor: '#476D9B'},
+	  axes:{
+			yaxis:{
+				label:'Order (Count)',
+				labelRenderer: $.jqplot.CanvasAxisLabelRenderer,						
+				autoscale:true, 
+				tickOptions:{
+					formatString:'%d',
+					fontSize: '10pt',
+					textColor: '#476D9B'
+				},
+				min: 0
+			},	
+			xaxis:{	 
+				renderer:$.jqplot.DateAxisRenderer,
+				rendererOptions:{tickRenderer:$.jqplot.CanvasAxisTickRenderer},
+				tickOptions:{
+					formatString:'%b %#d, %y',
+					angle: -30,
+					fontSize: '10pt',
+					textColor: '#476D9B'
+				},
+				min: orders_by_day_points[0][0][0].replace(/-/g, "/"), 
+				max: orders_by_day_points[0][orders_by_day_points[0].length -1][0].replace(/-/g, "/")//,
+				//tickInterval: '1 day'
+			}
+		},
+		series:[{lineWidth:3, color: '#0095DA', fillAndStroke: true, fill: true, fillColor: '#E6F7FF'}],
+		highlighter: {
+			formatString: "Date: %s <br/>Value: %s ",
+			sizeAdjust: 7.5
+		}
+	};
+
+	jQuery.jqplot('orders_by_day', orders_by_day_points, orders_by_day_settings);
+
+	jQuery("div#orders_by_day_options select").change(function(){
+		var report = jQuery("#orders_by_day_reports :selected").val();
+		var value = jQuery("#orders_by_day_value :selected").val();
+	
+		jQuery.ajax({
+	       type: 'GET',
+	       url: 'admin/overview/get_report_data',
+	       data: ({report: 'orders_by_day', name: report, value: value, authenticity_token: AUTH_TOKEN}),
+	       success: handle_orders_by_day
+		});
+		
+		jQuery.ajax({
+	       type: 'GET',
+	       url: 'admin/overview/get_report_data',
+	       data: ({report: 'orders_totals', name: report, authenticity_token: AUTH_TOKEN}),
+	       success: handle_orders_total
+		});
+
+	});
+
+	best_selling_variants = $.jqplot('best_selling_products', [best_selling_variants_points], {
+		grid: {background:'#fff',borderWidth: 0, borderColor: '#fff', shadow: false},
+		seriesDefaults:{
+		  renderer:$.jqplot.PieRenderer, 
+		  rendererOptions:{padding:6,sliceMargin:0}
+		},
+		seriesColors: pie_colors
+	});
+
+
+	top_grossing_variants = $.jqplot('top_grossing_products', [top_grossing_variants_points], {
+		grid: {background:'#fff',borderWidth: 0, borderColor: '#fff', shadow: false},
+		seriesDefaults:{
+		  renderer:$.jqplot.PieRenderer, 
+		  rendererOptions:{padding:6,sliceMargin:0}
+		},
+
+		seriesColors: pie_colors
+	});
+
+	tbest_selling_taxons = $.jqplot('best_selling_taxons', [best_selling_taxons_points], {
+		grid: {background:'#fff',borderWidth: 0, borderColor: '#fff', shadow: false},
+		seriesDefaults:{
+		  renderer:$.jqplot.PieRenderer, 
+		  rendererOptions:{padding:6,sliceMargin:0}
+		},
+
+		seriesColors: pie_colors
+	});
+
+
+});