spree_core 1.3.2 → 1.3.3

data/app/controllers/spree/checkout_controller.rb

@@ -4,8 +4,8 @@ module Spree
   # order that this approach is waranted.
 
   # Much of this file, especially the update action is overriden in the promo gem.
-  # This is to allow for the promo behavior but also allow the promo gem to be 
-  # removed if the functionality is not needed. 
+  # This is to allow for the promo behavior but also allow the promo gem to be
+  # removed if the functionality is not needed.
 
   class CheckoutController < Spree::StoreController
     ssl_required
@@ -13,12 +13,15 @@ module Spree
     before_filter :load_order
     before_filter :ensure_valid_state
     before_filter :associate_user
+    before_filter :check_authorization
     rescue_from Spree::Core::GatewayError, :with => :rescue_from_spree_gateway_error
 
     respond_to :html
 
+    helper 'spree/orders'
+
     # Updates the order and advances to the next state (when possible.)
-    # Overriden by the promo gem if it exists. 
+    # Overriden by the promo gem if it exists.
     def update
       if @order.update_attributes(object_params)
         fire_event('spree.checkout.update')
@@ -46,8 +49,8 @@ module Spree
     private
       def ensure_valid_state
         unless skip_state_validation?
-          if (params[:state] && !@order.checkout_steps.include?(params[:state])) ||
-             (!params[:state] && !@order.checkout_steps.include?(@order.state))
+          if (params[:state] && !@order.has_checkout_step?(params[:state])) ||
+             (!params[:state] && !@order.has_checkout_step?(@order.state))
             @order.state = 'cart'
             redirect_to checkout_state_path(@order.checkout_steps.first)
           end
@@ -65,7 +68,11 @@ module Spree
         redirect_to cart_path and return unless @order and @order.checkout_allowed?
         raise_insufficient_quantity and return if @order.insufficient_stock_lines.present?
         redirect_to cart_path and return if @order.completed?
-        @order.state = params[:state] if params[:state]
+
+        if params[:state]
+          redirect_to checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state]) && !skip_state_validation?
+          @order.state = params[:state]
+        end
         state_callback(:before)
       end
 
@@ -76,7 +83,7 @@ module Spree
 
       def object_params
         # For payment step, filter order parameters to produce the expected nested attributes for a single payment and its source, discarding attributes for payment methods other than the one selected
-        if @order.payment?
+        if @order.has_checkout_step?("payment") && @order.payment?
           if params[:payment_source].present? && source_params = params.delete(:payment_source)[params[:order][:payments_attributes].first[:payment_method_id].underscore]
             params[:order][:payments_attributes].first[:source_attributes] = source_params
           end
@@ -115,5 +122,9 @@ module Spree
         flash[:error] = t(:spree_gateway_error_flash_for_checkout)
         render :edit
       end
+
+      def check_authorization
+        authorize!(:edit, current_order, session[:access_token])
+      end
   end
 end

data/app/controllers/spree/locale_controller.rb

@@ -10,7 +10,7 @@ module Spree
       else
         flash[:error] = t(:locale_not_changed)
       end
-      redirect_back_or_default(root_path)
+      redirect_back_or_default(spree.root_path)
     end
   end
 end

data/app/controllers/spree/orders_controller.rb

@@ -2,8 +2,9 @@ module Spree
   class OrdersController < Spree::StoreController
     ssl_required :show
 
+    before_filter :check_authorization
     rescue_from ActiveRecord::RecordNotFound, :with => :render_404
-    helper 'spree/products'
+    helper 'spree/products', 'spree/orders'
 
     respond_to :html
 
@@ -14,6 +15,11 @@ module Spree
 
     def update
       @order = current_order
+      unless @order
+        flash[:error] = t(:order_not_found)
+        redirect_to root_path and return
+      end
+
       if @order.update_attributes(params[:order])
         @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
         fire_event('spree.order.contents_changed')
@@ -62,7 +68,19 @@ module Spree
     end
 
     def accurate_title
-      @order && @order.completed? ? "#{Order.model_name.human} #{@order.number}" : t(:shopping_cart)
+      @order && @order.completed? ? "#{t(:order)} #{@order.number}" : t(:shopping_cart)
+    end
+
+    def check_authorization
+      session[:access_token] ||= params[:token]
+      order = Spree::Order.find_by_number(params[:id]) || current_order
+
+      if order
+        authorize! :edit, order, session[:access_token]
+      else
+        authorize! :create, Spree::Order
+      end
     end
