spree_core 0.40.4 → 0.50.0

data/app/controllers/products_controller.rb

@@ -1,5 +1,5 @@
 class ProductsController < Spree::BaseController
-  HTTP_REFERER_REGEXP = /^https?:\/\/[^\/]+\/t\/([a-z0-9\-\/]+\/)$/
+  HTTP_REFERER_REGEXP = /^https?:\/\/[^\/]+\/t\/([a-z0-9\-\/]+)$/
 
   #prepend_before_filter :reject_unknown_object, :only => [:show]
   before_filter :load_data, :only => :show

data/app/controllers/taxons_controller.rb

@@ -4,17 +4,19 @@ class TaxonsController < Spree::BaseController
   resource_controller
   actions :show
   helper :products
+  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
 
   private
   def load_data
     @taxon ||= object
+    render_404 and return if @taxon.nil?
     params[:taxon] = @taxon.id
     @searcher = Spree::Config.searcher_class.new(params)
     @products = @searcher.retrieve_products
   end
 
   def object
-    @object ||= end_of_association_chain.find_by_permalink(params[:id] + "/")
+    @object ||= end_of_association_chain.find_by_permalink(params[:id])
   end
 
   def accurate_title

data/app/helpers/admin/navigation_helper.rb

@@ -39,15 +39,15 @@ module Admin::NavigationHelper
     link_to_with_icon('add', t("new"), edit_object_url(resource))
   end
 
-  def link_to_edit(resource)
-    link_to_with_icon('edit', t("edit"), edit_object_url(resource))
+  def link_to_edit(resource, options={})
+    link_to_with_icon('edit', t("edit"), edit_object_url(resource), options)
   end
 
-  def link_to_clone(resource)
-    link_to_with_icon('exclamation', t("clone"), clone_admin_product_url(resource))
+  def link_to_clone(resource, options={})
+    link_to_with_icon('exclamation', t("clone"), clone_admin_product_url(resource), options)
   end
 
-  def link_to_delete(resource, options = {})
+  def link_to_delete(resource, options = {}, html_options={})
     options.assert_valid_keys(:url, :caption, :title, :dataType, :success, :name)
 
     options.reverse_merge! :url => object_url(resource) unless options.key? :url
@@ -57,25 +57,42 @@ module Admin::NavigationHelper
     options.reverse_merge! :success => "function(r){ jQuery('##{dom_id resource}').fadeOut('hide'); }"
     options.reverse_merge! :name => icon("delete") + ' ' + t("delete")
 
-    #link_to_with_icon('delete', t("delete"), object_url(resource), :confirm => t('are_you_sure'), :method => :delete )
+    link_to_function_delete(options, html_options)
+    #link_to_function_delete_native(options, html_options)
+  end
+
+  # this function does not use jConfirm
+  def link_to_function_delete_native(options, html_options)
+    fn = %Q{
+      var answer = confirm("are you sure?");
+      if (!!answer) { #{link_to_function_delete_ajax(options)} };
+    }
+    link_to_function options[:name], fn, html_options
+  end
+
+  def link_to_function_delete(options, html_options)
     link_to_function options[:name], "jConfirm('#{options[:caption]}', '#{options[:title]}', function(r) {
-      if(r){
-        jQuery.ajax({
-          type: 'POST',
-          url: '#{options[:url]}',
-          data: ({_method: 'delete', authenticity_token: AUTH_TOKEN}),
-          dataType:'#{options[:dataType]}',
-          success: #{options[:success]}
-        });
-      }
-    });"
+      if(r){ #{link_to_function_delete_ajax(options)} }
+    });", html_options
+  end
+
+  def link_to_function_delete_ajax(options)
+    %Q{
+      jQuery.ajax({
+        type: 'POST',
+        url: '#{options[:url]}',
+        data: ({_method: 'delete', authenticity_token: AUTH_TOKEN}),
+        dataType:'#{options[:dataType]}',
+        success: #{options[:success]}
+      });
+    }
   end
 
   def link_to_with_icon(icon_name, text, url, options = {})
     options[:class] = (options[:class].to_s + " icon_link").strip
     link_to(icon(icon_name) + ' ' + text, url, options)
   end
