spree 0.10.2 → 0.11.0

data/app/controllers/password_resets_controller.rb

@@ -10,10 +10,10 @@ class PasswordResetsController < Spree::BaseController
     @user = User.find_by_email(params[:email])
     if @user
       @user.deliver_password_reset_instructions!
-      flash[:notice] = t("password_reset_instructions_are_mailed")
+      self.notice = t("password_reset_instructions_are_mailed")
       redirect_to root_url
     else
-      flash[:notice] = t("no_user_found")
+      flash[:error] = t("no_user_found")
       render :action => :new
     end
   end
@@ -26,7 +26,7 @@ class PasswordResetsController < Spree::BaseController
     @user.password = params[:user][:password]
     @user.password_confirmation = params[:user][:password_confirmation]
     if @user.save
-      flash[:notice] = t("password_updated")
+      self.notice = t("password_updated")
       redirect_to account_url
     else
       render :action => :edit
@@ -37,7 +37,7 @@ class PasswordResetsController < Spree::BaseController
     def load_user_using_perishable_token
       @user = User.find_using_perishable_token(params[:id])
       unless @user
-        flash[:notice] = t("password_reset_token_not_found")
+        self.notice = t("password_reset_token_not_found")
         redirect_to root_url
       end
     end

data/app/controllers/products_controller.rb

@@ -10,12 +10,6 @@ class ProductsController < Spree::BaseController
 
   include Spree::Search
 
-  def change_image
-    @product = Product.available.find_by_param(params[:id])
-    img = Image.find(params[:image_id])
-    render :partial => 'image', :locals => {:image => img}
-  end
-
   private
 
   def load_data

data/app/controllers/spree/base_controller.rb

@@ -3,6 +3,7 @@ class Spree::BaseController < ActionController::Base
   helper :application, :hook
   before_filter :instantiate_controller_and_action_names
   before_filter :touch_sti_subclasses
+  before_filter :set_user_language
   filter_parameter_logging :password, :password_confirmation, :number, :verification_value
   helper_method :current_user_session, :current_user, :title, :title=, :get_taxonomies, :current_gateway
 
@@ -106,7 +107,7 @@ class Spree::BaseController < ActionController::Base
   def require_user
     unless current_user
       store_location
-      flash[:notice] = I18n.t("page_only_viewable_when_logged_in")
+      self.notice = I18n.t("page_only_viewable_when_logged_in")
       redirect_to new_user_session_url
       return false
     end
@@ -115,7 +116,7 @@ class Spree::BaseController < ActionController::Base
   def require_no_user
     if current_user
       store_location
-      flash[:notice] = I18n.t("page_only_viewable_when_logged_out")
+      self.notice = I18n.t("page_only_viewable_when_logged_out")
       redirect_to root_url
       return false
     end
@@ -183,4 +184,10 @@ class Spree::BaseController < ActionController::Base
     end
   end
 
+  def set_user_language
+    locale = session[:locale] || Spree::Config[:default_locale] || I18n.default_locale
+    locale = AVAILABLE_LOCALES.keys.include?(locale) ? locale : I18n.default_locale
+    I18n.locale = locale
+  end
+
 end

data/app/controllers/user_sessions_controller.rb

@@ -3,19 +3,19 @@ class UserSessionsController < Spree::BaseController
   before_filter :require_user, :only => :destroy
   ssl_required :new, :create, :destroy, :update
   ssl_allowed :login_bar
-    
+
   def new
     @user_session = UserSession.new
   end
 
   def create
-    not_need_user_auto_creation = 
+    not_need_user_auto_creation =
         user_without_openid(params[:user_session]) ||
         user_with_openid_exists?(:openid_identifier => params['openid.identity']) ||
-        user_with_openid_exists?(params[:user_session]) 
+        user_with_openid_exists?(params[:user_session])
 
     if not_need_user_auto_creation
-      create_user_session(params[:user_session])   
+      create_user_session(params[:user_session])
     else
       create_user(params[:user_session])
     end
