spree_core 1.2.5 → 1.3.0.rc1

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

@@ -1,13 +1,6 @@
 module Spree
   module Admin
     module OrdersHelper
-      # Renders all the txn partials that may have been specified in the extensions
-      def render_txn_partials(order)
-        @txn_partials.inject('') do |extras, partial|
-          extras += render :partial => partial, :locals => { :payment => order }
-        end
-      end
-
       # Renders all the extension partials that may have been specified in the extensions
       def event_links
         links = []
@@ -15,6 +8,7 @@ module Spree
           if @order.send("can_#{event}?")
             links << button_link_to(t(event), fire_admin_order_url(@order, :e => event),
                                     :method => :put,
+                                    :icon => "icon-#{event}",
                                     :data => { :confirm => t(:order_sure_want_to, :event => t(event)) })
           end
         end

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

@@ -0,0 +1,15 @@
+module Spree
+  module Admin
+    module TablesHelper
+
+      # Adds class 'active' to <th> & <td> tags
+      # for better tables styling
+      def sort_by_active_class(row)
+        if params[:q][:s] && params[:q][:s].include?(row)
+          return "sort-active"
+        end
+      end
+
+    end
+  end
+end

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

@@ -4,19 +4,6 @@ module Spree
       def taxon_path(taxon)
         taxon.ancestors.reverse.collect { |ancestor| ancestor.name }.join( " >> ")
       end
-  
-      def taxons_checkbox_tree(root, product)
-        return '' if root.children.blank?
-        content_tag 'ul' do
-          root.children.map do |taxon|
-            content_tag 'li' do
-              [check_box_tag("taxon_ids[]", taxon.id, product.taxons.include?(taxon), :id => "taxon_ids_#{taxon.id}"),
-               label_tag("taxon_ids_#{taxon.id}", taxon.name)].join(' ').html_safe +
-              taxons_checkbox_tree(taxon, product)
-            end.html_safe
-          end.join("\n").html_safe
-        end
-      end
     end
   end
 end

data/app/helpers/spree/base_helper.rb

@@ -29,22 +29,14 @@ module Spree
       link_to text, cart_path, :class => css_class
     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
-
     # human readable list of variant options
-    def variant_options(v, allow_back_orders = Spree::Config[:allow_backorders], include_style = true)
+    def variant_options(v, options={})
       list = v.options_text
 
       # We shouldn't show out of stock if the product is infact in stock
       # or when we're not allowing backorders.
-      unless (allow_back_orders || v.in_stock?)
-        list = if include_style
+      unless v.in_stock?
+        list = if options[:include_style]
           content_tag(:span, "(#{t(:out_of_stock)}) #{list}", :class => 'out-of-stock')
         else
           "#{t(:out_of_stock)} #{list}"
@@ -64,7 +56,7 @@ module Spree
       end
 
       if meta[:description].blank? && object.kind_of?(Spree::Product)