-  
+
   def icon(icon_name)
     icon_name ? image_tag("/images/admin/icons/#{icon_name}.png") : ''
   end
@@ -85,8 +102,8 @@ module Admin::NavigationHelper
   end
 
   def button_link_to(text, url, html_options = {})
-    if (html_options[:method] && 
-        html_options[:method].to_s.downcase != 'get' && 
+    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])

data/app/helpers/admin/payments_helper.rb

@@ -2,6 +2,6 @@ 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    
+    PaymentMethod.find_with_destroyed(id).name
   end
 end

data/app/helpers/admin/product_groups_helper.rb

@@ -7,5 +7,5 @@ module Admin::ProductGroupsHelper
     helper_method_for_scope = Scopes::Product::ATTRIBUTE_HELPER_METHODS[product_scope.name.to_sym] || :text_field_tag
     send(helper_method_for_scope, name, value)
   end
-    
+
 end

data/app/helpers/admin/product_properties_helper.rb

@@ -1,13 +1,13 @@
 module Admin::ProductPropertiesHelper
-  
-  # Generates the appropriate field name for attribute_fu.  Normally attribute_fu handles this but we've got a 
-  # special case where we need text_field_with_autocomplete and we have to recreate attribute_fu's naming 
+
+  # Generates the appropriate field name for attribute_fu.  Normally attribute_fu handles this but we've got a
+  # special case where we need text_field_with_autocomplete and we have to recreate attribute_fu's naming
   # scheme manually.
   def property_fu_name(product_property, number)
     if product_property.new_record?
       "product[product_property_attributes][new][#{number}][property_name]"
     else
-      "product[product_property_attributes][#{product_property.id}][property_name]"   
+      "product[product_property_attributes][#{product_property.id}][property_name]"
     end
   end
 
@@ -15,7 +15,7 @@ module Admin::ProductPropertiesHelper
     if product_property.new_record?
       "product[product_property_attributes][new][#{number}][value]"
     else
-      "product[product_property_attributes][#{product_property.id}][value]"   
+      "product[product_property_attributes][#{product_property.id}][value]"
     end
   end
 end

data/app/helpers/admin/products_helper.rb

@@ -1,7 +1,7 @@
 module Admin::ProductsHelper
   def option_type_select(so)
-    select(:new_variant, 
-           so.option_type.presentation, 
+    select(:new_variant,
+           so.option_type.presentation,
            so.option_type.option_values.collect {|ov| [ ov.presentation, ov.id ] })
   end
 

data/app/helpers/admin/users_helper.rb

@@ -1,5 +1,8 @@
-module Admin::UsersHelper        
+module Admin::UsersHelper
+
   def list_roles(user)
-    user.roles.collect {|role| role.name}.join ", "    
+    # while testing spree-core itself user model does not have method roles
+    user.respond_to?(:roles) ? user.roles.collect {|role| role.name}.join(", ") : []
   end
+
 end

data/app/helpers/hook_helper.rb

@@ -1,13 +1,13 @@
 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) : ''
     Spree::ThemeSupport::Hook.render_hook(hook_name, content, self, locals)

data/app/helpers/products_helper.rb

@@ -22,28 +22,9 @@ module ProductsHelper
     options.delete(:format_as_currency) ? format_price(amount, options) : amount
   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]
-    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)
     raw(product.description.gsub(/^(.*)$/, '<p>\1</p>'))
   end
 
-  # generates nested url to product based on supplied taxon
-  def seo_url(taxon, product = nil)
-    return '/t/' + taxon.permalink if product.nil?
-    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
-
 end

data/app/helpers/spree/base_helper.rb

@@ -34,7 +34,6 @@ module Spree::BaseHelper
     utc_to_local(Time.now.utc.yesterday).to_ordinalized_s(:stub)
   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
