spree_core 0.30.2 → 0.40.0

data/app/controllers/admin/base_controller.rb

@@ -1,8 +1,6 @@
 class Admin::BaseController < Spree::BaseController
   ssl_required
 
-  before_filter :check_alerts if Rails.env.production?
-
   helper :search
   helper 'admin/navigation'
   layout 'admin'
@@ -10,35 +8,6 @@ class Admin::BaseController < Spree::BaseController
   before_filter :parse_date_params
 
   protected
-  def check_alerts
-    return unless current_user and should_check_alerts?
-
-    unless session.has_key? :alerts
-      begin
-        session[:alerts] = Spree::Alert.current(request.host)
-        filter_dismissed_alerts
-        Spree::Config.set :last_check_for_spree_alerts => DateTime.now.to_s
-      rescue
-        session[:alerts] = nil
-      end
-    end
-  end
-
-  def should_check_alerts?
-    return false if not Spree::Config[:check_for_spree_alerts]
-
-    last_check = Spree::Config[:last_check_for_spree_alerts]
-    return true if last_check.blank?
-
-    DateTime.parse(last_check) < 12.hours.ago
-  end
-
-  def filter_dismissed_alerts
-    return unless session[:alerts]
-    dismissed = (Spree::Config[:dismissed_spree_alerts] || '').split(',')
-    session[:alerts].reject! { |a| dismissed.include? a.id.to_s }
-  end
-
   def render_js_for_destroy
     render :partial => "/admin/shared/destroy"
     flash.notice = nil

data/app/controllers/admin/orders_controller.rb

@@ -12,7 +12,7 @@ class Admin::OrdersController < Admin::BaseController
       if !@order.line_items.empty?
         unless @order.complete?
 
-          if params[:order].key?(:use_billing)
+          if params[:order].key?(:email)
             @order.shipping_method = @order.available_shipping_methods(:front_end).first
             @order.create_shipment!
             redirect_to edit_admin_order_shipment_path(@order, @order.shipment)
@@ -37,10 +37,11 @@ class Admin::OrdersController < Admin::BaseController
     # TODO - possible security check here but right now any admin can before any transition (and the state machine
     # itself will make sure transitions are not applied in the wrong state)
     event = params[:e]
-    Order.transaction do
-      @order.send("#{event}!")
+    if @order.send("#{event}")
+      flash.notice = t('order_updated')
+    else
+      flash[:error] = t('cannot_perform_operation')
     end
-    flash.notice = t('order_updated')
   rescue Spree::GatewayError => ge
     flash[:error] = "#{ge.message}"
   ensure
@@ -76,15 +77,15 @@ class Admin::OrdersController < Admin::BaseController
       params[:search][:completed_at_not_null] = "1"
     end
 
-    if !params[:search][:created_at_greater_than].blank?
-      params[:search][:created_at_greater_than] = Time.zone.parse(params[:search][:created_at_greater_than]).beginning_of_day rescue ""
+    if !params[:search][:completed_at_greater_than].blank?
+      params[:search][:completed_at_greater_than] = Time.zone.parse(params[:search][:completed_at_greater_than]).beginning_of_day rescue ""
     end
 
-    if !params[:search][:created_at_less_than].blank?
-      params[:search][:created_at_less_than] = Time.zone.parse(params[:search][:created_at_less_than]).end_of_day rescue ""
+    if !params[:search][:completed_at_less_than].blank?
+      params[:search][:completed_at_less_than] = Time.zone.parse(params[:search][:completed_at_less_than]).end_of_day rescue ""
     end
 
-    params[:search][:order] ||= "descend_by_created_at"
+    params[:search][:order] ||= "descend_by_completed_at"
     @search = Order.searchlogic(params[:search])
 
     # QUERY - get per_page from form ever???  maybe push into model

data/app/controllers/admin/overview_controller.rb

@@ -4,7 +4,7 @@ class Admin::OverviewController < Admin::BaseController
   #todo, add rss feed of information that is happening
 
   def index
-    @users = User.find(:all)
+    @users = User.all
     #@users = User.find_with_deleted(:all, :order => 'updated_at desc')
 #  going to list today's orders, yesterday's orders, older orders
 # have a filter / search at the top

data/app/controllers/admin/products_controller.rb

@@ -73,32 +73,32 @@ class Admin::ProductsController < Admin::BaseController
   end
 
   def load_data
-    @tax_categories = TaxCategory.find(:all, :order=>"name")
-    @shipping_categories = ShippingCategory.find(:all, :order=>"name")
+    @tax_categories = TaxCategory.order(:name)
+    @shipping_categories = ShippingCategory.order(:name)
   end
 
   def collection
     return @collection if @collection.present?