-        meta[:description] = strip_tags(truncate(object.description, :length => 160, :separator => ' '))
+        meta[:description] = strip_tags(object.description)
       end
 
       meta.reverse_merge!({
@@ -109,7 +101,7 @@ module Spree
         crumbs << content_tag(:li, content_tag(:span, t(:products)))
       end
       crumb_list = content_tag(:ul, raw(crumbs.flatten.map{|li| li.mb_chars}.join), :class => 'inline')
-      content_tag(:nav, crumb_list, :id => 'breadcrumbs')
+      content_tag(:nav, crumb_list, :id => 'breadcrumbs', :class => 'sixteen columns')
     end
 
     def taxons_tree(root_taxon, current_taxon, max_level = 1)
@@ -140,20 +132,8 @@ module Spree
       end.sort { |a, b| a.name <=> b.name }
     end
 
-    # generates nested url to product based on supplied taxon
-    def seo_url(taxon, product = nil)
-      return spree.nested_taxons_path(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
+    def seo_url(taxon)
+      return spree.nested_taxons_path(taxon.permalink)
     end
 
     def gem_available?(name)
@@ -165,7 +145,13 @@ module Spree
     end
 
     def money(amount)
-      Spree::Money.new(amount).to_html
+      ActiveSupport::Deprecation.warn("[SPREE] Spree::BaseHelper#money will be deprecated.  It relies upon a single master currency.  You can instead create a Spree::Money.new(amount, { :currency => your_currency}) or see if the object you're working with returns a Spree::Money object to use.")
+      Spree::Money.new(amount)
+    end
+
+    def pretty_time(time)
+      [I18n.l(time.to_date, :format => :long),
+        time.strftime("%H:%m %p")].join(" ")
     end
 
     def method_missing(method_name, *args, &block)

data/app/helpers/spree/checkout_helper.rb

@@ -4,16 +4,6 @@ module Spree
       @order.checkout_steps
     end
 
-    def state_required_class
-      'required' if state_required?
-    end
-
-    def state_required_label
-      if state_required?
-        content_tag :span, '*', :class => state_required_class
-      end
-    end
-
     def checkout_progress
       states = checkout_states
       items = states.map do |state|
@@ -37,10 +27,5 @@ module Spree
       end
       content_tag('ol', raw(items.join("\n")), :class => 'progress-steps', :id => "checkout-step-#{@order.state}")
     end
-
-    private
-    def state_required?
-      Spree::Config[:address_requires_state]
-    end
   end
 end

data/app/helpers/spree/products_helper.rb

@@ -1,24 +1,37 @@
 module Spree
   module ProductsHelper
-    # 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)
+    # returns the formatted price for the specified variant as a full price or a difference depending on configuration
+    def variant_price(variant)
+      if Spree::Config[:show_variant_full_price]
+        variant_full_price(variant)
+      else
+        variant_price_diff(variant)
+      end
+    end
+
+
+    # returns the formatted price for the specified variant as a difference from product price
     def variant_price_diff(variant)
-      diff = variant.price - variant.product.price
+      diff = variant.amount_in(current_currency) - variant.product.amount_in(current_currency)
       return nil if diff == 0
       if diff > 0
-        "(#{t(:add)}: #{Spree::Money.new(diff.abs).to_html})".html_safe
+        "(#{t(:add)}: #{Spree::Money.new(diff.abs, { :currency => current_currency })})"
       else
-        "(#{t(:subtract)}: #{Spree::Money.new(diff.abs).to_html})".html_safe
+        "(#{t(:subtract)}: #{Spree::Money.new(diff.abs, { :currency => current_currency })})"
+      end
+    end
+
+    # returns the formatted full price for the variant, if at least one variant price differs from product price
+    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
       end
     end
 
     # converts line breaks in product description into <p> tags (for html display purposes)
     def product_description(product)
-      if Spree::Config[:show_raw_product_description]
-        raw(product.description)
-      else
-        raw(product.description.gsub(/(.*?)\r?\n\r?\n/m, '<p>\1</p>'))
-      end
+      raw(product.description.gsub(/(.*?)\r?\n\r?\n/m, '<p>\1</p>'))
     end
 
     def line_item_description(variant)

data/app/mailers/spree/order_mailer.rb

@@ -2,31 +2,20 @@ module Spree
   class OrderMailer < ActionMailer::Base
     helper 'spree/base'
 
-    def from_address
-      MailMethod.current.preferred_mails_from
-    end
-
     def confirm_email(order, resend = false)
-      find_order(order)
+      @order = order
       subject = (resend ? "[#{t(:resend).upcase}] " : '')
-      subject += "#{Spree::Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{@order.number}"
-      mail(:to => @order.email,
-           :from => from_address,
+      subject += "#{Spree::Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{order.number}"
+      mail(:to => order.email,
            :subject => subject)
     end
 
     def cancel_email(order, resend = false)
-      find_order(order)
+      @order = order
       subject = (resend ? "[#{t(:resend).upcase}] " : '')
-      subject += "#{Spree::Config[:site_name]} #{t('order_mailer.cancel_email.subject')} ##{@order.number}"
-      mail(:to => @order.email,
-           :from => from_address,
+      subject += "#{Spree::Config[:site_name]} #{t('order_mailer.cancel_email.subject')} ##{order.number}"
+      mail(:to => order.email,
            :subject => subject)
     end
-
-    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

@@ -2,16 +2,11 @@ module Spree
   class ShipmentMailer < ActionMailer::Base
     helper 'spree/base'
 
-    def from_address
-      MailMethod.current.preferred_mails_from
-    end
-
     def shipped_email(shipment, resend = false)
-      @shipment = shipment.is_a?(Spree::Shipment) ? shipment : Spree::Shipment.find(shipment)
+      @shipment = 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,
-           :from => from_address,
+      subject += "#{Spree::Config[:site_name]} #{t('shipment_mailer.shipped_email.subject')} ##{shipment.order.number}"
+      mail(:to => shipment.order.email,
            :subject => subject)
     end
   end

data/app/mailers/spree/test_mailer.rb

@@ -1,14 +1,9 @@
 module Spree
   class TestMailer < ActionMailer::Base
-    def from_address
-      MailMethod.current.preferred_mails_from
-    end
-
     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,
-           :from => from_address,
            :subject => subject)
     end
   end

data/app/models/spree/address.rb

@@ -36,7 +36,7 @@ module Spree
     end
 
     def state_text
-      state.try(:abbr) || state.try(:name) || state_name 
+      state.try(:abbr) || state.try(:name) || state_name
     end
 
     def same_as?(other)
@@ -87,6 +87,7 @@ module Spree
         # Skip state validation without country (also required)
         # or when disabled by preference
         return if country.blank? || !Spree::Config[:address_requires_state]
+        return unless country.states_required
 
         # ensure associated state belongs to country
         if state.present?

data/app/models/spree/adjustment.rb

@@ -65,8 +65,12 @@ module Spree
       set_eligibility
     end
 
+    def currency
+      adjustable.nil? ? Spree::Config[:currency] : adjustable.currency
+    end
+
     def display_amount
-      Spree::Money.new(amount)
+      Spree::Money.new(amount, { :currency => currency }).to_s
     end
 
     private

data/app/models/spree/app_configuration.rb

@@ -21,14 +21,11 @@ module Spree
     # Alphabetized to more easily lookup particular preferences
     preference :address_requires_state, :boolean, :default => true # should state/state_name be required
     preference :admin_interface_logo, :string, :default => 'admin/bg/spree_50.png'
-    preference :admin_pgroup_per_page, :integer, :default => 10
-    preference :admin_pgroup_preview_size, :integer, :default => 10
     preference :admin_products_per_page, :integer, :default => 10
     preference :allow_backorder_shipping, :boolean, :default => false # should only be true if you don't need to track inventory
     preference :allow_backorders, :boolean, :default => true
     preference :allow_checkout_on_gateway_error, :boolean, :default => false
     preference :allow_guest_checkout, :boolean, :default => true
-    preference :allow_locale_switching, :boolean, :default => true
     preference :allow_ssl_in_development_and_test, :boolean, :default => false
     preference :allow_ssl_in_production, :boolean, :default => true
     preference :allow_ssl_in_staging, :boolean, :default => true
@@ -45,12 +42,10 @@ module Spree
     preference :currency_symbol_position, :string, :default => "before"
     preference :display_currency, :boolean, :default => false
     preference :default_country_id, :integer, :default => 214
-    preference :default_locale, :string, :default => Rails.application.config.i18n.default_locale || :en
     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'
@@ -59,13 +54,13 @@ module Spree
     preference :orders_per_page, :integer, :default => 15
     preference :prices_inc_tax, :boolean, :default => false
     preference :products_per_page, :integer, :default => 12
-    preference :select_taxons_from_tree, :boolean, :default => false # provide opportunity to select taxons from tree instead of search with autocomplete
+    preference :require_master_price, :boolean, :default => true
     preference :shipment_inc_vat, :boolean, :default => false
     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 :site_name, :string, :default => 'Spree Demo Site'
     preference :site_url, :string, :default => 'demo.spreecommerce.com'
     preference :tax_using_ship_address, :boolean, :default => true

data/app/models/spree/calculator/default_tax.rb

@@ -33,11 +33,7 @@ module Spree
 
       def compute_line_item(line_item)
         if line_item.product.tax_category == rate.tax_category
-          if rate.included_in_price
-            deduced_total_by_rate(line_item.total, rate)
-          else
-            round_to_two_places(line_item.total * rate.amount)
-          end
+          deduced_total_by_rate(line_item.total, rate)
         else
           0
         end
@@ -46,7 +42,7 @@ module Spree
       def round_to_two_places(amount)
         BigDecimal.new(amount.to_s).round(2, BigDecimal::ROUND_HALF_UP)
       end
-      
+
       def deduced_total_by_rate(total, rate)
         round_to_two_places(total - ( total / (1 + rate.amount) ) )
       end

data/app/models/spree/calculator/flat_rate.rb

@@ -3,7 +3,9 @@ require_dependency 'spree/calculator'
 module Spree
   class Calculator::FlatRate < Calculator
     preference :amount, :decimal, :default => 0
-    attr_accessible :preferred_amount
+    preference :currency, :string, :default => Spree::Config[:currency]
+
+    attr_accessible :preferred_amount, :preferred_currency
 
     def self.description
       I18n.t(:flat_rate_per_order)

data/app/models/spree/calculator/flexi_rate.rb

@@ -5,8 +5,9 @@ module Spree
     preference :first_item,      :decimal, :default => 0.0
     preference :additional_item, :decimal, :default => 0.0
     preference :max_items,       :integer, :default => 0
+    preference :currency,        :string,  :default => Spree::Config[:currency]
 
-    attr_accessible :preferred_first_item, :preferred_additional_item, :preferred_max_items
+    attr_accessible :preferred_first_item, :preferred_additional_item, :preferred_max_items, :preferred_currency
 
     def self.description
       I18n.t(:flexible_rate)

data/app/models/spree/calculator/per_item.rb

@@ -3,8 +3,9 @@ require_dependency 'spree/calculator'
 module Spree
   class Calculator::PerItem < Calculator
     preference :amount, :decimal, :default => 0
+    preference :currency, :string, :default => Spree::Config[:currency]
 
-    attr_accessible :preferred_amount
+    attr_accessible :preferred_amount, :preferred_currency
 
     def self.description
       I18n.t(:flat_rate_per_item)
@@ -33,9 +34,7 @@ module Spree
       # Shipping methods do not have promotions attached, but promotions do
       # Therefore we must check for promotions
       if self.calculable.respond_to?(:promotion)
-        self.calculable.promotion.rules.map do |rule|
-          rule.respond_to?(:products) ? rule.products : []
-        end.flatten
+        self.calculable.promotion.rules.map(&:products).flatten
       end
     end
   end

data/app/models/spree/calculator/price_sack.rb

@@ -7,10 +7,12 @@ module Spree
     preference :minimal_amount, :decimal, :default => 0
     preference :normal_amount, :decimal, :default => 0
     preference :discount_amount, :decimal, :default => 0
+    preference :currency, :string, :default => Spree::Config[:currency]
 
     attr_accessible :preferred_minimal_amount,
                     :preferred_normal_amount,
-                    :preferred_discount_amount
+                    :preferred_discount_amount,
+                    :preferred_currency
 
     def self.description
       I18n.t(:price_sack)