spree_core 1.0.7 → 1.1.0.rc1

data/app/controllers/spree/admin/payments_controller.rb

@@ -46,7 +46,7 @@ module Spree
 
         rescue Spree::Core::GatewayError => e
           flash[:error] = "#{e.message}"
-          respond_with(@payment) { |format| format.html { redirect_to new_admin_order_payment_path(@order) } }
+          respond_with(@payment) { |format| format.html { redirect_to new_admin_payment_path(@order) } }
         end
       end
 

data/app/controllers/spree/admin/product_properties_controller.rb

@@ -5,10 +5,9 @@ module Spree
       before_filter :find_properties
 
       private
-
-      def find_properties
-        @properties = Spree::Property.all.map(&:name)
-      end
+        def find_properties
+          @properties = Spree::Property.pluck(:name)
+        end
     end
   end
 end

data/app/controllers/spree/admin/products_controller.rb

@@ -5,6 +5,7 @@ module Spree
 
       before_filter :check_json_authenticity, :only => :index
       before_filter :load_data, :except => :index
+      create.before :create_before
       update.before :update_before
 
       def show
@@ -48,67 +49,68 @@ module Spree
 
       protected
 
-      def find_resource
-        Product.find_by_permalink!(params[:id])
-      end
+        def find_resource
+          Product.find_by_permalink!(params[:id])
+        end
 
-      def location_after_save
-        edit_admin_product_url(@product)
-      end
+        def location_after_save
+          edit_admin_product_url(@product)
+        end
 
-      # Allow different formats of json data to suit different ajax calls
-      def json_data
-        json_format = params[:json_format] or 'default'
-        case json_format
-        when 'basic'
-          collection.map {|p| {'id' => p.id, 'name' => p.name}}.to_json
-        else
-          collection.to_json(:include => {:variants => {:include => {:option_values => {:include => :option_type}, 
-                                                        :images => {:only => [:id], :methods => :mini_url}}}, 
-                                                        :images => {:only => [:id], :methods => :mini_url}, :master => {}})
+        # Allow different formats of json data to suit different ajax calls
+        def json_data
+          json_format = params[:json_format] or 'default'
+          case json_format
+          when 'basic'
+            collection.map {|p| {'id' => p.id, 'name' => p.name}}.to_json
+          else
+            collection.to_json(:include => {:variants => {:include => {:option_values => {:include => :option_type}, 
+                                                          :images => {:only => [:id], :methods => :mini_url}}}, 
+                                                          :images => {:only => [:id], :methods => :mini_url}, :master => {}})
+          end
         end
-      end
 
-      def load_data
-        @tax_categories = TaxCategory.order(:name)
-        @shipping_categories = ShippingCategory.order(:name)
-      end
+        def load_data
+          @tax_categories = TaxCategory.order(:name)
+          @shipping_categories = ShippingCategory.order(:name)
+        end
 
-      def collection
-        return @collection if @collection.present?
+        def collection
+          return @collection if @collection.present?
 
-        unless request.xhr?
-          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
+          unless request.xhr?
+            params[:q] ||= {}
+            params[:q][:deleted_at_null] ||= "1"
 
-          params[:search][:meta_sort] ||= "name.asc"
-          @search = super.metasearch(params[:search])
+            params[:q][:s] ||= "name asc"
 
-          @collection = @search.relation.group_by_products_id.includes([:master, {:variants => [:images, :option_values]}]).page(params[:page]).per(Spree::Config[:admin_products_per_page])
-        else
-          includes = [{:variants => [:images,  {:option_values => :option_type}]}, :master, :images]
+            @search = super.search(params[:q])
+            @collection = @search.result.group_by_products_id.includes([:master, {:variants => [:images, :option_values]}]).page(params[:page]).per(Spree::Config[:admin_products_per_page])
+          else
+            includes = [{:variants => [:images,  {:option_values => :option_type}]}, {:master => :images}]
 
-          @collection = super.where(["name #{LIKE} ?", "%#{params[:q]}%"])
-          @collection = @collection.includes(includes).limit(params[:limit] || 10)
+            @collection = super.where(["name #{LIKE} ?", "%#{params[:q]}%"])
+            @collection = @collection.includes(includes).limit(params[:limit] || 10)
 
