spree 0.9.4 → 0.10.0.beta

data/app/helpers/admin/payments_helper.rb

@@ -0,0 +1,7 @@
+module Admin::PaymentsHelper
+  def payment_method_name(payment)
+    # hack to allow us to retrieve the name of a "deleted" payment method
+    id = payment.payment_method_id
+    PaymentMethod.find_with_destroyed(id).name    
+  end
+end

data/app/helpers/admin/return_authorizations_helper.rb

@@ -0,0 +1,2 @@
+module Admin::ReturnAuthorizationsHelper
+end

data/app/helpers/application_helper.rb

@@ -6,15 +6,9 @@ module ApplicationHelper
     return true unless %w{thank_you}.include? @current_action
     false
   end
-
-  # Renders all the extension partials that may have been specified in the extensions
-  def render_extra_partials(f)
-    @extension_partials.inject("") do |extras, partial|
-      extras += render :partial => partial, :locals => {:f => f}
-    end
-  end
   
   def flag_image(code)
     "#{code.to_s.split("-").last.downcase}.png"
-  end                      
+  end
+  
 end

data/app/helpers/checkouts_helper.rb

@@ -1,7 +1,35 @@
 module CheckoutsHelper
-  def checkout_steps                                                      
-    checkout_steps = %w{registration billing shipping shipping_method payment confirmation}
-    checkout_steps.delete "registration" if current_user
-    checkout_steps
+
+  def checkout_progress
+    steps = Checkout.state_names.reject { |n| n == "complete" }.map do |state|
+      text = t("checkout_steps.#{state}")
+
+      css_classes = []
+      current_index = Checkout.state_names.index(@checkout.state)
+      state_index = Checkout.state_names.index(state)
+
+      if state_index < current_index
+        css_classes << 'completed'
+        text = link_to text, edit_order_checkout_url(@order, :step => state)
+      end
+      
+      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
+
+      # 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" />'
   end
+  
+  def billing_firstname
+    @checkout.bill_address.firstname  rescue ''
+  end
+
+  def billing_lastname
+    @checkout.bill_address.lastname  rescue ''
+  end
+
 end

data/app/helpers/hook_helper.rb

@@ -0,0 +1,21 @@
+module HookHelper
+  
+  # Allow hooks to be used in views like this:
+  # 
+  #   <%= hook :some_hook %>
+  #
+  #   <% hook :some_hook do %>
+  #     <p>Some HTML</p>
+  #   <% end %>
+  # 
+  def hook(hook_name, locals = {}, &block)
+    content = block_given? ? capture(&block) : ''
+    result = Spree::ThemeSupport::Hook.render_hook(hook_name, content, self, locals)
+    block_given? ? concat(result.to_s) : result
+  end
+
+  def locals_hash(names, binding)
+    names.inject({}) {|memo, key| memo[key.to_sym] = eval(key, binding); memo}
+  end
+
+end

data/app/helpers/products_helper.rb

@@ -1,5 +1,5 @@
 module ProductsHelper
-  # returns the formatted change in price (from the master price) for the specified variant (or simply return 
+  # returns the formatted change in price (from the master price) for the specified variant (or simply return
   # the variant price if no master price was supplied)
   def variant_price_diff(variant)
     return product_price(variant) unless variant.product.master.price
@@ -11,7 +11,7 @@ module ProductsHelper
       "(#{t("subtract")}: #{format_price diff.abs})"
     end
   end
-  
+
   # returns the price of the product to show for display purposes
   def product_price(product_or_variant, options={})
     options.assert_valid_keys(:format_as_currency, :show_vat_text)
@@ -21,23 +21,41 @@ module ProductsHelper
     amount += Calculator::Vat.calculate_tax_on(product_or_variant) if Spree::Config[:show_price_inc_vat]
     options.delete(:format_as_currency) ? format_price(amount, options) : ("%0.2f" % amount).to_f
   end
-  
+
   def format_price(price, options={})
     options.assert_valid_keys(:show_vat_text)
     options.reverse_merge! :show_vat_text => Spree::Config[:show_price_inc_vat]
-    options[:show_vat_text]  ?  number_to_currency(price) + ' (inc. VAT)' : number_to_currency(price)
+    formatted_price = number_to_currency(price)
+    if options[:show_vat_text]
+      I18n.t(:price_with_vat_included, :price => formatted_price)
+    else
+      formatted_price
+    end
   end
-    
+
   # converts line breaks in product description into <p> tags (for html display purposes)
   def product_description(product)
     product.description.gsub(/^(.*)$/, '<p>\1</p>')
-  end  
-  
+  end
+
   # generates nested url to product based on supplied taxon
   def seo_url(taxon, product = nil)
     return '/t/' + taxon.permalink if product.nil?
-    
-    '/t/' + taxon.permalink + "p/" + product.permalink
+    warn "DEPRECATION: the /t/taxon-permalink/p/product-permalink urls are "+
+      "not used anymore. Use product_url instead. (called from #{caller[0]})"
+    return product_url(product)
+  end
+
+  # Generate taxon breadcrumbs for searching related products
+  def taxon_crumbs(taxon, separator="&nbsp;&raquo;&nbsp;")
+    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