@@ -42,7 +41,7 @@ module Spree::BaseHelper
     list
   end
 
-  [:mini, :small, :product, :large].each do |style|
+  Image.attachment_definitions[:attachment][:styles].each do |style, v|
     define_method "#{style}_image" do |product, *options|
       options = options.first || {}
       if product.images.empty?
@@ -83,5 +82,37 @@ module Spree::BaseHelper
   def logo(image_path=Spree::Config[:logo])
     link_to image_tag(image_path), root_path
   end
+
+  def available_countries
+    return Country.all unless zone = Zone.find_by_name(Spree::Config[:checkout_zone])
+    zone.country_list
+  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]
+    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
   
+  # generates nested url to product based on supplied taxon
+  def seo_url(taxon, product = nil)
+    return '/t/' + taxon.permalink if product.nil?
+    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
+  
+  def current_orders_product_count
+    if current_order.blank? || current_order.item_count < 1
+      return 0
+    else
+      return current_order.item_count
+    end
+  end
+
 end

data/app/helpers/taxons_helper.rb

@@ -18,12 +18,12 @@ module TaxonsHelper
   # Retrieves the collection of products to display when "previewing" a taxon.  This is abstracted into a helper so
   # that we can use configurations as well as make it easier for end users to override this determination.  One idea is
   # to show the most popular products for a particular taxon (that is an exercise left to the developer.)
-  def taxon_preview(taxon, max=5)
-    products = taxon.products.active.limit(max)
+  def taxon_preview(taxon, max=4)
+    products = taxon.active_products.limit(max)
     if (products.size < max) && Spree::Config[:show_descendents]
       taxon.descendants.each do |taxon|
         to_get = max - products.length
-        products += taxon.products.active.limit(to_get)
+        products += taxon.active_products.limit(to_get)
         break if products.size >= max
       end
     end

data/app/mailers/order_mailer.rb

@@ -4,7 +4,7 @@ class OrderMailer < ActionMailer::Base
   def confirm_email(order, resend=false)
     @order = order
     subject = (resend ? "[RESEND] " : "")
-    subject += "#{Spree::Config[:site_name]} Order Confirmation ##{order.number}"
+    subject += "#{Spree::Config[:site_name]} #{t('subject', :scope =>'order_mailer.confirm_email')} ##{order.number}"
     mail(:to => order.email,
          :subject => subject)
   end
@@ -12,7 +12,7 @@ class OrderMailer < ActionMailer::Base
   def cancel_email(order, resend=false)
     @order = order
     subject = (resend ? "[RESEND] " : "")
-    subject += "#{Spree::Config[:site_name]} Cancellation of Order ##{order.number}"
+    subject += "#{Spree::Config[:site_name]} #{t('subject', :scope => 'order_mailer.cancel_email')} ##{order.number}"
     mail(:to => order.email,
          :subject => subject)
   end

data/app/mailers/shipment_mailer.rb

@@ -4,8 +4,8 @@ class ShipmentMailer < ActionMailer::Base
   def shipped_email(shipment, resend=false)
     @shipment = shipment
     subject = (resend ? "[RESEND] " : "")
-    subject += "#{Spree::Config[:site_name]} Shipment Notification ##{shipment.order.number}"
+    subject += "#{Spree::Config[:site_name]} #{t('subject', :scope => 'shipment_mailer.shipped_email')} ##{shipment.order.number}"
     mail(:to => shipment.order.email,
          :subject => subject)
   end
-end
+end

data/app/models/address.rb

@@ -5,9 +5,7 @@ class Address < ActiveRecord::Base
   has_many :shipments
 
   validates :firstname, :lastname, :address1, :city, :zipcode, :country, :phone, :presence => true
-  validates :state, :presence => true, :if => Proc.new { |address| address.state_name.blank? && Spree::Config[:address_requires_state] }
-  validates :state_name, :presence => true, :if => Proc.new { |address| address.state.blank? && Spree::Config[:address_requires_state] }
-  validate :state_name_validate, :if => Proc.new { |address| address.state.blank? && Spree::Config[:address_requires_state] }
+  validate :state_validate
 
   # disconnected since there's no code to display error messages yet OR matching client-side validation
   def phone_validate
