spree_core 0.60.6 → 0.70.RC1

data/app/assets/stylesheets/store/screen.css

@@ -0,0 +1,122 @@
+body {
+  padding: 0 1em;
+}
+
+/* Header */
+
+div#header {
+  margin-bottom: 1em;
+}
+
+div#header ul#nav-bar {
+  line-height: 50px;
+  float: right;
+  clear: both;
+  font-size: 1.2em;
+  list-style: none;
+  margin: 0;
+}
+
+div#header ul#nav-bar li {
+  padding: 0 0 0 1em;
+  display: table-cell;
+  vertical-align: middle;
+  height: 82px;
+}
+
+
+/* Sidebar */
+
+div#sidebar {
+  float: left;
+  height: 100%;
+  max-width: 25%;
+}
+
+/* Content */
+
+div#content {
+  float: left;
+}
+
+body.two-col div#content {
+  float: left;
+  max-width: 75%;
+}
+
+div#footer {
+  clear: both;
+}
+
+ul#products {
+  list-style: none;
+  margin: 0 auto;
+}
+
+ul#products li {
+  float: left;
+  text-align: center;
+  width: 200px;
+  height: 150px;
+  padding: 0 10px 20px 10px;
+}
+
+ul#products li img {
+  display: block;
+  margin: auto;
+}
+
+button, a.button, input.button {
+  display: inline-block;
+  width: auto;
+  height: auto;
+  cursor: pointer;
+  margin: 0px;
+  padding: 3px;
+  text-decoration: none;
+  font-size: 1em;
+  color: inherit;
+}
+
+button img, a.button img, input.button img {
+  vertical-align: middle;
+  margin-right: 5px;
+}
+
+div#subtotal { float: right; }
+
+div#product-variants ul li label { cursor: pointer; }
+div#product-images { width: 50%; }
+div#product-images, div#main-image, div#cart-form { float: left; }
+div#product-description { float: none; clear: both; }
+
+ul.thumbnails, #breadcrumbs ul {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+ul.thumbnails li {
+  width: 48px;
+  height: 48px;
+  margin-right: 4px;
+  margin-bottom: 4px;
+  min-height: 48px;
+  padding: 0;
+  float: none;
+  display: inline-block;
+  position: relative;
+  border: 1px solid silver;
+}
+#breadcrumbs ul li { display: inline-block; }
+
+dl.table-display dt { float: left; min-width: 200px; padding: 3px 5px; }
+dl.table-display dd { padding: 3px; }
+dl#product-price dt { float: left; padding: 0 10px 0 0; font-size: 14pt; }
+dl#product-price dd { font-size: 14pt; }
+
+.even { background: #EEE;}
+.odd { background: #DDD;}
+.hidden { display: none; }
+
+div.inner input[type=text], div.inner select { width: 90%; }
+span.req { color: red; padding-left: 0.25em; }

data/app/assets/stylesheets/store/spree_core.css

@@ -0,0 +1,5 @@
+/*
+ * This is a manifest file that includes stylesheets for spree_core
+ *= require store/reset
+ *= require store/screen 
+*/

data/app/controllers/admin/base_controller.rb

@@ -1,42 +1,12 @@
 class Admin::BaseController < Spree::BaseController
   ssl_required
 
-  before_filter :check_alerts if Rails.env.production?
-
   helper :search
   helper 'admin/navigation'
   layout 'admin'
 
   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 flash_message_for(object, event_sym)
     resource_desc  = object.class.model_name.human
     resource_desc += " \"#{object.name}\"" if object.respond_to?(:name)
@@ -50,8 +20,9 @@ class Admin::BaseController < Spree::BaseController
   # Index request for JSON needs to pass a CSRF token in order to prevent JSON Hijacking
   def check_json_authenticity
     return unless request.format.js? or request.format.json?
+    return unless protect_against_forgery?
     auth_token = params[request_forgery_protection_token]
-    unless (auth_token and form_authenticity_token == auth_token.gsub(' ', '+'))
+    unless (auth_token and form_authenticity_token == URI.unescape(auth_token))
       raise(ActionController::InvalidAuthenticityToken)
     end
   end

data/app/controllers/admin/general_settings_controller.rb

@@ -1,22 +1,21 @@
 class Admin::GeneralSettingsController < Admin::BaseController
 
-  def update
-    Spree::Config.set(params[:preferences])
-
-    respond_to do |format|
-      format.html {
-        redirect_to admin_general_settings_path
-      }
-    end
+  def show
+    @preferences = ['site_name', 'default_seo_title', 'default_meta_keywords',
+                    'default_meta_description', 'site_url']
+  end
+  
+  def edit
+    @preferences = ['site_name', 'default_seo_title', 'default_meta_keywords',
+                    'default_meta_description', 'site_url', 'allow_ssl_in_production',
+                    'allow_ssl_in_development_and_test']
   end
 
-  def dismiss_alert
-    if request.xhr? and params[:alert_id]
-      dismissed = Spree::Config[:dismissed_spree_alerts] || ''
-      Spree::Config.set :dismissed_spree_alerts => dismissed.split(',').push(params[:alert_id]).join(',')
-      filter_dismissed_alerts
-      render :nothing => true
-    end
+  def update
+    @config = Spree::Config.instance
+    @config.update_attributes(params[@config.class.name.underscore])
+    Rails.cache.delete("configuration_#{@config.class.name}".to_sym)
+    redirect_to admin_general_settings_path
   end
 
 end

data/app/controllers/admin/line_items_controller.rb

@@ -3,7 +3,7 @@ class Admin::LineItemsController < Admin::BaseController
   before_filter :load_order
   before_filter :load_line_item, :only => [:destroy, :update]
 
-  respond_to :html
+  respond_to :html, :js
 
   def create
     variant = Variant.find(params[:line_item][:variant_id])

data/app/controllers/admin/mail_methods_controller.rb

@@ -1,6 +1,19 @@
 class Admin::MailMethodsController < Admin::ResourceController
   after_filter :initialize_mail_settings
 
+  def testmail
+    @mail_method = MailMethod.find(params[:id])
+    if TestMailer.test_email(@mail_method, current_user).deliver
+      flash[:notice] = t("admin.mail_methods.testmail.delivery_success")
+    else
+      flash[:error] = t("admin.mail_methods.testmail.delivery_error")
+    end
+  rescue Exception => e
+    flash[:error] = t("admin.mail_methods.testmail.error") % {:e => e}
+  ensure
+    respond_with(@mail_method) { |format| format.html { redirect_to :back } }
+  end
+
   private
   def initialize_mail_settings
     Spree::MailSettings.init

data/app/controllers/admin/option_types_controller.rb

@@ -31,8 +31,7 @@ class Admin::OptionTypesController < Admin::ResourceController
   # AJAX method for selecting an existing option type and associating with the current product
   def select
     @product = Product.find_by_param!(params[:product_id])
-    product_option_type = ProductOptionType.new(:product => @product, :option_type => OptionType.find(params[:id]))
-    product_option_type.save
+    @product.option_types << OptionType.find(params[:id])
     @product.reload
     @option_types = @product.option_types
     set_available_option_types

data/app/controllers/admin/orders_controller.rb

@@ -27,11 +27,7 @@ class Admin::OrdersController < Admin::BaseController
       params[:search][:completed_at_less_than] = params[:search].delete(:created_at_less_than)
     end
 
-    @orders = Order.metasearch(params[:search]).paginate(
-                                   :include  => [:user, :shipments, :payments],
-                                   :per_page => Spree::Config[:orders_per_page],
-                                   :page     => params[:page])
-
+    @orders = Order.metasearch(params[:search]).includes([:user, :shipments, :payments]).page(params[:page]).per(Spree::Config[:orders_per_page])
     respond_with(@orders)
   end
 
@@ -55,11 +51,16 @@ class Admin::OrdersController < Admin::BaseController
     load_order
     if @order.update_attributes(params[:order]) && @order.line_items.present?
       unless @order.complete?
-      
         if params[:order].key?(:email)
           shipping_method = @order.available_shipping_methods(:front_end).first
           if shipping_method
             @order.shipping_method = shipping_method
+
+            if params[:guest_checkout] == 'false' && params[:user_id].present?
+              @order.user_id = params[:user_id]
+              @order.user true
+            end
+            @order.save
             @order.create_shipment!
             return_path = edit_admin_order_shipment_path(@order, @order.shipment)
           else
@@ -69,14 +70,14 @@ class Admin::OrdersController < Admin::BaseController
         else
           return_path = user_admin_order_path(@order)
         end
-        
+
       else
         return_path = admin_order_path(@order)
       end
     else
       @order.errors.add(:line_items, t('errors.messages.blank'))
     end
-    
+
     respond_with(@order) do |format|
       format.html do
         if return_path

data/app/controllers/admin/product_groups_controller.rb

@@ -21,8 +21,7 @@ class Admin::ProductGroupsController < Admin::ResourceController
       params[:search] ||= {}
       params[:search][:meta_sort] ||= "name.asc"
       @search = super.metasearch(params[:search])
-      @collection = @search.paginate( :per_page => Spree::Config[:per_page],
-                                      :page     => params[:page])
+      @collection = @search.relation.page(params[:page]).per(Spree::Config[:per_page])
     end
     
   private

data/app/controllers/admin/products_controller.rb

@@ -62,7 +62,9 @@ class Admin::ProductsController < Admin::ResourceController
     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 => {}}}, :images => {}, :master => {}})