-          tmp = super.where(["#{Variant.table_name}.sku #{LIKE} ?", "%#{params[:q]}%"])
-          tmp = tmp.includes(:variants_including_master).limit(params[:limit] || 10)
-          @collection.concat(tmp)
+            tmp = super.where(["#{Variant.table_name}.sku #{LIKE} ?", "%#{params[:q]}%"])
+            tmp = tmp.includes(:variants_including_master).limit(params[:limit] || 10)
+            @collection.concat(tmp)
 
-          @collection.uniq
-        end
+            @collection
+          end
 
-      end
+        end
 
-      def update_before
-        # note: we only reset the product properties if we're receiving a post from the form on that tab
-        return unless params[:clear_product_properties]
-        params[:product] ||= {}
-      end
+        def create_before
+          return if params[:product][:prototype_id].blank?
+          @prototype = Spree::Prototype.find(params[:product][:prototype_id])
+        end
 
+        def update_before
+          # note: we only reset the product properties if we're receiving a post from the form on that tab
+          return unless params[:clear_product_properties]
+          params[:product] ||= {}
+        end
     end
   end
 end

data/app/controllers/spree/admin/properties_controller.rb

@@ -6,7 +6,7 @@ module Spree
       def filtered
         @properties = Property.where('lower(name) LIKE ?', "%#{params[:q].mb_chars.downcase}%").order(:name)
         respond_with(@properties) do |format| 
-          format.html { render :template => "spree/admin/properties/filtered.html.erb", :layout => false } 
+          format.html { render :template => "spree/admin/properties/filtered", :formats => [:html], :handlers => [:erb], :layout => false } 
         end
       end
     end

data/app/controllers/spree/admin/prototypes_controller.rb

@@ -3,7 +3,13 @@ module Spree
     class PrototypesController < ResourceController
       after_filter :set_habtm_associations, :only => [:create, :update]
 
-      helper 'spree/admin/product_properties'
+      def show
+        if request.xhr?
+          render :layout => false
+        else
+          redirect_to admin_prototypes_path
+        end
+      end
 
       def available
         @prototypes = Prototype.order('name asc')
@@ -21,11 +27,11 @@ module Spree
       end
 
       private
-  
-      def set_habtm_associations
-        @prototype.property_ids = params[:property][:id] if params[:property]
-        @prototype.option_type_ids = params[:option_type][:id] if params[:option_type]
-      end
+
+        def set_habtm_associations
+          @prototype.property_ids = params[:property][:id] if params[:property]
+          @prototype.option_type_ids = params[:option_type][:id] if params[:option_type]
+        end
     end
   end
 end

data/app/controllers/spree/admin/reports_controller.rb

@@ -14,32 +14,31 @@ module Spree
       end
 
       def sales_total
-        params[:search] = {} unless params[:search]
+        params[:q] = {} unless params[:q]
 
-        if params[:search][:created_at_greater_than].blank?
-          params[:search][:created_at_greater_than] = Time.zone.now.beginning_of_month
+        if params[:q][:created_at_gt].blank?
+          params[:q][:created_at_gt] = Time.zone.now.beginning_of_month
         else
-          params[:search][:created_at_greater_than] = Time.zone.parse(params[:search][:created_at_greater_than]).beginning_of_day rescue Time.zone.now.beginning_of_month
+          params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
         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 ""
+        if params[:q] && !params[:q][:created_at_lt].blank?
+          params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue ""
         end
 
-        if params[:search].delete(:completed_at_is_not_null) == "1"
-          params[:search][:completed_at_is_not_null] = true
+        if params[:q].delete(:completed_at_not_null) == "1"
+          params[:q][:completed_at_not_null] = true
         else
-          params[:search][:completed_at_is_not_null] = false
+          params[:q][:completed_at_not_null] = false
         end
 
-        params[:search][:meta_sort] ||= "created_at.desc"
+        params[:q][:meta_sort] ||= "created_at.desc"
 
-        @search = Order.metasearch(params[:search])
-        @orders = @search
-        @item_total = @search.sum(:item_total)
-        @adjustment_total = @search.sum(:adjustment_total)
-        @sales_total = @search.sum(:total)
+        @search = Order.complete.search(params[:q])
+        @orders = @search.result
+        @item_total = @orders.sum(:item_total)
+        @adjustment_total = @orders.sum(:adjustment_total)
+        @sales_total = @orders.sum(:total)
 
         respond_with
       end