@@ -7,16 +7,16 @@ module Spree::BaseHelper
     return new_order_url if session[:order_id].blank?
     return edit_order_url(Order.find_or_create_by_id(session[:order_id]))
   end
-  
+
   def cart_path
     cart_link
   end
-  
-  
+
+
   def link_to_cart(text=t('cart'))
     path = cart_path
     order = Order.find_or_create_by_id(session[:order_id]) unless session[:order_id].blank?
-    css_class = ''
+    css_class = nil
     unless order.nil?
       item_count = order.line_items.inject(0) { |kount, line_item| kount + line_item.quantity }
       return "" if current_page?(path)
@@ -25,78 +25,78 @@ module Spree::BaseHelper
     end
     link_to text, path, :class => css_class
   end
-  
+
   def order_price(order, options={})
     options.assert_valid_keys(:format_as_currency, :show_vat_text, :show_price_inc_vat)
     options.reverse_merge! :format_as_currency => true, :show_vat_text => true
-    
+
     # overwrite show_vat_text if show_price_inc_vat is false
     options[:show_vat_text] = Spree::Config[:show_price_inc_vat]
 
-    amount =  order.item_total   
+    amount =  order.item_total
     amount += Calculator::Vat.calculate_tax(order) if Spree::Config[:show_price_inc_vat]
 
     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 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
- 
+
   def yesterdays_short_date
     utc_to_local(Time.now.utc.yesterday).to_ordinalized_s(:stub)
-  end  
-  
+  end
+
 
   # human readable list of variant options
   def variant_options(v, allow_back_orders = Spree::Config[:allow_backorders], include_style = true)
     list = v.options_text
-    list = include_style ? "<span class =\"out-of-stock\">(" + t("out_of_stock") + ") #{list}</span>" : "#{t("out_of_stock")} #{list}" unless (v.in_stock? or allow_back_orders)
+    list = include_style ? "<span class =\"out-of-stock\">(" + t("out_of_stock") + ") #{list}</span>" : "#{t("out_of_stock")} #{list}" unless (allow_back_orders || v.in_stock?)
     list
-  end  
-  
-  def mini_image(product)
+  end
+
+  def mini_image(product, options={})
     if product.images.empty?
-      image_tag "noimage/mini.jpg"  
+      image_tag "noimage/mini.jpg", options
     else
-      image_tag product.images.first.attachment.url(:mini)  
+      image_tag product.images.first.attachment.url(:mini), options
     end
   end
 
-  def small_image(product)
+  def small_image(product, options={})
     if product.images.empty?
-      image_tag "noimage/small.jpg"  
+      image_tag "noimage/small.jpg", options
     else
-      image_tag product.images.first.attachment.url(:small)  
+      image_tag product.images.first.attachment.url(:small), options
     end
   end
 
-  def product_image(product)
+  def product_image(product, options={})
     if product.images.empty?
-      image_tag "noimage/product.jpg"  
+      image_tag "noimage/product.jpg", options
     else
-      image_tag product.images.first.attachment.url(:product)  
+      image_tag product.images.first.attachment.url(:product), options
     end
   end
-  
+
   def meta_data_tags
     return unless self.respond_to?(:object) && object
     "".tap do |tags|
@@ -118,7 +118,7 @@ module Spree::BaseHelper
     end
     return output
   end
-  
+
   def stylesheet_paths
     paths = Spree::Config[:stylesheets]
     if (paths.blank?)

data/app/helpers/taxons_helper.rb

@@ -4,13 +4,13 @@ module TaxonsHelper
     crumbs = [content_tag(:li, link_to(t(:home) , root_path) + separator)]
     if taxon
       crumbs << content_tag(:li, link_to(t('products') , products_path) + separator)
-      crumbs << taxon.ancestors.reverse.collect { |ancestor| content_tag(:li, link_to(ancestor.name , seo_url(ancestor)) + separator) } unless taxon.ancestors.empty?
+      crumbs << taxon.ancestors.collect { |ancestor| content_tag(:li, link_to(ancestor.name , seo_url(ancestor)) + separator) } unless taxon.ancestors.empty?
       crumbs << content_tag(:li, content_tag(:span, taxon.name))
     else
       crumbs << content_tag(:li, content_tag(:span, t('products')))
     end
-    crumb_list = content_tag(:ul, crumbs)
-    content_tag(:div, crumb_list + content_tag(:br, nil, :class => 'clear'), :class => 'breadcrumbs')
+    crumb_list = content_tag(:ul, crumbs.flatten.map{|li| li.mb_chars}.join)
+    content_tag(:div, crumb_list + tag(:br, {:class => 'clear'}, false, true), :class => 'breadcrumbs')
   end
 
   

data/app/helpers/trackers_helper.rb

@@ -0,0 +1,2 @@
+module TrackersHelper
+end

data/app/helpers/users_helper.rb

