spree_dash 0.30.0.beta1 → 0.30.0

data/app/controllers/admin/overview_controller.rb

@@ -1,6 +1,7 @@
 # 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
@@ -57,7 +58,7 @@ class Admin::OverviewController < Admin::BaseController
         ["completed_at >= ?", params[:from]]
       end
   end
-  
+
   def fill_empty_entries(orders, params)
     from_date = params[:from].to_date
     to_date = (params[:to] || Time.now).to_date
@@ -129,7 +130,7 @@ class Admin::OverviewController < Admin::BaseController
     orders.map do |o|
       qty = o.line_items.inject(0) {|sum,li| sum + li.quantity}
 
-      [o.name, qty, o.total]
+      [o.email, qty, o.total]
     end
   end
 
@@ -139,7 +140,7 @@ class Admin::OverviewController < Admin::BaseController
       orders = User.find(o[0]).orders
       qty = orders.size
 
-      [orders.first.name, qty, o[1]]
+      [orders.first.email, qty, o[1]]
 
     end
 

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

@@ -97,7 +97,7 @@
             </thead>
             <% @last_five_orders.each do |order| %>
               <tr>
-                <td><%= order[0] %></td>
+                <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>
@@ -141,7 +141,7 @@
     <p style="clear:both;">&nbsp;</p>
   <% else %>
     <%= hook :admin_dashboard_welcome do %>
-      <%= t('overview_welcome') %>
+      <%= raw t('overview_welcome') %>
     <% end %>
   <% end %>
 <% end %>
@@ -160,12 +160,12 @@
 
         var pie_colors = [<%= raw @pie_colors.map{|c| "'#{c}'"}.join(",") %>];
        </script>
-    <% end %>
 
-    <%= javascript_include_tag 'jqPlot/jquery.jqplot.min.js', 'jqPlot/plugins/jqplot.dateAxisRenderer.min.js', 'jqPlot/plugins/jqplot.highlighter.min.js',
+      <%= 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 %>

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_dash
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: 103
+  prerelease: false
   segments: 
   - 0
   - 30
   - 0
-  - beta1
-  version: 0.30.0.beta1
+  version: 0.30.0
 platform: ruby
 authors: 
 - Brian Quinn
@@ -15,22 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 -04:00
+date: 2010-11-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 103
         segments: 
         - 0
         - 30
         - 0
-        - beta1
-        version: 0.30.0.beta1
+        version: 0.30.0
   type: :runtime
   version_requirements: *id001
 description: Required dependancy for Spree
@@ -47,19 +48,19 @@ files:
 - app/controllers/admin/overview_controller.rb
 - app/views/admin/overview/index.html.erb
 - config/routes.rb
-- lib/generators/spree_dash/install_generator.rb
-- lib/generators/templates/public/javascripts/dashboard.js
-- lib/generators/templates/public/javascripts/jqPlot/excanvas.min.js
-- lib/generators/templates/public/javascripts/jqPlot/jquery.jqplot.min.js
-- lib/generators/templates/public/javascripts/jqPlot/plugins/jqplot.canvasAxisLabelRenderer.min.js
-- lib/generators/templates/public/javascripts/jqPlot/plugins/jqplot.canvasAxisTickRenderer.min.js
-- lib/generators/templates/public/javascripts/jqPlot/plugins/jqplot.canvasTextRenderer.min.js
-- lib/generators/templates/public/javascripts/jqPlot/plugins/jqplot.categoryAxisRenderer.min.js
-- lib/generators/templates/public/javascripts/jqPlot/plugins/jqplot.dateAxisRenderer.min.js
-- lib/generators/templates/public/javascripts/jqPlot/plugins/jqplot.highlighter.min.js
-- lib/generators/templates/public/javascripts/jqPlot/plugins/jqplot.pieRenderer.min.js
-- lib/generators/templates/public/stylesheets/admin/dashboard.css
 - lib/spree_dash.rb
+- lib/tasks/install.rake
+- public/javascripts/dashboard.js
+- public/javascripts/jqPlot/excanvas.min.js
+- public/javascripts/jqPlot/jquery.jqplot.min.js
+- public/javascripts/jqPlot/plugins/jqplot.canvasAxisLabelRenderer.min.js
+- public/javascripts/jqPlot/plugins/jqplot.canvasAxisTickRenderer.min.js
+- public/javascripts/jqPlot/plugins/jqplot.canvasTextRenderer.min.js
+- public/javascripts/jqPlot/plugins/jqplot.categoryAxisRenderer.min.js
+- public/javascripts/jqPlot/plugins/jqplot.dateAxisRenderer.min.js
+- public/javascripts/jqPlot/plugins/jqplot.highlighter.min.js
+- public/javascripts/jqPlot/plugins/jqplot.pieRenderer.min.js
+- public/stylesheets/admin/dashboard.css
 has_rdoc: true
 homepage: http://spreecommerce.com
 licenses: []
@@ -70,27 +71,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: 
 - none
 rubyforge_project: spree_dash
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Overview dashboard for use with Spree.

data/lib/generators/spree_dash/install_generator.rb

@@ -1,14 +0,0 @@
-module SpreeDash
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../templates", __FILE__)
-
-      desc "Configures an existing Rails application to use spree_dashboard"
-
-      def copy_public
-        directory "public"
-      end
-
-    end
-  end
-end