data/app/controllers/spree/admin/resource_controller.rb

@@ -34,7 +34,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       end
     else
       invoke_callbacks(:update, :fails)
-      respond_with(@object, :location => [:admin, @object])
+      respond_with(@object)
     end
   end
 

data/app/controllers/spree/admin/return_authorizations_controller.rb

@@ -14,7 +14,7 @@ module Spree
 
       protected
         def associate_inventory_units
-          params[:return_quantity].each { |variant_id, qty| @return_authorization.add_variant(variant_id.to_i, qty.to_i) }
+          (params[:return_quantity] || []).each { |variant_id, qty| @return_authorization.add_variant(variant_id.to_i, qty.to_i) }
         end
     end
   end

data/app/controllers/spree/admin/shipments_controller.rb

@@ -14,9 +14,6 @@ module Spree
 
       def new
         build_shipment
-        @shipment.address ||= @order.ship_address
-        @shipment.address ||= Address.new(:country_id => Spree::Config[:default_country_id])
-        @shipment.shipping_method = @order.shipping_method
         respond_with(@shipment)
       end
 

data/app/controllers/spree/admin/states_controller.rb

@@ -13,17 +13,17 @@ module Spree
 
       protected
 
-      def location_after_save
-        admin_country_states_url(@country)
-      end
+        def location_after_save
+          admin_country_states_url(@country)
+        end
 
-      def collection
-        super.order(:name)
-      end
+        def collection
+          super.order(:name)
+        end
 
-      def load_data
-        @countries = Country.order(:name)
-      end
+        def load_data
+          @countries = Country.order(:name)
+        end
     end
   end
 end

data/app/controllers/spree/admin/users_controller.rb

@@ -4,11 +4,6 @@ module Spree
 
       # 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]
-
-      create.after :save_user_roles
-      update.before :save_user_roles
-      update.after :sign_in_if_change_own_password
 
       def index
         respond_with(@collection) do |format|
@@ -25,35 +20,25 @@ module Spree
       end
 
       protected
-      def collection
-        return @collection if @collection.present?
-        unless request.xhr?
-          @search = Spree::User.registered.metasearch(params[:search])
-          @collection = @search.relation.page(params[:page]).per(Spree::Config[:admin_products_per_page])
-        else
-          #disabling proper nested include here due to rails 3.1 bug
-          #@collection = User.includes(:bill_address => [:state, :country], :ship_address => [:state, :country]).
-          @collection = Spree::User.includes(:bill_address, :ship_address).
-                            where("spree_users.email #{LIKE} :search
-                                   OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = spree_users.bill_address_id)
-                                   OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = spree_users.bill_address_id)
-                                   OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = spree_users.ship_address_id)
-                                   OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = spree_users.ship_address_id)",
-            { :search => "#{params[:q].strip}%" }).
-              limit(params[:limit] || 100)
-          end
-        end
 
-        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] ||= {}
-          Role.all.each { |role|
-            @user.roles << role unless params[:user][:role][role.name].blank?
-          }
-          params[:user].delete(:role)
-        end
+        def collection
+          return @collection if @collection.present?
+          unless request.xhr?
+            @search = Spree::User.registered.search(params[:q])
+            @collection = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
+          else
+            #disabling proper nested include here due to rails 3.1 bug
+            #@collection = User.includes(:bill_address => [:state, :country], :ship_address => [:state, :country]).
+            @collection = Spree::User.includes(:bill_address, :ship_address).
+                              where("spree_users.email #{LIKE} :search
+                                     OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = spree_users.bill_address_id)
+                                     OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = spree_users.bill_address_id)
+                                     OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = spree_users.ship_address_id)
+                                     OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = spree_users.ship_address_id)",
+              { :search => "#{params[:q].strip}%" }).
+                limit(params[:limit] || 100)
+            end
+          end
 
       private
 
@@ -78,15 +63,6 @@ module Spree
           end
         end
 
-        def load_roles
-          @roles = Role.all
-        end
-
-        def sign_in_if_change_own_password
-          if current_user == @user && @user.password.present?
-            sign_in(@user, :event => :authentication, :bypass => true)
-          end
-        end
     end
   end
 end