+
   end
 end

data/app/controllers/spree/taxons_controller.rb

@@ -18,8 +18,14 @@ module Spree
     end
 
     private
-      def accurate_title
-        @taxon ? @taxon.name : super
+
+    def accurate_title
+      if @taxon
+        @taxon.seo_title
+      else
+        super
       end
+    end
+
   end
 end

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

@@ -3,9 +3,13 @@ module Spree
     module ImagesHelper
       def options_text_for(image)
         if image.viewable.is_a?(Spree::Variant)
-          image.viewable.options_text
+          if image.viewable.is_master?
+            I18n.t(:all)
+          else
+            image.viewable.options_text
+          end
         else
-          "All"
+          I18n.t(:all)
         end
       end
     end

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

@@ -8,6 +8,10 @@ module Spree
       #   * :match_path as an alternative way to control when the tab is active, /products would match /admin/products, /admin/products/5/variants etc.
       def tab(*args)
         options = {:label => args.first.to_s}
+
+        # Return if resource is found and user is not allowed to :admin
+        return '' if klass = klass_for(options[:label]) and cannot?(:admin, klass)
+
         if args.last.is_a?(Hash)
           options = options.merge(args.pop)
         end
@@ -27,7 +31,7 @@ module Spree
         end
 
         selected = if options[:match_path]
-          request.fullpath.starts_with?("#{root_path}admin#{options[:match_path]}")
+          request.fullpath.starts_with?("#{spree.root_path}admin#{options[:match_path]}")
         else
           args.include?(controller.controller_name.to_sym)
         end
@@ -39,6 +43,22 @@ module Spree
         content_tag('li', link, :class => css_classes.join(' '))
       end
 
+      # finds class for a given symbol / string
+      #
+      # Example :
+      # :products returns Spree::Product
+      # :my_products returns MyProduct if MyProduct is defined
+      # :my_products returns My::Product if My::Product is defined
+      # if cannot constantize it returns nil
+      # This will allow us to use cancan abilities on tab
+      def klass_for(name)
+        model_name = name.to_s
+
+        ["Spree::#{model_name.classify}", model_name.classify, model_name.gsub('_', '/').classify].find do |t|
+          t.safe_constantize
+        end.try(:safe_constantize)
+      end
+
       def link_to_clone(resource, options={})
         options[:data] = {:action => 'clone'}
         link_to_with_icon('icon-copy', t(:clone), clone_admin_product_url(resource), options)
@@ -96,9 +116,9 @@ module Spree
             object_name, action = url.split('/')[-2..-1]
             html_options['data-update'] = [action, object_name.singularize].join('_')
           end
-          
+
           html_options.delete('data-update') unless html_options['data-update']
-          
+
           html_options[:class] = 'button'
 
           if html_options[:icon]

data/app/helpers/spree/base_helper.rb

@@ -22,11 +22,11 @@ module Spree
         text = "#{text}: (#{t('empty')})"
         css_class = 'empty'
       else
-        text = "#{text}: (#{current_order.item_count})  <span class='amount'>#{current_order.display_total}</span>".html_safe
+        text = "#{text}: (#{current_order.item_count})  <span class='amount'>#{current_order.display_total.to_html}</span>".html_safe
         css_class = 'full'
       end
 
-      link_to text, spree.cart_path, :class => css_class
+      link_to text, spree.cart_path, :class => "cart-info #{css_class}"
     end
 
     # human readable list of variant options
@@ -56,7 +56,7 @@ module Spree
       end
 
       if meta[:description].blank? && object.kind_of?(Spree::Product)