+      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
 
@@ -84,11 +86,7 @@ class Admin::ProductsController < Admin::ResourceController
       params[:search][:meta_sort] ||= "name.asc"
       @search = super.metasearch(params[:search])
 
-      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)
+      @collection = @search.relation.group_by_products_id.includes({:variants => [:images, :option_values]}).page(params[:page]).per(Spree::Config[:admin_products_per_page])
     else
       includes = [{:variants => [:images,  {:option_values => :option_type}]}, :master, :images]
 

data/app/controllers/admin/prototypes_controller.rb

@@ -7,6 +7,7 @@ class Admin::PrototypesController < Admin::ResourceController
     @prototypes = Prototype.order('name asc')
     respond_with(@prototypes) do |format|
       format.html { render :layout => !request.xhr? }
+      format.js
     end
   end
 

data/app/controllers/admin/resource_controller.rb

@@ -1,12 +1,13 @@
 require 'spree_core/action_callbacks'
 class Admin::ResourceController < Admin::BaseController
   helper_method :new_object_url, :edit_object_url, :object_url, :collection_url
-  before_filter :load_resource
+  prepend_before_filter :load_resource
 
   respond_to :html
   respond_to :js, :except => [:show, :index]
 
   def new
+    invoke_callbacks(:new_action, :before)
     respond_with(@object) do |format|
       format.html { render :layout => !request.xhr? }
       format.js { render :layout => false }