data/app/controllers/spree/admin/variants_controller.rb

@@ -42,34 +42,35 @@ module Spree
       end
 
       protected
-      def create_before
-        option_values = params[:new_variant]
-        option_values.each_value {|id| @object.option_values << OptionValue.find(id)}
-        @object.save
-      end
+
+        def create_before
+          option_values = params[:new_variant]
+          option_values.each_value {|id| @object.option_values << OptionValue.find(id)}
+          @object.save
+        end
 
 
-      def new_before
-        @object.attributes = @object.product.master.attributes.except('id', 'created_at', 'deleted_at',
-                                                                      'sku', 'is_master', 'count_on_hand')
-      end
+        def new_before
+          @object.attributes = @object.product.master.attributes.except('id', 'created_at', 'deleted_at',
+                                                                        'sku', 'is_master', 'count_on_hand')
+        end
 
-      def collection
-        @deleted = (params.key?(:deleted)  && params[:deleted] == "on") ? "checked" : ""
+        def collection
+          @deleted = (params.key?(:deleted)  && params[:deleted] == "on") ? "checked" : ""
 
-        if @deleted.blank?
-          @collection ||= super
-        else
-          @collection ||= Variant.where(:product_id => parent.id).deleted
+          if @deleted.blank?
+            @collection ||= super
+          else
+            @collection ||= Variant.where(:product_id => parent.id).deleted
+          end
+          @collection
         end
-        @collection
-      end
 
-      def json_data
-        ( parent.variants.presence || [parent.master] ).map do |v|
-          { :label => v.options_text.presence || v.name, :id => v.id }
+        def json_data
+          ( parent.variants.presence || [parent.master] ).map do |v|
+            { :label => v.options_text.presence || v.name, :id => v.id }
+          end
         end
-      end
 
     end
   end

data/app/controllers/spree/admin/zones_controller.rb

@@ -10,18 +10,18 @@ module Spree
 
       protected
 
-      def collection
-        params[:search] ||= {}
-        params[:search][:meta_sort] ||= "ascend_by_name"
-        @search = super.metasearch(params[:search])
-        @zones = @search.relation.page(params[:page]).per(Spree::Config[:orders_per_page])
-      end
+        def collection
+          params[:q] ||= {}
+          params[:q][:meta_sort] ||= "ascend_by_name"
+          @search = super.search(params[:q])
+          @zones = @search.result.page(params[:page]).per(Spree::Config[:orders_per_page])
+        end
 
-      def load_data
-        @countries = Country.order(:name)
-        @states = State.order(:name)
-        @zones = Zone.order(:name)
-      end
+        def load_data
+          @countries = Country.order(:name)
+          @states = State.order(:name)
+          @zones = Zone.order(:name)
+        end
     end
   end
 end

data/app/controllers/spree/content_controller.rb

@@ -16,7 +16,7 @@ module Spree
 
     def cvv
       respond_with do |format|
-        format.html {  render 'cvv', :layout => false }
+        format.html { render 'cvv', :layout => false }
       end
     end
   end

data/app/controllers/spree/locale_controller.rb

@@ -4,8 +4,8 @@ module Spree
       if request.referer && request.referer.starts_with?('http://' + request.host)
         session['user_return_to'] = request.referer
       end
-      if params[:locale] && I18n.available_locales.map(&:to_s).include?(params[:locale])
-        session[:locale] = I18n.locale = params[:locale]
+      if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym)
+        session[:locale] = I18n.locale = params[:locale].to_sym
         flash.notice = t(:locale_changed)
       else
         flash[:error] = t(:locale_not_changed)

data/app/controllers/spree/orders_controller.rb

@@ -13,7 +13,7 @@ module Spree
     def update
       @order = current_order
       if @order.update_attributes(params[:order])
-        @order.line_items = @order.line_items.select { |li| li.quantity > 0 }
+        @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
         fire_event('spree.order.contents_changed')
         respond_with(@order) { |format| format.html { redirect_to cart_path } }
       else
@@ -63,10 +63,8 @@ module Spree
       redirect_to spree.cart_path
     end
 