@@ -24,25 +24,25 @@ class UserSessionsController < Spree::BaseController
   def destroy
     current_user_session.destroy
     session.clear
-    flash[:notice] = t("logged_out")
+    self.notice = t("logged_out")
     redirect_to products_path
   end
-  
+
   def nav_bar
     render :partial => "shared/nav_bar"
   end
-  
+
   private
-  
+
   def user_with_openid_exists?(data)
     data && !data[:openid_identifier].blank? &&
       !!User.find(:first, :conditions => ["openid_identifier LIKE ?", "%#{data[:openid_identifier]}%"])
   end
-  
+
   def user_without_openid(data)
     data && data[:openid_identifier].blank?
   end
-  
+
   def create_user_session(data)
     @user_session = UserSession.new(data)
     @user_session.save do |result|
@@ -50,10 +50,10 @@ class UserSessionsController < Spree::BaseController
         # Should restore last uncompleted order and add current(guest) order to it, if exists.
         order = @user_session.record.orders.last(:conditions => {:completed_at => nil})
         if order
-          if (session[:order_token] && guest_order = Order.find_by_token(session[:order_token]))
+          if (session[:order_token] && guest_order = Order.find(:first, :conditions => {:token => session[:order_token], :user_id => nil, :completed_at => nil}))
             guest_order.line_items.each do |line_item|
               order.add_variant(line_item.variant, line_item.quantity)
-            end  
+            end
             order.save
             session[:return_to].gsub!(guest_order.number, order.number) if session[:return_to]
             guest_order.destroy
@@ -61,10 +61,10 @@ class UserSessionsController < Spree::BaseController
           session[:order_token] = order.token
           session[:order_id] = order.id
         end