@@ -19,12 +17,47 @@ class Address < ActiveRecord::Base
     end
   end
 
-  def state_name_validate
-    country = country_id ? Country.find(country_id) : nil
-    return if country.blank? || country.states.empty?
-    if state_name.blank? || country.states.where(["name = ? OR abbr = ?", state_name, state_name]).empty?
-      errors.add(:state, :invalid)
+  def state_validate
+    #skip state validation without country (also required)
+    #or when disabled by perfernce
+    return if self.country_id.blank? || !Spree::Config[:address_requires_state]
+
+    #ensure associated state belongs to country
+    if self.state_id.present?
+      if self.state.country_id == self.country_id
+
+          self.state_name = nil #not required as we have a valid state and country combo
+      else
+        if self.state_name.present?
+
+          self.state_id = nil
+        else
+          errors.add(:state, :invalid)
+        end
+      end
+    end
+
+    #ensure state_name belongs to country without states, or that it matches a predefined state name/abbr
+    if self.state_name.present?
+      country = Country.where(:id => self.country_id).try(:first)
+
+      if country.states.present?
+        states = country.states.where(["name = ? OR abbr = ?",self.state_name, self.state_name])
+
+        if states.size == 1
+          self.state = states.first
+          self.state_name = nil
+        else
+          errors.add(:state, :invalid)
+        end
+      end
     end
+
+    #ensure at least one state field is populated
+    if self.state_id.blank? && self.state_name.blank?
+      errors.add(:state, :blank)
+    end
+
   end
 
   def self.default
@@ -77,6 +110,6 @@ class Address < ActiveRecord::Base
   end
 
   def empty?
-    attributes.except("id", "created_at", "updated_at", "order_id", "country_id").all? {|k,v| v.nil?}
+    attributes.except("id", "created_at", "updated_at", "order_id", "country_id").all? {|_,v| v.nil?}
   end
 end

data/app/models/adjustment.rb

@@ -3,14 +3,15 @@
 #
 # +mandatory+
 #
-# The charge is required and will not be removed from the order, even if the amount is zero.  This is
-# useful for representing things such as shipping and tax charges where you may want to make it explicitly
+# If this flag is set to true then it means the the charge is required and will not be removed from the
+# order, even if the amount is zero.  In other words a record will be created even if the amount is zero.
+# This is  useful for representing things such as shipping and tax charges where you may want to make it explicitly
 # clear that no charge was made for such things.
 #
-# +frozen+
+# +locked+
 #
 # The charge is never to be udpated.  Typically you would want to freeze certain adjustments after checkout.
-# One use case for this is if you want to freeze a shipping adjustment so that its value does not change
+# One use case for this is if you want to lock a shipping adjustment so that its value does not change
 # in the future when making other trivial edits to the order (like an email change).
 class Adjustment < ActiveRecord::Base
   belongs_to :order
@@ -24,9 +25,8 @@ class Adjustment < ActiveRecord::Base
   scope :shipping, lambda { where(:label => I18n.t(:shipping)) }
   scope :optional, where(:mandatory => false)
 
-  # update the order totals, etc.
-  after_save {order.update!}
-  after_destroy {order.update!}
+  after_save { order.update! }
+  after_destroy { order.update! }
 
   # Checks if adjustment is applicable for the order. Should return _true_ if adjustment should be preserved and
   # _false_ if removed. Default behaviour is to preserve adjustment if amount is present and non 0.  Exceptions
@@ -41,7 +41,7 @@ class Adjustment < ActiveRecord::Base
   # to use this method in an after_save hook for other models without causing an infinite recursion problem.  If there
   # is no +originator+ then this method will have no effect.
   def update!
-    return if locked? or originator.nil?
+    return if locked? || originator.nil?
     originator.update_adjustment(self, source)
   end
 end