spree_core 0.40.4 → 0.50.0

data/README.md

@@ -7,4 +7,9 @@ Create the test site
 
 Run the tests
 
-    rake spec
+    rake spec
+
+Run the coverage. After the rake task open coverage/index.html
+
+    rake rcov
+

data/app/controllers/admin/base_controller.rb

@@ -1,44 +1,11 @@
 class Admin::BaseController < Spree::BaseController
   ssl_required
 
-  before_filter :check_alerts if Rails.env.production?
-
   helper :search
   helper 'admin/navigation'
   layout 'admin'
 
-  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
@@ -57,28 +24,4 @@ class Admin::BaseController < Spree::BaseController
   #   return access_denied unless object.editable_by?(current_user)
   #   true
   # end
-
-  private
-  def parse_date_params
-    params.each do |k, v|
-      parse_date_params_for(v) if v.is_a?(Hash)
-    end
-  end
-
-  def parse_date_params_for(hash)
-    dates = []
-    hash.each do |k, v|
-      parse_date_params_for(v) if v.is_a?(Hash)
-      if k =~ /\(\di\)$/
-        param_name = k[/^\w+/]
-        dates << param_name
-      end
-    end
-    if (dates.size > 0)
-      dates.uniq.each do |date|
-        hash[date] = [hash.delete("#{date}(1i)"), hash.delete("#{date}(2i)"), hash.delete("#{date}(3i)")].join('-')
-      end
-    end
-  end
 end
-

data/app/controllers/admin/configurations_controller.rb

@@ -1,6 +1,6 @@
 class Admin::ConfigurationsController < Admin::BaseController
   before_filter :initialize_extension_links, :only => :index
-  
+
   class << self
     def add_link(text, path, description)
       unless @@extension_links.any?{|link| link[:link_text] == text}

data/app/controllers/admin/general_settings_controller.rb

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

data/app/controllers/admin/images_controller.rb

@@ -1,7 +1,7 @@
 class Admin::ImagesController < Admin::BaseController
   resource_controller
   before_filter :load_data
-  
+
   new_action.response do |wants|
     wants.html {render :action => :new, :layout => false}
   end
@@ -13,22 +13,32 @@ class Admin::ImagesController < Admin::BaseController
   update.response do |wants|
     wants.html {redirect_to admin_product_images_url(@product)}
   end
-  
+
   create.before :set_viewable
   update.before :set_viewable
   destroy.before :destroy_before
-  
-  destroy.response do |wants| 
+
+  destroy.response do |wants|
     wants.html do
       render :text => ""
     end
   end
- 
+
+  def update_positions
+    params[:positions].each do |id, index|
+      Image.update_all(['position=?', index], ['id=?', id])
+    end
+
+    respond_to do |format|
+      format.js  { render :text => 'Ok' }
+    end
+  end
+
   private
 
   def load_data
     @product = Product.find_by_permalink(params[:product_id])
-    @variants = @product.variants.collect do |variant| 
+    @variants = @product.variants.collect do |variant|
       [variant.options_text, variant.id ]
     end
     @variants.insert(0, [I18n.t("all"), "All"])
@@ -46,8 +56,8 @@ class Admin::ImagesController < Admin::BaseController
       object.viewable = @product
     end
   end
-  
-  def destroy_before 
+
+  def destroy_before
     @viewable = object.viewable
   end
 

data/app/controllers/admin/inventory_settings_controller.rb

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

data/app/controllers/admin/mail_settings_controller.rb

@@ -3,7 +3,7 @@ class Admin::MailSettingsController < Admin::BaseController
   def update
     Spree::Config.set(params[:preferences])
     Spree::Preferences::MailSettings.init
