spree_core 0.40.4 → 0.50.0

data/app/controllers/admin/prototypes_controller.rb

@@ -1,52 +1,52 @@
 class Admin::PrototypesController < Admin::BaseController
   resource_controller
   after_filter :set_habtm_associations, :only => [:create, :update]
-  
+
   helper 'admin/product_properties'
-  
+
   def available
-    @prototypes = Prototype.all
+    @prototypes = Prototype.order('name asc')
     respond_to do |wants|
       wants.html { render :layout => !request.xhr? }
     end
   end
-  
+
   def select
     load_object
     @prototype_properties = @prototype.properties
   end
-  
+
   new_action.response do |wants|
     wants.html {
       render :action => :new, :layout => !request.xhr?
     }
   end
-    
+
   # redirect to index (instead of r_c default of show view)
-  update.response do |wants| 
+  update.response do |wants|
     wants.html {redirect_to collection_url}
   end
-  
+
   # redirect to index (instead of r_c default of show view)
-  create.response do |wants| 
+  create.response do |wants|
     wants.html {redirect_to collection_url}
   end
-  
+
   destroy.success.wants.js { render_js_for_destroy }
-  
+
   private
   def set_habtm_associations
     object.property_ids = params[:property][:id] if params[:property]
     object.option_type_ids = params[:option_type][:id] if params[:option_type]
-  end  
+  end
 
   def specified_rights(type)
     rights = []
-    key = "#{type}_ids".to_sym     
+    key = "#{type}_ids".to_sym
     params[:permission][key] ||= []
     params[:permission][key].each do |id|
-      rights << type.classify.constantize.find(id) 
+      rights << type.classify.constantize.find(id)
     end
     rights
-  end  
+  end
 end

data/app/controllers/admin/reports_controller.rb

@@ -19,22 +19,23 @@ class Admin::ReportsController < Admin::BaseController
     end
 
     if params[:search] && !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 ""
+      params[:search][:created_at_less_than] =
+                                      Time.zone.parse(params[:search][:created_at_less_than]).end_of_day rescue ""
     end
 
-    params[:search][:completed_at_not_null] ||= "1"
-    if params[:search].delete(:completed_at_not_null) == "1"
-      params[:search][:completed_at_not_null] = true
+    if params[:search].delete(:completed_at_is_not_null) == "1"
+      params[:search][:completed_at_is_not_null] = true
+    else
+      params[:search][:completed_at_is_not_null] = false
     end
 
-    params[:search][:order] ||= "descend_by_created_at"
-    
-    @search = Order.searchlogic(params[:search])
-    @orders = @search.do_search
+    params[:search][:meta_sort] ||= "created_at.desc"
 
-    @item_total = @search.do_search.sum(:item_total)
-    @adjustment_total = @search.do_search.sum(:adjustment_total)
-    @sales_total = @search.do_search.sum(:total)
+    @search = Order.metasearch(params[:search])
+    @orders = @search
+    @item_total = @search.sum(:item_total)
+    @adjustment_total = @search.sum(:adjustment_total)
+    @sales_total = @search.sum(:total)
   end
 
   private

data/app/controllers/admin/shipments_controller.rb

@@ -46,12 +46,7 @@ class Admin::ShipmentsController < Admin::BaseController
 
   def load_data
     load_object
-    @selected_country_id ||= @order.bill_address.country_id unless @order.nil? || @order.bill_address.nil?
-    @selected_country_id ||= Spree::Config[:default_country_id]
     @shipping_methods = ShippingMethod.all_available(@order, :back_end)
-
-    @states = State.find_all_by_country_id(@selected_country_id, :order => 'name')
-    @countries = Country.all
   end
 
   def edit_before # copy into instance variable before editing

data/app/controllers/admin/shipping_categories_controller.rb

@@ -1,16 +1,16 @@
-class Admin::ShippingCategoriesController < Admin::BaseController    
+class Admin::ShippingCategoriesController < Admin::BaseController
   resource_controller
-  
+
   layout 'admin'
-  
+
   update.response do |wants|
     wants.html { redirect_to collection_url }
   end
-  
+
   create.response do |wants|
     wants.html { redirect_to collection_url }
   end
-  
+
   destroy.success.wants.js { render_js_for_destroy }
-  
+
 end

data/app/controllers/admin/shipping_methods_controller.rb

@@ -15,7 +15,6 @@ class Admin::ShippingMethodsController < Admin::BaseController
 
   def load_data
     @available_zones = Zone.order(:name)
-    @calculators = ShippingMethod.calculators
-    @calculators.sort_by(&:name)
+    @calculators = ShippingMethod.calculators.sort_by(&:description)
   end
 end

data/app/controllers/admin/states_controller.rb

@@ -1,9 +1,9 @@
 class Admin::StatesController < Admin::BaseController
   resource_controller
-  
+
   belongs_to :country
   before_filter :load_data