@@ -0,0 +1,13 @@
+module UsersHelper       
+  def password_style(user)
+    show_openid ? "display:none" : ""
+  end         
+  def openid_style(user) 
+    show_openid ? "": "display:none"
+  end
+  
+  private 
+  def show_openid
+    Spree::Config[:allow_openid] and @user.openid_identifier
+  end
+end

data/app/metal/create_admin_user.rb

@@ -5,7 +5,7 @@ require(File.dirname(__FILE__) + "/../../config/environment") unless defined?(Ra
 class CreateAdminUser  
   
   def self.call(env)                
-    if env["PATH_INFO"] =~ /^\/users/ or @admin_defined or not User.table_exists?
+    if env["PATH_INFO"] =~ /^\/users|stylesheets/ or @admin_defined or not User.table_exists?
       @status = [404, {"Content-Type" => "text/html"}, "Not Found"]
     else
       @admin_defined = User.first(:include => :roles, :conditions => ["roles.name = 'admin'"])

data/app/metal/redirect_legacy_product_url.rb

@@ -0,0 +1,10 @@
+class RedirectLegacyProductUrl
+
+  def self.call(env)                
+    if env["PATH_INFO"] =~ %r{/t/.+/p/(.+)}      
+      return [301, {'Location'=> "/products/#{$1}" }, []]  
+    end
+    [404, {"Content-Type" => "text/html"}, "Not Found"]
+  end
+  
+end

data/app/metal/seo_assist.rb

@@ -0,0 +1,38 @@
+# Allow the metal piece to run in isolation
+require(File.dirname(__FILE__) + "/../../config/environment") unless defined?(Rails)
+
+# Make redirects for SEO needs
+class SeoAssist
+
+  def self.call(env)
+    request = Rack::Request.new(env)
+    params = request.params
+    taxon_id = params['taxon']
+    if !taxon_id.blank? && !taxon_id.is_a?(Hash) && @taxon = Taxon.find(taxon_id)
+      params.delete('taxon')
+      query = build_query(params)
+      permalink = @taxon.permalink[0...-1] #ensures no trailing / for taxon urls
+      return [301, { 'Location'=> "/t/#{permalink}?#{query}" }, []]
+    elsif env["PATH_INFO"] =~ /^\/(t|products)(\/\S+)?\/$/
+      #ensures no trailing / for taxon and product urls
+      query = build_query(params)
+      new_location = env["PATH_INFO"][0...-1]
+      new_location += '?' + query unless query.blank?
+      return [301, { 'Location'=> new_location }, []]
+    end
+    [404, {"Content-Type" => "text/html"}, "Not Found"]
+  end
+
+  private
+
+  def self.build_query(params)
+    params.map { |k, v|
+      if v.class == Array
+        build_query(v.map { |x| ["#{k}[]", x] })
+      else
+        k + "=" + Rack::Utils.escape(v)
+      end
+    }.join("&")
+  end
+
+end

data/app/models/address.rb

@@ -1,7 +1,7 @@
 class Address < ActiveRecord::Base
   belongs_to :country
   belongs_to :state
-  
+
   has_many :checkouts, :foreign_key => "bill_address_id"
   has_many :shipments
 
@@ -14,6 +14,7 @@ class Address < ActiveRecord::Base
   validates_presence_of :zipcode
   validates_presence_of :country
   validates_presence_of :phone
+  validate :state_name_validate, :if => Proc.new { |address| address.state.blank? && Spree::Config[:address_requires_state] }
 
   # disconnected since there's no code to display error messages yet OR matching client-side validation
   def phone_validate
@@ -21,7 +22,14 @@ class Address < ActiveRecord::Base
     n_digits = phone.scan(/[0-9]/).size
     valid_chars = (phone =~ /^[-+()\/\s\d]+$/)
     if !(n_digits > 5 && valid_chars)
-      errors.add(:phone, "is invalid")
+      errors.add(:phone, :invalid)
+    end
+  end
+
+  def state_name_validate
+    return if country.blank? || country.states.empty?
+    if state_name.blank? || country.states.name_or_abbr_equals(state_name).empty?
+      errors.add(:state, :invalid)
     end
   end
 
@@ -52,6 +60,7 @@ class Address < ActiveRecord::Base
   end
 
   def same_as?(other)
+    return false if other.nil?
     attributes.except("id", "updated_at", "created_at") ==  other.attributes.except("id", "updated_at", "created_at")
   end
   alias same_as same_as?
@@ -59,4 +68,21 @@ class Address < ActiveRecord::Base
   def to_s
     "#{full_name}: #{address1}"
   end
+
+  def clone
+    Address.new(self.attributes.except("id", "updated_at", "created_at"))
+  end
+
+  def ==(other_address)
+    self_attrs = self.attributes
+    other_attrs = other_address.respond_to?(:attributes) ? other_address.attributes : {}
+
+    [self_attrs, other_attrs].each { |attrs| attrs.except!("id", "created_at", "updated_at", "order_id") }
+
+    self_attrs == other_attrs
+  end
+
+  def empty?
+    attributes.except("id", "created_at", "updated_at", "order_id", "country_id").all? {|k,v| v.nil?}
+  end
 end