-    
+
     respond_to do |format|
       format.html {
         redirect_to admin_mail_settings_path

data/app/controllers/admin/option_types_controller.rb

@@ -20,6 +20,17 @@ class Admin::OptionTypesController < Admin::BaseController
     redirect_to selected_admin_product_option_types_url(@product)
   end
 
+  def update_positions
+    params[:positions].each do |id, index|
+      OptionType.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
+
   new_action.response do |wants|
     wants.html {render :action => :new, :layout => !request.xhr?}
   end

data/app/controllers/admin/orders_controller.rb

@@ -68,30 +68,26 @@ class Admin::OrdersController < Admin::BaseController
 
   def collection
     params[:search] ||= {}
-
-    if params[:search].present?
-      if params[:search].delete(:completed_at_not_null) == "1"
-        params[:search][:completed_at_not_null] = "1"
-      end
-    else
-      params[:search][:completed_at_not_null] = "1"
+    @show_only_completed = params[:search][:completed_at_is_not_null].present?
+    params[:search][:meta_sort] ||= @show_only_completed ? 'completed_at.desc' : 'created_at.desc'
+    
+    @search = Order.metasearch(params[:search])
+    
+    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 ""
     end
-
-    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 ""
+   
+    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 ""
     end
 
-    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 ""
+    if @show_only_completed
+      params[:search][:completed_at_greater_than] = params[:search].delete(:created_at_greater_than)
+      params[:search][:completed_at_less_than] = params[:search].delete(:created_at_less_than)
     end
-
-    params[:search][:order] ||= "descend_by_completed_at"
-    @search = Order.searchlogic(params[:search])
-
-    # QUERY - get per_page from form ever???  maybe push into model
-    # @search.per_page ||= Spree::Config[:orders_per_page]
-
-    @collection = @search.do_search.paginate(:include  => [:user, :shipments, :payments],
+    
+    @collection = Order.metasearch(params[:search]).paginate(
+                                   :include  => [:user, :shipments, :payments],
                                    :per_page => Spree::Config[:orders_per_page],
                                    :page     => params[:page])
   end

data/app/controllers/admin/overview_controller.rb

@@ -8,7 +8,7 @@ class Admin::OverviewController < Admin::BaseController
     #@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
-    # @orders, @ 
+    # @orders, @
   end
 
 end

data/app/controllers/admin/payment_methods_controller.rb

@@ -7,19 +7,19 @@ class Admin::PaymentMethodsController < Admin::BaseController
   update.wants.html { redirect_to edit_object_url }
   create.wants.html { redirect_to edit_object_url }
 
-  private       
+  private
   def build_object
 		if params[:payment_method] && params[:payment_method][:type]
-			@object ||= params[:payment_method][:type].constantize.send parent? ? :build : :new, object_params 
+			@object ||= params[:payment_method][:type].constantize.send parent? ? :build : :new, object_params
 		else
-			@object ||= end_of_association_chain.send parent? ? :build : :new, object_params 
+			@object ||= end_of_association_chain.send parent? ? :build : :new, object_params
 		end
   end
-  
-  def load_data   
+
+  def load_data
     @providers = Gateway.providers
   end
-  
+
   def update_before
 		if params[:payment_method] && params[:payment_method][:type] && @object['type'].to_s != params[:payment_method][:type]
 			@object.update_attribute(:type, params[:payment_method][:type])

data/app/controllers/admin/product_groups_controller.rb

@@ -1,10 +1,10 @@
 class Admin::ProductGroupsController < Admin::BaseController
   resource_controller
-  
-  create.response do |wants| 
+
+  create.response do |wants|
     wants.html { redirect_to edit_object_path }
   end
-  update.response do |wants| 
+  update.response do |wants|
     wants.html { redirect_to edit_object_path }
     wants.js { render :action => 'update', :layout => false}
   end
@@ -15,14 +15,14 @@ class Admin::ProductGroupsController < Admin::BaseController
     render :partial => 'preview', :layout => false
   end
 
-  
+
   private
 
     # Consolidate argument arrays for nested product_scope attributes
     # Necessary for product scopes with multiple arguments
     def object_params
       if params["product_group"] and params["product_group"]["product_scopes_attributes"].is_a?(Array)
-        params["product_group"]["product_scopes_attributes"] = params["product_group"]["product_scopes_attributes"].group_by {|a| a["id"]}.map do |scope_id, attrs| 
+        params["product_group"]["product_scopes_attributes"] = params["product_group"]["product_scopes_attributes"].group_by {|a| a["id"]}.map do |scope_id, attrs|
           a = { "id" => scope_id, "arguments" => attrs.map{|a| a["arguments"] }.flatten }
           if name = attrs.first["name"]
             a["name"] = name
@@ -34,12 +34,11 @@ class Admin::ProductGroupsController < Admin::BaseController
     end
 
     def collection
-      @search = ProductGroup.searchlogic(params[:search])
-
-      @collection = @search.do_search.paginate(
-        :per_page => Spree::Config[:per_page],
-        :page     => params[:page]
-      )
+      params[:search] ||= {}
+      params[:search][:meta_sort] ||= "name.desc"
+      @search = ProductGroup.metasearch(params[:search])
+      @collection = @search.paginate( :per_page => Spree::Config[:per_page],
+                                      :page     => params[:page])
     end
 
 end

data/app/controllers/admin/product_properties_controller.rb

@@ -1,13 +1,13 @@
 class Admin::ProductPropertiesController < Admin::BaseController
   resource_controller
   before_filter :find_properties
-  
-  # note: we're using attribute_fu to manage the product_properties so the products controller will be 
-  # doing most of the work  
+
+  # note: we're using attribute_fu to manage the product_properties so the products controller will be
+  # doing most of the work
   belongs_to :product
-  
+
   private
-  
+
   def find_properties
     @properties = Property.all.map(&:name).join(" ")
   end

data/app/controllers/admin/product_scopes_controller.rb

@@ -2,18 +2,26 @@ class Admin::ProductScopesController < Admin::BaseController
   helper 'admin/product_groups'
 
   resource_controller
-  
+
   belongs_to :product_group
-  
+
   actions :create, :destroy
   
-  create.response do |wants| 
+  destroy.after :update_memberships
+
+  create.response do |wants|
     wants.html { redirect_to edit_admin_product_group_path(parent_object) }
     wants.js { render :action => 'create', :layout => false}
   end
-  destroy.response do |wants| 
+  destroy.response do |wants|
     wants.html { redirect_to edit_admin_product_group_path(parent_object) }
     wants.js { render :action => 'destroy', :layout => false}
   end
   
+  private
+  
+  def update_memberships
+    object.product_group.update_memberships
+  end
+
 end

data/app/controllers/admin/products_controller.rb

@@ -79,26 +79,31 @@ class Admin::ProductsController < Admin::BaseController
 
   def collection
     return @collection if @collection.present?
-    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?
-        scopes << 'not_deleted'
+      params[:search] ||= {}
+      # Note: the MetaSearch scopes are on/off switches, so we need to select "not_deleted" explicitly if the switch is off
+      if params[:search][:deleted_at_is_null].nil?
+        params[:search][:deleted_at_is_null] = "1"
       end
 
-      @search = end_of_association_chain.searchlogic(params[:search] ? params[:search].except(:deleted_at_not_null) : nil)
-      @search.order ||= "ascend_by_name"
+      params[:search][:meta_sort] ||= "name.asc"
+      @search = end_of_association_chain.metasearch(params[:search])
 
-      @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])
+      pagination_options = {:include   => {:variants => [:images, :option_values]},
+                            :per_page  => Spree::Config[:admin_products_per_page],
+                            :page      => params[:page]}
+
+      @collection = @search.relation.group_by_products_id.paginate(pagination_options)
     else
       includes = [{:variants => [:images,  {:option_values => :option_type}]}, :master, :images]
 
-      @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 = end_of_association_chain.where(["name LIKE ?", "%#{params[:q]}%"])
+      @collection = @collection.includes(includes).limit(params[:limit] || 10)
+
+      tmp = end_of_association_chain.where(["variants.sku LIKE ?", "%#{params[:q]}%"])
+      tmp = tmp.includes(:variants_including_master).limit(params[:limit] || 10)
+      @collection.concat(tmp)
 
       @collection.uniq
     end

data/app/controllers/admin/properties_controller.rb

@@ -1,25 +1,25 @@
 class Admin::PropertiesController < Admin::BaseController
   resource_controller
-  
+
   before_filter :load_object, :only => :filtered
   belongs_to :product
-  
+
   def filtered
-    @properties = Property.where('lower(name) LIKE ?', "%#{params[:q].downcase}%").order(:name)
+    @properties = Property.where('lower(name) LIKE ?', "%#{params[:q].mb_chars.downcase}%").order(:name)
     render :template => "admin/properties/filtered.html.erb", :layout => false
   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