-  
+
   index.response do |wants|
     wants.html
     wants.js do
@@ -14,17 +14,17 @@ class Admin::StatesController < Admin::BaseController
   new_action.response do |wants|
     wants.html {render :layout => !request.xhr?}
   end
-  
-  create.wants.html { redirect_to admin_country_states_url(@country) } 
-  update.wants.html { redirect_to admin_country_states_url(@country) } 
 
-  private 
-  
-    def collection 
-      @collection ||= end_of_association_chain.order_by_name 
-    end  
-    
+  create.wants.html { redirect_to admin_country_states_url(@country) }
+  update.wants.html { redirect_to admin_country_states_url(@country) }
+
+  private
+
+    def collection
+      @collection ||= end_of_association_chain.order('name')
+    end
+
     def load_data
-      @countries = Country.order_by_name
+      @countries = Country.order('name')
     end
 end

data/app/controllers/admin/tax_categories_controller.rb

@@ -1,6 +1,6 @@
 class Admin::TaxCategoriesController < Admin::BaseController
   resource_controller
-  
+
   create.response do |wants|
     wants.html { redirect_to collection_url }
   end
@@ -8,6 +8,6 @@ class Admin::TaxCategoriesController < Admin::BaseController
   update.response do |wants|
     wants.html { redirect_to collection_url }
   end
-  
+
   destroy.success.wants.js { render_js_for_destroy }
 end

data/app/controllers/admin/tax_rates_controller.rb

@@ -1,31 +1,31 @@
 class Admin::TaxRatesController < Admin::BaseController
   resource_controller
   before_filter :load_data
-                                                          
+
   create.success.wants.html { redirect_to collection_url }
-  update.success.wants.html { redirect_to collection_url }   
+  update.success.wants.html { redirect_to collection_url }
   destroy.success.wants.js { render_js_for_destroy }
-  
+
   update.after :update_after
   create.after :create_after
-    
-  private 
+
+  private
   def build_object
     @object ||= end_of_association_chain.send((parent? ? :build : :new), object_params)
     @object.calculator = params[:tax_rate][:calculator_type].constantize.new if params[:tax_rate]
     @object.calculator ||= Calculator::SalesTax.new
     @object
-  end  
+  end
   def load_data
     @available_zones = Zone.order(:name)
     @available_categories = TaxCategory.order(:name)
     @calculators = TaxRate.calculators
   end
-  
+
   def update_after
     Rails.cache.delete('vat_rates')
   end
-  
+
   def create_after
     Rails.cache.delete('vat_rates')
   end

data/app/controllers/admin/tax_settings_controller.rb

@@ -2,7 +2,7 @@ class Admin::TaxSettingsController < Admin::BaseController
 
   def update
     Spree::Config.set(params[:preferences])