@@ -80,6 +81,11 @@ class Admin::ResourceController < Admin::BaseController
       @parent_data[:find_by] = options[:find_by] || :id
     end
 
+    def new_action
+      @callbacks ||= {}
+      @callbacks[:new_action] ||= Spree::ActionCallbacks.new
+    end
+
     def create
       @callbacks ||= {}
       @callbacks[:create] ||= Spree::ActionCallbacks.new

data/app/controllers/admin/shipments_controller.rb

@@ -40,7 +40,7 @@ class Admin::ShipmentsController < Admin::BaseController
     assign_inventory_units
     if @shipment.update_attributes params[:shipment]
       # copy back to order if instructions are enabled
-      @order.special_instructions = object_params[:special_instructions] if Spree::Config[:shipping_instructions]
+      @order.special_instructions = params[:shipment][:special_instructions] if Spree::Config[:shipping_instructions]
       @order.shipping_method = @order.shipment.shipping_method
       @order.save
 

data/app/controllers/admin/states_controller.rb

@@ -5,7 +5,7 @@ class Admin::StatesController < Admin::ResourceController
   def index
     respond_with(@collection) do |format|
       format.html
-      format.js  { render :partial => 'state_list.html.erb' }
+      format.js { render :partial => 'state_list' }
     end
   end
 

data/app/controllers/admin/tax_categories_controller.rb

@@ -1,2 +1,8 @@
 class Admin::TaxCategoriesController < Admin::ResourceController
+
+  def index
+    if Spree::Config[:show_price_inc_vat] and (TaxCategory.where(:is_default => true).count != 1)
+      flash.notice = "You should configure exactly one default category with your countries default tax rate"
+    end
+  end
 end

data/app/controllers/admin/taxons_controller.rb

@@ -18,15 +18,6 @@ class Admin::TaxonsController < Admin::BaseController
     end
   end
 
-  def update
-    update_before
-    update_after
-    respond_with(@taxon) do |format|
-      format.html { redirect_to edit_admin_taxonomy_url(@taxonomy) }
-      format.json { render :json => @taxon.to_json }
-    end
-  end
-
   def edit
     @taxonomy = Taxonomy.find(params[:taxonomy_id])
     @taxon = @taxonomy.taxons.find(params[:id])

data/app/controllers/admin/users_controller.rb

@@ -19,9 +19,11 @@ class Admin::UsersController < Admin::ResourceController
     return @collection if @collection.present?
     unless request.xhr?
       @search = User.registered.metasearch(params[:search])
-      @collection = @search.paginate(:per_page => Spree::Config[:admin_products_per_page], :page => params[:page])
+      @collection = @search.relation.page(params[:page]).per(Spree::Config[:admin_products_per_page])
     else
-      @collection = User.includes(:bill_address => [:state, :country], :ship_address => [:state, :country]).
+      #disabling proper nested include here due to rails 3.1 bug
+      #@collection = User.includes(:bill_address => [:state, :country], :ship_address => [:state, :country]).
+      @collection = User.includes(:bill_address, :ship_address).
                         where("users.email #{LIKE} :search
                                OR addresses.firstname #{LIKE} :search
                                OR addresses.lastname #{LIKE} :search
@@ -52,9 +54,11 @@ class Admin::UsersController < Admin::ResourceController
     when 'basic'
       collection.map {|u| {'id' => u.id, 'name' => u.email}}.to_json
     else
-      collection.to_json(:include =>
-        {:bill_address => {:include => [:state, :country]},
-        :ship_address => {:include => [:state, :country]}})
+      address_fields = [:firstname, :lastname, :address1, :address2, :city, :zipcode, :phone, :state_name, :state_id, :country_id]
+      includes = {:only => address_fields , :include => {:state => {:only => :name}, :country => {:only => :name}}}
+
+      collection.to_json(:only => [:id, :email], :include => 
+        {:bill_address => includes, :ship_address => includes})
     end
   end