-        
+
         respond_to do |format|
           format.html {
-            flash[:notice] = t("logged_in_succesfully") unless session[:return_to]
+            self.notice = t("logged_in_succesfully") unless session[:return_to]
             redirect_back_or_default products_path
           }
           format.js {
@@ -84,16 +84,16 @@ class UserSessionsController < Spree::BaseController
     end
     redirect_back_or_default(products_path) unless performed?
   end
-  
+
   def create_user(data)
     @user = User.new(data)
 
     @user.save do |result|
       if result
-        flash[:notice] = t(:user_created_successfully) unless session[:return_to]
+        self.notice = t(:user_created_successfully) unless session[:return_to]
         redirect_back_or_default products_url
       else
-        flash[:notice] = t(:missing_required_information)
+        self.notice = t(:missing_required_information)
         redirect_to :controller => :users, :action => :new, :user => {:openid_identifier => @user.openid_identifier}
       end
     end
@@ -102,5 +102,5 @@ class UserSessionsController < Spree::BaseController
   def accurate_title
     I18n.t(:log_in)
   end
-  
+
 end

data/app/controllers/users_controller.rb

@@ -14,7 +14,7 @@ class UsersController < Spree::BaseController
 	  @user = User.new(params[:user])
 	  @user.save do |result|
 	    if result
-	      flash[:notice] = t(:user_created_successfully) unless session[:return_to]
+	      self.notice = t(:user_created_successfully) unless session[:return_to]
 	      @user.roles << Role.find_by_name("admin") unless admin_created?
 	      respond_to do |format|
 	        format.html { redirect_back_or_default products_url }
@@ -35,7 +35,7 @@ class UsersController < Spree::BaseController
   def update
     @user = current_user
     if @user.update_attributes(params[:user])
-      flash[:notice] = t("account_updated")
+      self.notice = t("account_updated")
       redirect_to account_url
     else
       render :action => :edit

data/app/helpers/admin/base_helper.rb

@@ -27,7 +27,10 @@ module Admin::BaseHelper
     if error_message_on :product, :name
     end
   end
-
+  
+  #You can add additional_fields to the product and variant models. See section 4.2 here: http://spreecommerce.com/documentation/extensions.html 
+  #If you do choose to add additional_fields, you can utilize the :use parameter to set the input type for any such fields. For example, :use => 'check_box'
+  #In the event that you add this functionality, the following method takes care of rendering the proper input type and logic for the supported input-types, which are text_field, check_box, radio_button, and select.
   def get_additional_field_value(controller, field)
     attribute = attribute_name_for(field[:name])
 
@@ -75,7 +78,7 @@ module Admin::BaseHelper
 
   def remove_nested(fields)
     out = ''
-    out << fields.hidden_field(:_delete) unless fields.object.new_record?
+    out << fields.hidden_field(:_destroy) unless fields.object.new_record?
     out << (link_to icon("delete"), "#", :class => "remove")
     out
   end

data/app/helpers/admin/navigation_helper.rb

@@ -106,7 +106,7 @@ module Admin::NavigationHelper
   def text_for_button_link(text, html_options)
     s = ''
     if html_options[:icon]
-      s << icon(html_options.delete(:icon)) + ' &nbsp; '
+      s << icon(html_options.delete(:icon)) + ' '
     end
     s << text
     content_tag('span', s)

data/app/helpers/admin/orders_helper.rb

@@ -19,17 +19,4 @@ module Admin::OrdersHelper
     links.join(' ')
   end
 
-  def generate_html(form_builder, method, options = {})
-    options[:object] ||= form_builder.object.class.reflect_on_association(method).klass.new
-    options[:partial] ||= method.to_s.singularize
-    options[:form_builder_local] ||= :f
-
-    form_builder.fields_for(method, options[:object], :child_index => 'NEW_RECORD') do |f|
-      render(:partial => options[:partial], :locals => { options[:form_builder_local] => f })
-    end
-  end
-
-  def generate_template(form_builder, method, options = {})
-    escape_javascript generate_html(form_builder, method, options)
-  end
 end

data/app/helpers/admin/products_helper.rb

@@ -8,12 +8,4 @@ module Admin::ProductsHelper
   def pv_tag_id(product_value)
     "product-property-value-#{product_value.id}"
   end
-
-  def exclusive_properties(product, properties)
-    product.property_values.each do |pv|
-      properties.delete(pv.property)
-    end
-    properties
-  end
-
 end

data/app/helpers/checkouts_helper.rb

@@ -1,7 +1,8 @@
 module CheckoutsHelper
 
   def checkout_progress
-    steps = Checkout.state_names.reject { |n| n == "complete" }.map do |state|
+    steps = Checkout.state_names.reject { |n| n == "complete" }
+    items = steps.map do |state|
       next if state == "confirm" and not Gateway.current.payment_profiles_supported?
       text = t("checkout_steps.#{state}")
 
@@ -17,14 +18,13 @@ module CheckoutsHelper
       css_classes << 'next' if state_index == current_index + 1
       css_classes << 'current' if state == @checkout.state
       css_classes << 'first' if state_index == 0
-      css_classes << 'last' if state_index == Checkout.state_names.length - 1
-
+      css_classes << 'last' if state_index == steps.length - 1
       # It'd be nice to have separate classes but combining them with a dash helps out for IE6 which only sees the last class
       content_tag('li', content_tag('span', text), :class => css_classes.join('-'))
     end
-    content_tag('ol', steps.join("\n"), :class => 'progress-steps', :id => "checkout-step-#{@checkout.state}") + '<br clear="left" />'
+    content_tag('ol', items.join("\n"), :class => 'progress-steps', :id => "checkout-step-#{@checkout.state}")
   end
-  
+    
   def billing_firstname
     @checkout.bill_address.firstname  rescue ''
   end

data/app/helpers/products_helper.rb

@@ -46,16 +46,4 @@ module ProductsHelper
     return product_url(product)
   end
 
-  # Generate taxon breadcrumbs for searching related products
-  def taxon_crumbs(taxon, separator=" » ")
-    crumbs = []
-
-    crumbs << taxon.ancestors.collect { |ancestor|
-      content_tag(:li, link_to(ancestor.name , seo_url(ancestor)) + separator)
-    } unless taxon.ancestors.empty?
-
-    crumbs << content_tag(:li, link_to(taxon.name , seo_url(taxon)))
-    crumb_list = content_tag(:ul, crumbs)
-    content_tag(:div, crumb_list + content_tag(:br, nil, :class => 'clear'), :class => 'breadcrumbs')
-  end
 end

data/app/helpers/spree/base_helper.rb

@@ -39,24 +39,6 @@ module Spree::BaseHelper
     options.delete(:format_as_currency) ? number_to_currency(amount) : amount
   end
 
-
-  def add_product_link(text, product)
-    link_to_remote text, {:url => {:controller => "cart",
-              :action => "add", :id => product}},
-              {:title => "Add to Cart",
-               :href => url_for( :controller => "cart",
-                          :action => "add", :id => product)}
-  end
-
-  def remove_product_link(text, product)
-    link_to_remote text, {:url => {:controller => "cart",
-                       :action => "remove",
-                       :id => product}},
-                       {:title => "Remove item",
-                         :href => url_for( :controller => "cart",
-                                     :action => "remove", :id => product)}
-  end
-
   def todays_short_date
     utc_to_local(Time.now.utc).to_ordinalized_s(:stub)
   end
@@ -73,27 +55,16 @@ module Spree::BaseHelper
     list
   end
 
-  def mini_image(product, options={})
-    if product.images.empty?
-      image_tag "noimage/mini.jpg", options
-    else
-      image_tag product.images.first.attachment.url(:mini), options
-    end
-  end
-
-  def small_image(product, options={})
-    if product.images.empty?
-      image_tag "noimage/small.jpg", options
-    else
-      image_tag product.images.first.attachment.url(:small), options
-    end
-  end
-
-  def product_image(product, options={})
-    if product.images.empty?
-      image_tag "noimage/product.jpg", options
-    else
-      image_tag product.images.first.attachment.url(:product), options
+  [:mini, :small, :product, :large].each do |style|
+    define_method "#{style}_image" do |product, *options|
+      options = options.first || {}
+      if product.images.empty?
+        image_tag "noimage/#{style}.jpg", options
+      else
+        image = product.images.first
+        options.reverse_merge! :alt => image.alt.blank? ? product.name : image.alt
+        image_tag image.attachment.url(style), options
+      end
     end
   end
 

data/app/helpers/taxons_helper.rb

@@ -1,6 +1,7 @@
 module TaxonsHelper
   def breadcrumbs(taxon, separator=" » ")
     return "" if current_page?("/")
+    separator = raw(separator)
     crumbs = [content_tag(:li, link_to(t(:home) , root_path) + separator)]
     if taxon
       crumbs << content_tag(:li, link_to(t('products') , products_path) + separator)

data/app/models/address.rb

@@ -2,7 +2,8 @@ class Address < ActiveRecord::Base
   belongs_to :country
   belongs_to :state
 
-  has_many :checkouts, :foreign_key => "bill_address_id"
+  has_many :billing_checkouts, :foreign_key => "bill_address_id", :class_name => "Checkout"
+  has_many :shipping_checkouts, :foreign_key => "ship_address_id", :class_name => "Checkout"
   has_many :shipments
 
   validates_presence_of :firstname
@@ -16,6 +17,10 @@ class Address < ActiveRecord::Base
   validates_presence_of :phone
   validate :state_name_validate, :if => Proc.new { |address| address.state.blank? && Spree::Config[:address_requires_state] }
 
+  def checkouts
+    (billing_checkouts + shipping_checkouts).uniq
+  end
+
   # disconnected since there's no code to display error messages yet OR matching client-side validation
   def phone_validate
     return if phone.blank?

data/app/models/app_configuration.rb

@@ -9,47 +9,48 @@ class AppConfiguration < Configuration
   preference :mail_host, :string, :default => 'localhost'
   preference :mail_domain, :string, :default => 'localhost'
   preference :mail_port, :integer, :default => 25
-  preference :mail_auth_type, :string, :default => MAIL_AUTH[0] 
+  preference :mail_auth_type, :string, :default => MAIL_AUTH[0]
   preference :smtp_username, :string
   preference :smtp_password, :string
-  preference :secure_connection_type, :string, :default => SECURE_CONNECTION_TYPES[0] 
+  preference :secure_connection_type, :string, :default => SECURE_CONNECTION_TYPES[0]
   preference :mails_from, :string
   preference :mail_bcc, :string
   preference :order_from, :string, :default => "orders@example.com"
   preference :order_bcc, :string
   preference :store_cc, :boolean, :default => false
   preference :store_cvv, :boolean, :default => false
-  preference :default_locale, :string, :default => 'en-US'
+  preference :default_locale, :string, :default => 'en'
   preference :allow_locale_switching, :boolean, :default => true
   preference :default_country_id, :integer, :default => 214
   preference :allow_backorders, :boolean, :default => true
   preference :allow_backorder_shipping, :boolean, :default => false # should only be true if you don't need to track inventory
+  preference :track_inventory_levels, :boolean, :default => true #
   preference :show_descendents, :boolean, :default => true
   preference :show_zero_stock_products, :boolean, :default => true
-  preference :orders_per_page, :integer, :default => 15   
-  preference :admin_products_per_page, :integer, :default => 10 
-  preference :admin_pgroup_preview_size, :integer, :default => 10 
+  preference :orders_per_page, :integer, :default => 15
+  preference :admin_products_per_page, :integer, :default => 10
+  preference :admin_pgroup_preview_size, :integer, :default => 10
   preference :products_per_page, :integer, :default => 10
-  preference :default_tax_category, :string, :default => nil # Use the name (exact case) of the tax category if you wish to specify
   preference :logo, :string, :default => '/images/admin/bg/spree_50.png'
   preference :stylesheets, :string, :default => 'screen' # Comma separate multiple stylesheets, e.g. 'screen,mystyle'
   preference :admin_interface_logo, :string, :default => "spree/spree.jpg"
   preference :allow_ssl_in_production, :boolean, :default => true
   preference :allow_ssl_in_development_and_test, :boolean, :default => false
-  preference :allow_guest_checkout, :boolean, :default => true 
-  preference :allow_anonymous_checkout, :boolean, :default => false 
+  preference :allow_guest_checkout, :boolean, :default => true
+  preference :allow_anonymous_checkout, :boolean, :default => false
   preference :alternative_billing_phone,  :boolean, :default => false # Request extra phone for bill addr
   preference :alternative_shipping_phone, :boolean, :default => false # Request extra phone for ship addr
-  preference :shipping_instructions,      :boolean, :default => false # Request instructions/info for shipping 
-  preference :show_price_inc_vat, :boolean, :default => false 
+  preference :shipping_instructions,      :boolean, :default => false # Request instructions/info for shipping
+  preference :show_price_inc_vat, :boolean, :default => false
   preference :auto_capture, :boolean, :default => false # automatically capture the creditcard (as opposed to just authorize and capture later)
   preference :address_requires_state, :boolean, :default => true # should state/state_name be required
   preference :use_mail_queue, :boolean, :default => false #send mail immediately or use a mail queue.
-  preference :allow_openid, :boolean, :default => true # allow use OpenID for registrations        
+  preference :allow_openid, :boolean, :default => true # allow use OpenID for registrations
   preference :checkout_zone, :string, :default => nil # replace with the name of a zone if you would like to limit the countries
   preference :always_put_site_name_in_title, :boolean, :default => true
-  
+  preference :cache_static_content, :boolean, :default => true
+
   validates_presence_of :name
   validates_uniqueness_of :name
-  
+
 end