spree_core 1.3.2 → 1.3.3

data/db/default/spree/roles.rb

@@ -0,0 +1,2 @@
+Spree::Role.create!(:name => "admin")
+Spree::Role.create!(:name => "user")

data/db/default/spree/states.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+country = Spree::Country.find_by_name('United States')
+
+Spree::State.create!({"name"=>"Michigan", "abbr"=>"MI", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"South Dakota", "abbr"=>"SD", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Washington", "abbr"=>"WA", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Wisconsin", "abbr"=>"WI", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Arizona", "abbr"=>"AZ", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Illinois", "abbr"=>"IL", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"New Hampshire", "abbr"=>"NH", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"North Carolina", "abbr"=>"NC", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Kansas", "abbr"=>"KS", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Missouri", "abbr"=>"MO", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Arkansas", "abbr"=>"AR", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Nevada", "abbr"=>"NV", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"District of Columbia", "abbr"=>"DC", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Idaho", "abbr"=>"ID", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Nebraska", "abbr"=>"NE", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Pennsylvania", "abbr"=>"PA", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Hawaii", "abbr"=>"HI", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Utah", "abbr"=>"UT", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Vermont", "abbr"=>"VT", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Delaware", "abbr"=>"DE", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Rhode Island", "abbr"=>"RI", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Oklahoma", "abbr"=>"OK", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Louisiana", "abbr"=>"LA", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Montana", "abbr"=>"MT", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Tennessee", "abbr"=>"TN", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Maryland", "abbr"=>"MD", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Florida", "abbr"=>"FL", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Virginia", "abbr"=>"VA", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Minnesota", "abbr"=>"MN", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"New Jersey", "abbr"=>"NJ", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Ohio", "abbr"=>"OH", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"California", "abbr"=>"CA", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"North Dakota", "abbr"=>"ND", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Maine", "abbr"=>"ME", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Indiana", "abbr"=>"IN", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Texas", "abbr"=>"TX", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Oregon", "abbr"=>"OR", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Wyoming", "abbr"=>"WY", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Alabama", "abbr"=>"AL", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Iowa", "abbr"=>"IA", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Mississippi", "abbr"=>"MS", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Kentucky", "abbr"=>"KY", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"New Mexico", "abbr"=>"NM", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Georgia", "abbr"=>"GA", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Colorado", "abbr"=>"CO", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Massachusetts", "abbr"=>"MA", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Connecticut", "abbr"=>"CT", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"New York", "abbr"=>"NY", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"South Carolina", "abbr"=>"SC", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Alaska", "abbr"=>"AK", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"West Virginia", "abbr"=>"WV", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"U.S. Armed Forces – Americas", "abbr"=>"AA", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"U.S. Armed Forces – Europe", "abbr"=>"AE", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"U.S. Armed Forces – Pacific", "abbr"=>"AP", :country=>country}, :without_protection => true)

data/db/default/spree/zones.rb

@@ -0,0 +1,17 @@
+eu_vat = Spree::Zone.create!(:name => "EU_VAT", :description => "Countries that make up the EU VAT zone.")
+north_america = Spree::Zone.create!(:name => "North America", :description => "USA + Canada")
+
+["Poland", "Finland", "Portugal", "Romania", "Germany", "France",
+ "Slovakia", "Hungary", "Slovenia", "Ireland", "Austria", "Spain",
+ "Italy", "Belgium", "Sweden", "Latvia", "Bulgaria", "United Kingdom",
+ "Lithuania", "Cyprus", "Luxembourg", "Malta", "Denmark", "Netherlands",
+ "Estonia"].
+each do |name| 
+  eu_vat.zone_members.create!(:zoneable => Spree::Country.find_by_name!(name))
+end
+
+["United States", "Canada"].each do |name|
+  north_america.zone_members.create!(:zoneable => Spree::Country.find_by_name!(name))
+end
+
+

data/db/migrate/20130207155350_add_order_id_index_to_payments.rb

@@ -0,0 +1,9 @@
+class AddOrderIdIndexToPayments < ActiveRecord::Migration
+  def self.up
+    add_index :spree_payments, :order_id
+  end
+
+  def self.down
+    remove_index :spree_payments, :order_id
+  end
+end

data/db/migrate/20130208032954_add_primary_to_spree_products_taxons.rb

@@ -0,0 +1,5 @@
+class AddPrimaryToSpreeProductsTaxons < ActiveRecord::Migration
+  def change
+    add_column :spree_products_taxons, :id, :primary_key
+  end
+end

data/db/migrate/20130222032153_add_order_id_index_to_shipments.rb

@@ -0,0 +1,5 @@
+class AddOrderIdIndexToShipments < ActiveRecord::Migration
+  def change
+    add_index :spree_shipments, :order_id
+  end
+end

data/db/migrate/20130226032817_change_meta_description_on_spree_products_to_text.rb

@@ -0,0 +1,5 @@
+class ChangeMetaDescriptionOnSpreeProductsToText < ActiveRecord::Migration
+  def change
+    change_column :spree_products, :meta_description, :text, :limit => nil
+  end
+end

data/db/migrate/20130226054936_add_variant_id_index_to_spree_prices.rb

@@ -0,0 +1,5 @@
+class AddVariantIdIndexToSpreePrices < ActiveRecord::Migration
+  def change
+    add_index :spree_prices, :variant_id
+  end
+end

data/db/migrate/20130319062004_change_orders_total_precision.rb

@@ -0,0 +1,8 @@
+class ChangeOrdersTotalPrecision < ActiveRecord::Migration
+   def change
+    change_column :spree_orders, :item_total,  :decimal, :precision => 10, :scale => 2, :default => 0.0, :null => false
+    change_column :spree_orders, :total,  :decimal, :precision => 10, :scale => 2, :default => 0.0, :null => false
+    change_column :spree_orders, :adjustment_total,  :decimal, :precision => 10, :scale => 2, :default => 0.0, :null => false
+    change_column :spree_orders, :payment_total,  :decimal, :precision => 10, :scale => 2, :default => 0.0                                
+   end
+end

data/db/migrate/20130319063911_change_spree_payments_amount_precision.rb

@@ -0,0 +1,7 @@
+class ChangeSpreePaymentsAmountPrecision < ActiveRecord::Migration
+  def change
+   
+    change_column :spree_payments, :amount,  :decimal, :precision => 10, :scale => 2, :default => 0.0, :null => false
+                                   
+  end
+end

data/db/migrate/20130319064308_change_spree_return_authorization_amount_precision.rb

@@ -0,0 +1,7 @@
+class ChangeSpreeReturnAuthorizationAmountPrecision < ActiveRecord::Migration
+   def change
+   
+    change_column :spree_return_authorizations, :amount,  :decimal, :precision => 10, :scale => 2, :default => 0.0, :null => false
+                                   
+  end
+end

data/db/migrate/20130319082943_change_adjustments_amount_precision.rb

@@ -0,0 +1,7 @@
+class ChangeAdjustmentsAmountPrecision < ActiveRecord::Migration
+  def change
+   
+    change_column :spree_adjustments, :amount,  :decimal, :precision => 10, :scale => 2
+                                   
+  end
+end

data/db/migrate/20130328195253_add_seo_metas_to_taxons.rb

@@ -0,0 +1,9 @@
+class AddSeoMetasToTaxons < ActiveRecord::Migration
+  def change
+    change_table :spree_taxons do |t|
+      t.string   :meta_title
+      t.string   :meta_description
+      t.string   :meta_keywords
+    end
+  end
+end

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -1,3 +1,6 @@
+<% if agent_number = ENV['TC_AGENT_NUMBER']
+database_prefix = agent_number + "_"
+end %>
 <% case ENV['DB']
   when 'sqlite' %>
 development:
@@ -12,33 +15,33 @@ production:
 <% when 'mysql' %>
 development:
   adapter: mysql2
-  database: spree_development
+  database: <%= database_prefix %>spree_development
   username:
   encoding: utf8
 test:
   adapter: mysql2
-  database: spree_test
+  database: <%= database_prefix %>spree_test
   username:
   encoding: utf8
 production:
   adapter: mysql2
-  database: spree_production
+  database: <%= database_prefix %>spree_production
   username:
   encoding: utf8
 <% when 'postgres' %>
 development:
   adapter: postgresql
-  database: spree_development
+  database: <%= database_prefix %>spree_development
   username: postgres
   min_messages: warning
 test:
   adapter: postgresql
-  database: spree_test
+  database: <%= database_prefix %>spree_test
   username: postgres
   min_messages: warning
 production:
   adapter: postgresql
-  database: spree_production
+  database: <%= database_prefix %>spree_production
   username: postgres
   min_messages: warning
 <% else %>

data/lib/spree/core/calculated_adjustments.rb

@@ -3,7 +3,7 @@ module Spree
     module CalculatedAdjustments
       module ClassMethods
         def calculated_adjustments
-          has_one   :calculator, :as => :calculable, :dependent => :destroy
+          has_one   :calculator, :class_name => "Spree::Calculator", :as => :calculable, :dependent => :destroy
           accepts_nested_attributes_for :calculator
           attr_accessible :calculator_type, :calculator_attributes
           validates :calculator, :presence => true

data/lib/spree/core/controller_helpers/auth.rb

@@ -45,7 +45,7 @@ module Spree
 
           disallowed_urls.map!{ |url| url[/\/\w+$/] }
           unless disallowed_urls.include?(request.fullpath)
-            session['user_return_to'] = request.fullpath.gsub('//', '/')
+            session['spree_user_return_to'] = request.fullpath.gsub('//', '/')
           end
         end
 
@@ -56,8 +56,8 @@ module Spree
         end
 
         def redirect_back_or_default(default)
-          redirect_to(session["user_return_to"] || default)
-          session["user_return_to"] = nil
+          redirect_to(session["spree_user_return_to"] || default)
+          session["spree_user_return_to"] = nil
         end
       end
     end

data/lib/spree/core/controller_helpers/common.rb

@@ -7,8 +7,6 @@ module Spree
             helper_method :title
             helper_method :title=
             helper_method :accurate_title
-            helper_method :current_order
-            helper_method :current_currency
 
             layout :get_layout
 
@@ -31,7 +29,7 @@ module Spree
         end
 
         # can be used in views as well as controllers.
-        # e.g. <% title = 'This is a custom title for this view' %>
+        # e.g. <% self.title = 'This is a custom title for this view' %>
         attr_writer :title
 
         def title
@@ -56,10 +54,6 @@ module Spree
           Spree::Config[:default_seo_title]
         end
 
-        def current_currency
-          Spree::Config[:currency]
-        end
-
         def render_404(exception = nil)
           respond_to do |type|
             type.html { render :status => :not_found, :file    => "#{::Rails.root}/public/404", :formats => [:html], :layout => nil}
@@ -67,10 +61,6 @@ module Spree
           end
         end
 
-        def ip_address
-          request.env['HTTP_X_REAL_IP'] || request.env['REMOTE_ADDR']
-        end
-
         private
 
         def set_user_language

data/lib/spree/core/controller_helpers/order.rb

@@ -5,20 +5,11 @@ module Spree
         def self.included(base)
           base.class_eval do
             helper_method :current_order
+            helper_method :current_currency
             before_filter :set_current_order
           end
         end
 
-        # This should be overridden by an auth-related extension which would then have the
-        # opportunity to associate the new order with the # current user before saving.
-        def before_save_new_order
-        end
-
-        # This should be overridden by an auth-related extension which would then have the
-        # opporutnity to store tokens, etc. in the session # after saving.
-        def after_save_new_order
-        end
-
         # The current incomplete order from the session for use in cart and during checkout
         def current_order(create_order_if_necessary = false)
           return @current_order if @current_order
@@ -28,9 +19,13 @@ module Spree
           end
           if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
             @current_order = Spree::Order.new(:currency => current_currency)
-            before_save_new_order
+            @current_order.user ||= try_spree_current_user
             @current_order.save!
-            after_save_new_order
+
+            # make sure the user has permission to access the order (if they are a guest)
+            if try_spree_current_user.nil?
+              session[:access_token] = @current_order.token
+            end
           end
           if @current_order
             @current_order.last_ip_address = ip_address
@@ -68,6 +63,14 @@ module Spree
             end
           end
         end
+
+        def current_currency
+          Spree::Config[:currency]
+        end
+
+        def ip_address
+          request.env['HTTP_X_REAL_IP'] || request.env['REMOTE_ADDR']
+        end
       end
     end
   end

data/lib/spree/core/engine.rb

@@ -73,7 +73,11 @@ module Spree
 
       # filter sensitive information during logging
       initializer "spree.params.filter" do |app|
-        app.config.filter_parameters += [:password, :password_confirmation, :number]
+        app.config.filter_parameters += [
+          :password,
+          :password_confirmation,
+          :number,
+          :verification_value]
       end
 
       # sets the manifests / assets to be precompiled, even when initialize_on_precompile is false

data/lib/spree/core/mail_interceptor.rb

@@ -1,17 +1,16 @@
-# Allows us to intercept any outbound mail message and make last minute changes (such as specifying a "from" address or
-# sending to a test email account.)
+# Allows us to intercept any outbound mail message and make last minute changes
+# (such as specifying a "from" address or # sending to a test email account.)
 #
 # See http://railscasts.com/episodes/206-action-mailer-in-rails-3 for more details.
 module Spree
   module Core
     class MailInterceptor
-
       def self.delivering_email(message)
+        return unless Spree::Config.override_actionmailer_config
         return unless mail_method = Spree::MailMethod.current
-        message.from ||= mail_method.preferred_mails_from
 
         if mail_method.preferred_intercept_email.present?
-          message.subject = "[#{message.to}] #{message.subject}"
+          message.subject = "#{message.to} #{message.subject}"
           message.to = mail_method.preferred_intercept_email
         end
 
@@ -19,7 +18,6 @@ module Spree
           message.bcc ||= mail_method.preferred_mail_bcc
         end
       end
-
     end
   end
 end

data/lib/spree/core/mail_settings.rb

@@ -1,37 +1,66 @@
 module Spree
   module Core
-    module MailSettings
-
-      # Override the Rails application mail settings based on preference.
-      # This makes it possible to configure the mail settings
-      # through an admin interface instead of requiring changes to the Rails envrionment file.
+    class MailSettings
+      # Override the Rails application mail settings based on preferences
+      # This makes it possible to configure the mail settings through an admin
+      # interface instead of requiring changes to the Rails envrionment file
       def self.init
-        ActionMailer::Base.default_url_options[:host] = Spree::Config[:site_url]
-        return unless mail_method = Spree::MailMethod.current
-        if mail_method.prefers_enable_mail_delivery?
-          mail_server_settings = {
-            :address => mail_method.preferred_mail_host,
-            :domain => mail_method.preferred_mail_domain,
-            :port => mail_method.preferred_mail_port,
-            :authentication => mail_method.preferred_mail_auth_type
-          }
-
-          if mail_method.preferred_mail_auth_type != 'none'
-            mail_server_settings[:user_name] = mail_method.preferred_smtp_username
-            mail_server_settings[:password] = mail_method.preferred_smtp_password
-          end
-
-          tls = mail_method.preferred_secure_connection_type == 'TLS'
-          mail_server_settings[:enable_starttls_auto] = tls
+        instance = new
+        instance.override! if instance.override?
+      end
 
+      def override!
+        if mail_method.prefers_enable_mail_delivery?
+          ActionMailer::Base.default_url_options[:host] ||= Spree::Config[:site_url]
           ActionMailer::Base.smtp_settings = mail_server_settings
           ActionMailer::Base.perform_deliveries = true
         else
-          #logger.warn "NOTICE: Mail not enabled"
           ActionMailer::Base.perform_deliveries = false
         end
       end
 
+      def override?
+        override_actionmailer_config? && mail_method
+      end
+
+      private
+        def mail_server_settings
+          settings = if need_authentication?
+            basic_settings.merge(user_credentials)
+          else
+            basic_settings
+          end
+
+          settings.merge :enable_starttls_auto => secure_connection?
+        end
+
+        def user_credentials
+          { :user_name => mail_method.preferred_smtp_username,
+            :password => mail_method.preferred_smtp_password }
+        end
+
+        def basic_settings
+          { :address => mail_method.preferred_mail_host,
+            :domain => mail_method.preferred_mail_domain,
+            :port => mail_method.preferred_mail_port,
+            :authentication => mail_method.preferred_mail_auth_type }
+        end
+
+        def need_authentication?
+          mail_method.preferred_mail_auth_type != 'none'
+        end
+
+        def secure_connection?
+          mail_method.preferred_secure_connection_type == 'TLS'
+        end
+
+        def mail_method
+          Spree::MailMethod.current
+        end
+
+        def override_actionmailer_config?
+          Spree::Config.override_actionmailer_config
+        end
     end
   end
 end