spree_dash 0.30.2 → 0.40.0

data/app/controllers/admin/overview_controller.rb

@@ -70,12 +70,12 @@ class Admin::OverviewController < Admin::BaseController
   def orders_by_day(params)
 
     if params[:value] == "Count"
-      orders = Order.find(:all, :select => 'created_at', :conditions => conditions(params))
+      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.find(:all, :select => 'total, created_at', :conditions => conditions(params))
+      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} ]}
@@ -126,7 +126,7 @@ class Admin::OverviewController < Admin::BaseController
   end
 
   def last_five_orders
-    orders = Order.find(:all, :order => "completed_at DESC", :limit => 5, :include => :line_items, :conditions => "completed_at is not null")
+    orders = Order.includes(:line_items).where("completed_at IS NOT NULL").order("completed_at DESC").limit(5)
     orders.map do |o|
       qty = o.line_items.inject(0) {|sum,li| sum + li.quantity}
 
@@ -148,6 +148,6 @@ class Admin::OverviewController < Admin::BaseController
   end
 
   def out_of_stock_products
-    Product.find(:all, :conditions => {:count_on_hand => 0}, :limit => 5)
+    Product.where(:count_on_hand => 0).limit(5)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_dash
 version: !ruby/object:Gem::Version 
-  hash: 99
-  prerelease: 
+  hash: 191
+  prerelease: false
   segments: 
   - 0
-  - 30
-  - 2
-  version: 0.30.2
+  - 40
+  - 0
+  version: 0.40.0
 platform: ruby
 authors: 
 - Brian Quinn
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-23 00:00:00 Z
+date: 2010-12-22 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
@@ -25,12 +26,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 99
+        hash: 191
         segments: 
         - 0
-        - 30
-        - 2
-        version: 0.30.2
+        - 40
+        - 0
+        version: 0.40.0
   type: :runtime
   version_requirements: *id001
 description: Required dependancy for Spree
@@ -60,6 +61,7 @@ files:
 - 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: []
 
@@ -91,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: spree_dash
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Overview dashboard for use with Spree.