-        meta[:description] = strip_tags(object.description)
+        meta[:description] = strip_tags(truncate(object.description, :length => 160, :separator => ' '))
       end
 
       meta.reverse_merge!({
@@ -75,7 +75,7 @@ module Spree
     end
 
     def logo(image_path=Spree::Config[:logo])
-      link_to image_tag(image_path), root_path
+      link_to image_tag(image_path), spree.root_path
     end
 
     def flash_messages(opts = {})
@@ -92,7 +92,7 @@ module Spree
     def breadcrumbs(taxon, separator="&nbsp;&raquo;&nbsp;")
       return "" if current_page?("/") || taxon.nil?
       separator = raw(separator)
-      crumbs = [content_tag(:li, link_to(t(:home) , root_path) + separator)]
+      crumbs = [content_tag(:li, link_to(t(:home) , spree.root_path) + separator)]
       if taxon
         crumbs << content_tag(:li, link_to(t(:products) , products_path) + separator)
         crumbs << taxon.ancestors.collect { |ancestor| content_tag(:li, link_to(ancestor.name , seo_url(ancestor)) + separator) } unless taxon.ancestors.empty?
@@ -149,6 +149,10 @@ module Spree
       Spree::Money.new(amount)
     end
 
+    def display_price(product_or_variant)
+      product_or_variant.price_in(current_currency).display_price.to_html
+    end
+
     def pretty_time(time)
       [I18n.l(time.to_date, :format => :long),
         time.strftime("%H:%m %p")].join(" ")

data/app/helpers/spree/orders_helper.rb

@@ -0,0 +1,13 @@
+require 'truncate_html'
+require 'app/helpers/truncate_html_helper'
+
+module Spree
+  module OrdersHelper
+    include TruncateHtmlHelper
+
+    def truncated_product_description(product)
+      truncate_html(raw(product.description))
+    end
+  end
+end
+

data/app/helpers/spree/products_helper.rb

@@ -14,10 +14,11 @@ module Spree
     def variant_price_diff(variant)
       diff = variant.amount_in(current_currency) - variant.product.amount_in(current_currency)
       return nil if diff == 0
+      amount = Spree::Money.new(diff.abs, { :currency => current_currency }).to_html
       if diff > 0
-        "(#{t(:add)}: #{Spree::Money.new(diff.abs, { :currency => current_currency })})"
+        "(#{t(:add)}: #{amount})".html_safe
       else
-        "(#{t(:subtract)}: #{Spree::Money.new(diff.abs, { :currency => current_currency })})"
+        "(#{t(:subtract)}: #{amount})".html_safe
       end
     end
 
@@ -25,13 +26,17 @@ module Spree
     def variant_full_price(variant)
       product = variant.product
       unless product.variants.active(current_currency).all? { |v| v.price == product.price }
-        Spree::Money.new(variant.price, { :currency => current_currency }).to_s
+        Spree::Money.new(variant.price, { :currency => current_currency }).to_html
       end
     end
 
     # converts line breaks in product description into <p> tags (for html display purposes)
     def product_description(product)
-      raw(product.description.gsub(/(.*?)\r?\n\r?\n/m, '<p>\1</p>'))
+      if Spree::Config[:show_raw_product_description]
+        raw(product.description)
+      else
+        raw(product.description.gsub(/(.*?)\r?\n\r?\n/m, '<p>\1</p>'))
+      end
     end
 
     def line_item_description(variant)

data/app/mailers/spree/base_mailer.rb

@@ -0,0 +1,16 @@
+module Spree
+  class BaseMailer < ActionMailer::Base
+    def from_address
+      if MailMethod.current
+        MailMethod.current.preferred_mails_from
+      else
+        Spree::Config.emails_sent_from
+      end
+    end
+
+    def money(amount)
+      Spree::Money.new(amount).to_s
+    end
+    helper_method :money
+  end
+end

data/app/mailers/spree/order_mailer.rb

@@ -1,21 +1,22 @@
 module Spree
-  class OrderMailer < ActionMailer::Base
-    helper 'spree/base'
-
+  class OrderMailer < BaseMailer
     def confirm_email(order, resend = false)
-      @order = order
+      find_order(order)
       subject = (resend ? "[#{t(:resend).upcase}] " : '')
-      subject += "#{Spree::Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{order.number}"
-      mail(:to => order.email,
-           :subject => subject)
+      subject += "#{Spree::Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{@order.number}"
+      mail(:to => @order.email, :from => from_address, :subject => subject)
     end
 
     def cancel_email(order, resend = false)
-      @order = order
+      find_order(order)
       subject = (resend ? "[#{t(:resend).upcase}] " : '')
-      subject += "#{Spree::Config[:site_name]} #{t('order_mailer.cancel_email.subject')} ##{order.number}"
-      mail(:to => order.email,
-           :subject => subject)
+      subject += "#{Spree::Config[:site_name]} #{t('order_mailer.cancel_email.subject')} ##{@order.number}"
+      mail(:to => @order.email, :from => from_address, :subject => subject)
     end
+
+    private
+      def find_order(order)
+        @order = order.is_a?(Spree::Order) ? order : Spree::Order.find(order)
+      end
   end
 end

data/app/mailers/spree/shipment_mailer.rb

@@ -1,13 +1,10 @@
 module Spree
-  class ShipmentMailer < ActionMailer::Base
-    helper 'spree/base'
-
+  class ShipmentMailer < BaseMailer
     def shipped_email(shipment, resend = false)
-      @shipment = shipment
+      @shipment = shipment.is_a?(Spree::Shipment) ? shipment : Spree::Shipment.find(shipment)
       subject = (resend ? "[#{t(:resend).upcase}] " : '')
-      subject += "#{Spree::Config[:site_name]} #{t('shipment_mailer.shipped_email.subject')} ##{shipment.order.number}"
-      mail(:to => shipment.order.email,
-           :subject => subject)
+      subject += "#{Spree::Config[:site_name]} #{t('shipment_mailer.shipped_email.subject')} ##{@shipment.order.number}"
+      mail(:to => @shipment.order.email, :from => from_address, :subject => subject)
     end
   end
 end

data/app/mailers/spree/test_mailer.rb

@@ -1,10 +1,9 @@
 module Spree
-  class TestMailer < ActionMailer::Base
+  class TestMailer < BaseMailer
     def test_email(mail_method, user)
       @mail_method = mail_method
       subject = "#{Spree::Config[:site_name]} #{t('test_mailer.test_email.subject')}"
-      mail(:to => user.email,
-           :subject => subject)
+      mail(:to => user.email, :from =>from_address, :subject => subject)
     end
   end
 end

data/app/models/spree/adjustment.rb

@@ -70,7 +70,7 @@ module Spree
     end
 
     def display_amount
-      Spree::Money.new(amount, { :currency => currency }).to_s
+      Spree::Money.new(amount, { :currency => currency })
     end
 
     private

data/app/models/spree/app_configuration.rb

@@ -15,6 +15,8 @@
 # a.get :color
 # a.preferred_color
 #
+require "spree/core/search/base"
+
 module Spree
   class AppConfiguration < Preferences::Configuration
 
@@ -39,18 +41,23 @@ module Spree
     preference :company, :boolean, :default => false # Request company field for billing and shipping addr
     preference :create_inventory_units, :boolean, :default => true # should only be false when track_inventory_levels is false, also disables RMA's
     preference :currency, :string, :default => "USD"
+    preference :currency_decimal_mark, :string, :default => "."
     preference :currency_symbol_position, :string, :default => "before"
+    preference :currency_thousands_separator, :string, :default => ","
     preference :display_currency, :boolean, :default => false
-    preference :default_country_id, :integer, :default => 214
+    preference :default_country_id, :integer
     preference :default_meta_description, :string, :default => 'Spree demo site'
     preference :default_meta_keywords, :string, :default => 'spree, demo'
     preference :default_seo_title, :string, :default => ''
     preference :dismissed_spree_alerts, :string, :default => ''
+    preference :emails_sent_from, :string, :default => 'spree@example.com'
     preference :hide_cents, :boolean, :default => false
     preference :last_check_for_spree_alerts, :string, :default => nil
     preference :layout, :string, :default => 'spree/layouts/spree_application'
     preference :logo, :string, :default => 'admin/bg/spree_50.png'
     preference :max_level_in_taxons_menu, :integer, :default => 1 # maximum nesting level in taxons menu
+    preference :max_quantity, :integer, :default => 1000 # Maximum allowable quantity when checking out
+    preference :override_actionmailer_config, :boolean, :default => true
     preference :orders_per_page, :integer, :default => 15
     preference :prices_inc_tax, :boolean, :default => false
     preference :products_per_page, :integer, :default => 12
@@ -59,6 +66,7 @@ module Spree
     preference :shipping_instructions, :boolean, :default => false # Request instructions/info for shipping
     preference :show_descendents, :boolean, :default => true
     preference :show_only_complete_orders_by_default, :boolean, :default => true
+    preference :show_raw_product_description, :boolean, :default => false
     preference :show_zero_stock_products, :boolean, :default => true
     preference :show_variant_full_price, :boolean, :default => false #Displays variant full price or difference with product price. Default false to be compatible with older behavior
     preference :show_products_without_price, :boolean, :default => false
@@ -89,7 +97,5 @@ module Spree
     def searcher_class=(sclass)
       @searcher_class = sclass
     end
-
   end
-
 end