-    
+
     respond_to do |format|
       format.html {
         redirect_to admin_tax_settings_path

data/app/controllers/admin/taxonomies_controller.rb

@@ -1,16 +1,16 @@
 class Admin::TaxonomiesController < Admin::BaseController
   resource_controller
-  
+
   create.wants.html {redirect_to edit_admin_taxonomy_url(@taxonomy)}
   update.wants.html {redirect_to collection_url}
-  
+
   edit.response do |wants|
     wants.html
     wants.js do
       render :partial => 'edit.html.erb'
     end
   end
-  
+
   def get_children
     @taxons = Taxon.find(params[:parent_id]).children
   end

data/app/controllers/admin/taxons_controller.rb

@@ -24,7 +24,7 @@ class Admin::TaxonsController < Admin::BaseController
     if params[:q].blank?
       @available_taxons = []
     else
-      @available_taxons = Taxon.where('lower(name) LIKE ?', "%#{params[:q].downcase}%")
+      @available_taxons = Taxon.where('lower(name) LIKE ?', "%#{params[:q].mb_chars.downcase}%")
     end
     @available_taxons.delete_if { |taxon| @product.taxons.include?(taxon) }
     respond_to do |format|
@@ -113,13 +113,6 @@ class Admin::TaxonsController < Admin::BaseController
     end
   end
 
-  def reposition_taxons(taxons)
-    taxons.each_with_index do |taxon, i|
-      taxon.position = i
-      taxon.save!
-    end
-  end
-
   def load_permalink_part
     @permalink_part = object.permalink.split("/").last
   end

data/app/controllers/admin/trackers_controller.rb

@@ -3,5 +3,5 @@ class Admin::TrackersController < Admin::BaseController
 
   update.wants.html { redirect_to collection_url }
   create.wants.html { redirect_to collection_url }
-    
+
 end

data/app/controllers/admin/users_controller.rb

@@ -1,5 +1,7 @@
 class Admin::UsersController < Admin::BaseController
   resource_controller
+
+  # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
   before_filter :check_json_authenticity, :only => :index
   before_filter :load_roles, :only => [:edit, :new, :update, :create]
 
@@ -31,17 +33,12 @@ class Admin::UsersController < Admin::BaseController
   def collection
     return @collection if @collection.present?
     unless request.xhr?
-      @search = User.searchlogic(params[:search])
-
-      #set order by to default or form result
-      @search.order ||= "ascend_by_email"
-
-      @collection = @search.do_search.paginate(:per_page => Spree::Config[:admin_products_per_page], :page => params[:page])
+      @search = User.registered.metasearch(params[:search])
+      @collection = @search.paginate(:per_page => Spree::Config[:admin_products_per_page], :page => params[:page])
 
       #scope = scope.conditions "lower(email) = ?", @filter.email.downcase unless @filter.email.blank?
     else
-      @collection = User.includes(:bill_address => [:state, :country],
-                                  :ship_address => [:state, :country]).where("users.email like :search
+      @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
@@ -56,9 +53,9 @@ class Admin::UsersController < Admin::BaseController
 
   def save_user_roles
     return unless params[:user]
+    return unless @user.respond_to?(:roles) # since roles are technically added by the auth module
     @user.roles.delete_all
     params[:user][:role] ||= {}
-    params[:user][:role][:user] = 1     # all new accounts have user role
     Role.all.each { |role|
       @user.roles << role unless params[:user][:role][role.name].blank?
     }

data/app/controllers/admin/variants_controller.rb

@@ -35,6 +35,17 @@ class Admin::VariantsController < Admin::BaseController
       format.js  { render_js_for_destroy }
     end
   end
+  
+  def update_positions
+    params[:positions].each do |id, index|
+      Variant.update_all(['position=?', index], ['id=?', id])
+    end
+    
+    respond_to do |format|
+      format.html { redirect_to admin_product_variants_url(params[:product_id]) }
+      format.js  { render :text => 'Ok' }
+    end
+  end
 
   private
   def create_before
@@ -47,9 +58,9 @@ class Admin::VariantsController < Admin::BaseController
     @deleted =  (params.key?(:deleted)  && params[:deleted] == "on") ? "checked" : ""
 
     if @deleted.blank?
-      @collection ||= end_of_association_chain.active.all
+      @collection ||= end_of_association_chain
     else
-      @collection ||= end_of_association_chain.deleted.all
+      @collection ||= Variant.where(:product_id => @product.id).deleted
     end
   end
 end

data/app/controllers/admin/zones_controller.rb

@@ -1,6 +1,6 @@
 class Admin::ZonesController < Admin::BaseController
-  resource_controller  
-  
+  resource_controller
+
   before_filter :load_data
 
   create.response do |wants|
@@ -10,22 +10,22 @@ class Admin::ZonesController < Admin::BaseController
   update.response do |wants|
     wants.html { redirect_to collection_url }
   end
-  
+
   destroy.success.wants.js { render_js_for_destroy }
-  
+
   private
   def build_object
     @object ||= end_of_association_chain.send parent? ? :build : :new, object_params
-    @object.zone_members.build() if @object.zone_members.empty?  
+    @object.zone_members.build() if @object.zone_members.empty?
     @object
   end
 
   def collection
     params[:search] ||= {}
-    params[:search][:order] ||= "ascend_by_name"
-    @search = end_of_association_chain.searchlogic(params[:search])
-    @collection = @search.do_search.paginate(:per_page => Spree::Config[:orders_per_page], :page => params[:page])
-  end  
+    params[:search][:meta_sort] ||= "ascend_by_name"
+    @search = end_of_association_chain.metasearch(params[:search])
+    @collection = @search.paginate(:per_page => Spree::Config[:orders_per_page], :page => params[:page])
+  end
 
   def load_data
     @countries = Country.all.sort

data/app/controllers/checkout_controller.rb

@@ -17,7 +17,7 @@ class CheckoutController < Spree::BaseController
         redirect_to checkout_state_path(@order.state) and return
       end
 
-      if @order.state == "complete" or @order.completed?
+      if @order.state == "complete" || @order.completed?
         flash[:notice] = I18n.t(:order_processed_successfully)
         flash[:commerce_tracking] = "nothing special"
         redirect_to completion_route
@@ -64,8 +64,8 @@ class CheckoutController < Spree::BaseController
   end
 
   def before_address
-    @order.bill_address ||= Address.new(:country => default_country)
-    @order.ship_address ||= Address.new(:country => default_country)
+    @order.bill_address ||= Address.new(:country_id => default_country_id)
+    @order.ship_address ||= Address.new(:country_id => default_country_id)
   end
 
   def before_delivery
@@ -81,8 +81,8 @@ class CheckoutController < Spree::BaseController
     session[:order_id] = nil
   end
 
-  def default_country
-    Country.find Spree::Config[:default_country_id]
+  def default_country_id
+    Spree::Config[:default_country_id]
   end
 
   def rescue_from_spree_gateway_error