-    base_scope = end_of_association_chain
+    scopes = ['group_by_products_id']
 
     unless request.xhr?
       # Note: the SL scopes are on/off switches, so we need to select "not_deleted" explicitly if the switch is off
       # QUERY - better as named scope or as SL scope?
       if params[:search].nil? || params[:search][:deleted_at_not_null].blank?
-        base_scope = base_scope.not_deleted
+        scopes << 'not_deleted'
       end
 
-      @search = base_scope.group_by_products_id.searchlogic(params[:search])
+      @search = end_of_association_chain.searchlogic(params[:search] ? params[:search].except(:deleted_at_not_null) : nil)
       @search.order ||= "ascend_by_name"
 
-      @collection = @search.do_search.paginate(:include   => {:variants => [:images, :option_values]},
+      @collection = @search.do_search.instance_eval(scopes.join(".")).paginate(:include   => {:variants => [:images, :option_values]},
                                      :per_page  => Spree::Config[:admin_products_per_page],
                                      :page      => params[:page])
     else
       includes = [{:variants => [:images,  {:option_values => :option_type}]}, :master, :images]
 
-      @collection = base_scope.where(["name LIKE ?", "%#{params[:q]}%"]).includes(includes).limit(params[:limit] || 10)
-      @collection.concat base_scope.where(["variants.sku LIKE ?", "%#{params[:q]}%"]).includes(:variants_including_master).limit(params[:limit] || 10)
+      @collection = end_of_association_chain.where(["name LIKE ?", "%#{params[:q]}%"]).includes(includes).limit(params[:limit] || 10)
+      @collection.concat end_of_association_chain.where(["variants.sku LIKE ?", "%#{params[:q]}%"]).includes(:variants_including_master).limit(params[:limit] || 10)
 
       @collection.uniq
     end

data/app/controllers/admin/properties_controller.rb

@@ -5,7 +5,7 @@ class Admin::PropertiesController < Admin::BaseController
   belongs_to :product
   
   def filtered
-    @properties = Property.find(:all, :conditions => ['lower(name) LIKE ?', "%#{params[:q].downcase}%"], :order => :name)
+    @properties = Property.where('lower(name) LIKE ?', "%#{params[:q].downcase}%").order(:name)
     render :template => "admin/properties/filtered.html.erb", :layout => false
   end
   

data/app/controllers/admin/shipments_controller.rb

@@ -26,8 +26,11 @@ class Admin::ShipmentsController < Admin::BaseController
   destroy.success.wants.js { render_js_for_destroy }
 
   def fire
-    @shipment.send("#{params[:e]}!")
-    flash.notice = t('shipment_updated')
+    if @shipment.send("#{params[:e]}")
+      flash.notice = t('shipment_updated')
+    else
+      flash[:error] = t('cannot_perform_operation')
+    end
     redirect_to :back
   end
 
@@ -48,7 +51,7 @@ class Admin::ShipmentsController < Admin::BaseController
     @shipping_methods = ShippingMethod.all_available(@order, :back_end)
 
     @states = State.find_all_by_country_id(@selected_country_id, :order => 'name')
-    @countries = available_countries
+    @countries = Country.all
   end
 
   def edit_before # copy into instance variable before editing

data/app/controllers/admin/shipping_methods_controller.rb

@@ -14,7 +14,7 @@ class Admin::ShippingMethodsController < Admin::BaseController
   end
 
   def load_data
-    @available_zones = Zone.find :all, :order => :name
+    @available_zones = Zone.order(:name)
     @calculators = ShippingMethod.calculators
     @calculators.sort_by(&:name)
   end

data/app/controllers/admin/tax_rates_controller.rb

@@ -17,8 +17,8 @@ class Admin::TaxRatesController < Admin::BaseController
     @object
   end  
   def load_data
-    @available_zones = Zone.find :all, :order => :name
-    @available_categories = TaxCategory.find :all, :order => :name
+    @available_zones = Zone.order(:name)
+    @available_categories = TaxCategory.order(:name)
     @calculators = TaxRate.calculators
   end
   

data/app/controllers/admin/taxons_controller.rb

@@ -24,11 +24,10 @@ class Admin::TaxonsController < Admin::BaseController
     if params[:q].blank?
       @available_taxons = []
     else
-      @available_taxons = Taxon.find(:all, :conditions => ['lower(name) LIKE ?', "%#{params[:q].downcase}%"])
+      @available_taxons = Taxon.where('lower(name) LIKE ?', "%#{params[:q].downcase}%")
     end
     @available_taxons.delete_if { |taxon| @product.taxons.include?(taxon) }
     respond_to do |format|
-      format.html
       format.js {render :layout => false}
     end
 

data/app/controllers/admin/users_controller.rb

@@ -40,14 +40,13 @@ class Admin::UsersController < Admin::BaseController
 
       #scope = scope.conditions "lower(email) = ?", @filter.email.downcase unless @filter.email.blank?
     else
-      @collection = User.find(:all, :include => [
-                                  {:bill_address => [:state, :country]},
-                                  {:ship_address => [:state, :country]}],
-                          :conditions => ["users.email like :search
-                                            OR addresses.firstname like :search
-                                            OR addresses.lastname like :search
-                                            OR ship_addresses_users.firstname like :search
-                                            OR ship_addresses_users.lastname like :search", {:search => "#{params[:q].strip}%"}], :limit => (params[:limit] || 100))
+      @collection = User.includes(:bill_address => [:state, :country],
+                                  :ship_address => [:state, :country]).where("users.email like :search
+                                                                               OR addresses.firstname like :search
+                                                                               OR addresses.lastname like :search
+                                                                               OR ship_addresses_users.firstname like :search
+                                                                               OR ship_addresses_users.lastname like :search",
+                                                                               {:search => "#{params[:q].strip}%"}).limit(params[:limit] || 100)
     end
   end
 

data/app/controllers/admin/variants_controller.rb

@@ -47,9 +47,9 @@ class Admin::VariantsController < Admin::BaseController
     @deleted =  (params.key?(:deleted)  && params[:deleted] == "on") ? "checked" : ""
 
     if @deleted.blank?
-      @collection ||= end_of_association_chain.active.find(:all)
+      @collection ||= end_of_association_chain.active.all
     else
-      @collection ||= end_of_association_chain.deleted.find(:all)
+      @collection ||= end_of_association_chain.deleted.all
     end
   end
 end

data/app/controllers/countries_controller.rb

@@ -4,7 +4,7 @@ class CountriesController < Spree::BaseController
   index.response do |wants|
     wants.html
     wants.js do
-      @countries = Country.find(:all, :conditions => ['lower(name) LIKE ?', "%#{params[:q].downcase}%"])
+      @countries = Country.where('lower(name) LIKE ?', "%#{params[:q].downcase}%")
     end
   end
   

data/app/controllers/locale_controller.rb

@@ -1,7 +1,7 @@
 class LocaleController < Spree::BaseController
   def set
     if request.referer && request.referer.starts_with?("http://" + request.host)
-      session[:return_to] = request.referer
+      session["user_return_to"] = request.referer
     end
     if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym)
       session[:locale] = I18n.locale = params[:locale].to_sym

data/app/controllers/spree/base_controller.rb

@@ -1,119 +1,3 @@
 class Spree::BaseController < ActionController::Base
-  layout 'spree_application'
-  helper :hook
-  before_filter :instantiate_controller_and_action_names
-  #RAILS 3 TODO
-  #before_filter :touch_sti_subclasses
-  before_filter :set_user_language
-  helper_method :title, :title=, :get_taxonomies, :current_gateway
-
-  protect_from_forgery # See ActionController::RequestForgeryProtection for details
-
-  include SslRequirement
-  include Spree::CurrentOrder
-
-  def access_forbidden
-    render :text => 'Access Forbidden', :layout => true, :status => 401
-  end
-
-  # can be used in views as well as controllers.
-  # e.g. <% title = 'This is a custom title for this view' %>
-  def title=(title)
-    @title = title
-  end
-
-  def title
-    title_string = @title.blank? ? accurate_title : @title
-    if title_string.blank?
-      default_title
-    else
-      if Spree::Config[:always_put_site_name_in_title]
-        [default_title, title_string].join(' - ')
-      else
-        title_string
-      end
-    end
-  end
-
-  protected
-
-  helper_method :current_order
-
-
-  def default_title
-    Spree::Config[:site_name]
-  end
-
-  def accurate_title
-    return nil
-  end
-
-  # def reject_unknown_object
-  #   # workaround to catch problems with loading errors for permalink ids (reconsider RC permalink hack elsewhere?)
-  #   begin
-  #     load_object
-  #   rescue Exception => e
-  #     @object = nil
-  #   end
-  #   the_object = instance_variable_get "@#{object_name}"
-  #   the_object = nil if (the_object.respond_to?(:deleted?) && the_object.deleted?)
-  #   unless params[:id].blank? || the_object
-  #     if self.respond_to? :object_missing
-  #       self.object_missing(params[:id])
-  #     else
-  #       render_404(Exception.new("missing object in #{self.class.to_s}"))
-  #     end
-  #   end
-  #   true
-  # end
-
-  def render_404(exception=nil)
-    respond_to do |type|
-      type.html { render :status => :not_found, :file    => "#{Rails.root}/public/404.html", :layout=>nil}
-      type.all  { render :status => :not_found, :nothing => true }
-    end
-  end
-
-  private
-
-  def redirect_back_or_default(default)
-    redirect_to(session[:return_to] || default)
-    session[:return_to] = nil
-  end
-
-  def instantiate_controller_and_action_names
-    @current_action = action_name
-    @current_controller = controller_name
-  end
-
-  def get_taxonomies
-    @taxonomies ||= Taxonomy.find(:all, :include => {:root => :children})
-    @taxonomies.reject { |t| t.root.nil? }
-  end
-
-  def current_gateway
-    @current_gateway ||= Gateway.current
-  end
-
-  #RAILS 3 TODO
-  # # Load all models using STI to fix associations such as @order.credits giving no results and resulting in incorrect order totals
-  # def touch_sti_subclasses
-  #   if Rails.env == 'development'
-  #     load(File.join(SPREE_ROOT,'config/initializers/touch.rb'))
-  #   end
-  # end
-
-  def set_user_language
-    locale = session[:locale] || Spree::Config[:default_locale]
-    locale = I18n.default_locale unless I18n.available_locales.include?(locale.to_sym)
-    I18n.locale = locale.to_sym
-  end
-  
-  helper_method :available_countries
-  
-  def available_countries
-    return Country.all unless zone = Zone.find_by_name(Spree::Config[:checkout_zone])
-    zone.country_list
-  end
-  
+  include SpreeBase
 end

data/app/controllers/states_controller.rb

@@ -8,7 +8,7 @@ class StatesController < Spree::BaseController
     # we return ALL known information, since billing country isn't restricted
     #   by shipping country
     @state_info = Hash.new {|h, k| h[k] = []}
-    State.find(:all, :order => "name ASC").each{|state|
+    State.order("name ASC").each{|state|
       @state_info[state.country_id.to_s].push [state.id, state.name]
     }
   end

data/app/helpers/spree/base_helper.rb

@@ -68,13 +68,7 @@ module Spree::BaseHelper
   end
 
   def stylesheet_tags(paths=stylesheet_paths)
-    output = ''
-    if !paths.blank?
-      paths.each do |path|
-        output << stylesheet_link_tag(path)
-      end
-    end
-    return output
+    paths.blank? ? '' : stylesheet_link_tag(paths, :cache => true)
   end
 
   def stylesheet_paths

data/app/helpers/taxons_helper.rb

@@ -19,11 +19,11 @@ module TaxonsHelper
   # that we can use configurations as well as make it easier for end users to override this determination.  One idea is
   # to show the most popular products for a particular taxon (that is an exercise left to the developer.)
   def taxon_preview(taxon, max=5)
-    products = taxon.products.active.find(:all, :limit => max)
+    products = taxon.products.active.limit(max)
     if (products.size < max) && Spree::Config[:show_descendents]
       taxon.descendants.each do |taxon|
         to_get = max - products.length
-        products += taxon.products.active.find(:all, :limit => to_get)
+        products += taxon.products.active.limit(to_get)
         break if products.size >= max
       end
     end

data/app/models/app_configuration.rb

@@ -35,9 +35,6 @@ class AppConfiguration < Configuration
   preference :cache_static_content, :boolean, :default => true
   preference :use_content_controller, :boolean, :default => true
   preference :allow_checkout_on_gateway_error, :boolean, :default => false
-  preference :check_for_spree_alerts, :boolean, :default => true
-  preference :dismissed_spree_alerts, :string, :default => ''
-  preference :last_check_for_spree_alerts, :string, :default => nil
 
   validates :name, :presence => true, :uniqueness => true
 

data/app/models/calculator/flat_percent_item_total.rb

@@ -13,6 +13,7 @@ class Calculator::FlatPercentItemTotal < Calculator
   def compute(object)
     return unless object.present? and object.line_items.present?
     item_total = object.line_items.map(&:amount).sum
-    item_total * self.preferred_flat_percent / 100.0
+    value = item_total * self.preferred_flat_percent / 100.0
+    (value * 100).round.to_f / 100
   end
 end