-    private
-
-      def accurate_title
-        @order && @order.completed? ? "#{Order.model_name.human} #{@order.number}" : t(:shopping_cart)
-      end
+    def accurate_titles
+      @order && @order.completed? ? "#{Order.model_name.human} #{@order.number}" : t(:shopping_cart)
+    end
   end
 end

data/app/controllers/spree/products_controller.rb

@@ -13,7 +13,7 @@ module Spree
     end
 
     def show
-      @product = Product.active.find_by_permalink!(params[:id])
+      @product = Product.find_by_permalink!(params[:id])
       return unless @product
 
       @variants = Variant.active.includes([:option_values, :images]).where(:product_id => @product.id)

data/app/controllers/spree/states_controller.rb

@@ -2,15 +2,12 @@ module Spree
   class StatesController < BaseController
     ssl_allowed :index
 
+    respond_to :js
+
     def index
-      # table of {country.id => [ state.id , state.name ]}, arrays sorted by name
-      # blank is added elsewhere, if needed
       # we return ALL known information, since billing country isn't restricted
-      #   by shipping country
-      @state_info = Hash.new { |h, k| h[k] = [] }
-      Spree::State.order('name ASC').each { |state|
-        @state_info[state.country_id.to_s].push [state.id, state.name]
-      }
+      # by shipping country
+      respond_with @state_info = Spree::State.states_group_by_country_id.to_json
     end
   end
 end

data/app/helpers/spree/admin/base_helper.rb

@@ -198,6 +198,10 @@ module Spree
         f.hidden_field(:_destroy) + link_to_with_icon(:delete, name, '#', :class => 'remove_fields')
       end
 
+      def spree_dom_id(record)
+        dom_id(record, 'spree')
+      end
+
       private
         def attribute_name_for(field_name)
           field_name.gsub(' ', '_').downcase

data/app/helpers/spree/admin/navigation_helper.rb

@@ -63,7 +63,7 @@ module Spree
         options.reverse_merge! :caption => t(:are_you_sure)
         options.reverse_merge! :title => t(:confirm_delete)
         options.reverse_merge! :dataType => 'script'
-        options.reverse_merge! :success => "function(r){ $('##{dom_id resource}').fadeOut('hide'); }"
+        options.reverse_merge! :success => "function(r){ $('##{spree_dom_id resource}').fadeOut('hide'); }"
         options.reverse_merge! :error => "function(jqXHR, textStatus, errorThrown){ show_flash_error(jqXHR.responseText); }"
         options.reverse_merge! :name => icon('delete') + ' ' + t(:delete)
 
@@ -109,15 +109,15 @@ module Spree
       end
 
       def button(text, icon_name = nil, button_type = 'submit', options={})
-        content_tag('button', content_tag('span', icon(icon_name) + ' ' + text), options.merge(:type => button_type))
+        button_tag(content_tag('span', icon(icon_name) + ' ' + text), options.merge(:type => button_type))
       end
 
       def button_link_to(text, url, html_options = {})
         if (html_options[:method] &&
             html_options[:method].to_s.downcase != 'get' &&
             !html_options[:remote])
-          form_tag(url, :method => html_options[:method]) do
-            button(text, html_options[:icon])
+          form_tag(url, :method => html_options.delete(:method)) do
+            button(text, html_options.delete(:icon), nil, html_options)
           end
         else
           if html_options['data-update'].nil? && html_options[:remote]
@@ -133,18 +133,6 @@ module Spree
         link_to_function(text_for_button_link(text, html_options), function, html_options_for_button_link(html_options))
       end
 
-      # RAILS 3 TODO - no longer needed
-      # def button_link_to_remote(text, url, html_options = {})
-      #   html_options.reverse_merge! :remote => true
-      #   link_to(text_for_button_link(text, html_options), url, html_options_for_button_link(html_options))
-      # end
-      #
-      # def link_to_remote(name, options = {}, html_options = {})
-      #   options[:before] ||= "jQuery(this).parent().hide(); jQuery('#busy_indicator').show();"
-      #   options[:complete] ||= "jQuery('#busy_indicator').hide()"
-      #   link_to_function(name, remote_function(options), html_options || options.delete(:html))
-      # end
-
       def text_for_button_link(text, html_options)
         s = ''
         if html_options[:icon]