spree_core 2.1.12 → 2.2.0

data/db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb

@@ -1,10 +1,12 @@
 class MigrateTaxCategoriesToLineItems < ActiveRecord::Migration
   def change
-    Spree::LineItem.find_each do |line_item|
-      next if line_item.variant.nil?
-      next if line_item.variant.product.nil?
-      next if line_item.product.nil?
-      line_item.update_column(:tax_category_id, line_item.product.tax_category_id)
+    Spree::LineItem.includes(:variant => { :product => :tax_category }).find_in_batches do |line_items|
+      line_items.each do |line_item|
+        next if line_item.variant.nil?
+        next if line_item.variant.product.nil?
+        next if line_item.product.nil?
+        line_item.update_column(:tax_category_id, line_item.product.tax_category_id)
+      end
     end
   end
 end

data/db/migrate/20130807024301_upgrade_adjustments.rb

@@ -0,0 +1,39 @@
+class UpgradeAdjustments < ActiveRecord::Migration
+  def up
+    # Temporarily make originator association available
+    Spree::Adjustment.class_eval do
+      belongs_to :originator, polymorphic: true
+    end
+    # Shipping adjustments are now tracked as fields on the object
+    Spree::Adjustment.where(:source_type => "Spree::Shipment").find_each do |adjustment|
+      # Account for possible invalid data
+      next if adjustment.source.nil?
+      adjustment.source.update_column(:cost, adjustment.amount)
+      adjustment.destroy
+    end
+
+    # Tax adjustments have their sources altered
+    Spree::Adjustment.where(:originator_type => "Spree::TaxRate").find_each do |adjustment|
+      adjustment.source = adjustment.originator
+      adjustment.save
+    end
+
+    # Promotion adjustments have their source altered also
+    Spree::Adjustment.where(:originator_type => "Spree::PromotionAction").find_each do |adjustment|
+      next if adjustment.originator.nil?
+      adjustment.source = adjustment.originator
+      begin
+        if adjustment.source.calculator_type == "Spree::Calculator::FreeShipping"
+          # Previously this was a Spree::Promotion::Actions::CreateAdjustment
+          # And it had a calculator to work out FreeShipping
+          # In Spree 2.2, the "calculator" is now the action itself.
+          adjustment.source.becomes(Spree::Promotion::Actions::FreeShipping)
+        end
+      rescue
+        # Fail silently. This is primarily in instances where the calculator no longer exists
+      end
+
+      adjustment.save
+    end
+  end
+end

data/db/migrate/20130807024302_rename_adjustment_fields.rb

@@ -0,0 +1,17 @@
+class RenameAdjustmentFields < ActiveRecord::Migration
+  def up
+    remove_column :spree_adjustments, :originator_id
+    remove_column :spree_adjustments, :originator_type
+
+    add_column :spree_adjustments, :order_id, :integer unless column_exists?(:spree_adjustments, :order_id)
+
+    # This enables the Spree::Order#all_adjustments association to work correctly
+    Spree::Adjustment.reset_column_information
+    Spree::Adjustment.find_each do |adjustment|
+      if adjustment.adjustable.is_a?(Spree::Order)
+        adjustment.order = adjustment.adjustable
+        adjustment.save
+      end
+    end
+  end
+end

data/db/migrate/20130813004002_add_shipment_total_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddShipmentTotalToSpreeOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :shipment_total, :decimal, :precision => 10, :scale => 2, :default => 0.0, :null => false
+  end
+end

data/db/migrate/20130813232134_rename_activators_to_promotions.rb

@@ -0,0 +1,5 @@
+class RenameActivatorsToPromotions < ActiveRecord::Migration
+  def change
+    rename_table :spree_activators, :spree_promotions
+  end
+end

data/db/migrate/20130815000406_add_adjustment_total_to_line_items.rb

@@ -0,0 +1,5 @@
+class AddAdjustmentTotalToLineItems < ActiveRecord::Migration
+  def change
+    add_column :spree_line_items, :adjustment_total, :decimal, :precision => 10, :scale => 2, :default => 0.0
+  end
+end

data/db/migrate/20130815024413_add_adjustment_total_to_shipments.rb

@@ -0,0 +1,5 @@
+class AddAdjustmentTotalToShipments < ActiveRecord::Migration
+  def change
+    add_column :spree_shipments, :adjustment_total, :decimal, :precision => 10, :scale => 2, :default => 0.0
+  end
+end

data/db/migrate/20130828234942_add_tax_total_to_line_items_shipments_and_orders.rb

@@ -0,0 +1,8 @@
+class AddTaxTotalToLineItemsShipmentsAndOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_line_items, :tax_total, :decimal, precision: 10, scale: 2, default: 0.0
+    add_column :spree_shipments, :tax_total, :decimal, precision: 10, scale: 2, default: 0.0
+    # This column may already be here from a 2.1.x migration
+    add_column :spree_orders, :tax_total, :decimal, precision: 10, scale: 2, default: 0.0 unless Spree::Order.column_names.include?("tax_total")
+  end
+end

data/db/migrate/20130830001159_migrate_old_shipping_calculators.rb

@@ -3,7 +3,7 @@ class MigrateOldShippingCalculators < ActiveRecord::Migration
     Spree::ShippingMethod.all.each do |shipping_method|
       old_calculator = shipping_method.calculator
       next if old_calculator.class < Spree::ShippingCalculator # We don't want to mess with new shipping calculators
-      new_calculator = eval(old_calculator.class.name.sub("::Calculator::", "::Calculator::Shipping::")).new
+      new_calculator = eval("Spree::Calculator::Shipping::#{old_calculator.class.name.demodulize}").new
       new_calculator.preferences.keys.each do |pref|
         # Preferences can't be read/set by name, you have to prefix preferred_
         pref_method = "preferred_#{pref}"

data/db/migrate/20130903183026_add_code_to_spree_promotion_rules.rb

@@ -0,0 +1,5 @@
+class AddCodeToSpreePromotionRules < ActiveRecord::Migration
+  def change
+    add_column :spree_promotion_rules, :code, :string
+  end
+end

data/db/migrate/20130917024658_remove_promotions_event_name_field.rb

@@ -0,0 +1,5 @@
+class RemovePromotionsEventNameField < ActiveRecord::Migration
+  def change
+    remove_column :spree_promotions, :event_name
+  end
+end

data/db/migrate/20130924040529_add_promo_total_to_line_items_and_shipments_and_orders.rb

@@ -0,0 +1,7 @@
+class AddPromoTotalToLineItemsAndShipmentsAndOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_line_items, :promo_total, :decimal, precision: 10, scale: 2, default: 0.0
+    add_column :spree_shipments, :promo_total, :decimal, precision: 10, scale: 2, default: 0.0
+    add_column :spree_orders, :promo_total, :decimal, precision: 10, scale: 2, default: 0.0
+  end
+end

data/db/migrate/20131001013410_remove_unused_credit_card_fields.rb

@@ -1,12 +1,16 @@
 class RemoveUnusedCreditCardFields < ActiveRecord::Migration
   def up
-    remove_column :spree_credit_cards, :start_month
-    remove_column :spree_credit_cards, :start_year
-    remove_column :spree_credit_cards, :issue_number
+    remove_column :spree_credit_cards, :start_month if column_exists?(:spree_credit_cards, :start_month)
+    remove_column :spree_credit_cards, :start_year if column_exists?(:spree_credit_cards, :start_year)
+    remove_column :spree_credit_cards, :issue_number if column_exists?(:spree_credit_cards, :issue_number)
   end
   def down
     add_column :spree_credit_cards, :start_month,  :string
     add_column :spree_credit_cards, :start_year,   :string
     add_column :spree_credit_cards, :issue_number, :string
   end
+
+  def column_exists?(table, column)
+    ActiveRecord::Base.connection.column_exists?(table, column)
+  end
 end

data/db/migrate/20131107132123_add_tax_category_to_variants.rb

@@ -0,0 +1,6 @@
+class AddTaxCategoryToVariants < ActiveRecord::Migration
+  def change
+    add_column :spree_variants, :tax_category_id, :integer
+    add_index  :spree_variants, :tax_category_id
+  end
+end

data/db/migrate/20131118043959_add_included_to_adjustments.rb

@@ -0,0 +1,5 @@
+class AddIncludedToAdjustments < ActiveRecord::Migration
+  def change
+    add_column :spree_adjustments, :included, :boolean, :default => false unless Spree::Adjustment.column_names.include?("included")
+  end
+end

data/db/migrate/20131118050234_rename_tax_total_fields.rb

@@ -0,0 +1,11 @@
+class RenameTaxTotalFields < ActiveRecord::Migration
+  def change
+    rename_column :spree_line_items, :tax_total, :additional_tax_total
+    rename_column :spree_shipments, :tax_total, :additional_tax_total
+    rename_column :spree_orders, :tax_total, :additional_tax_total
+
+    add_column :spree_line_items, :included_tax_total, :decimal, precision: 10, scale: 2, null: false, default: 0.0
+    add_column :spree_shipments, :included_tax_total, :decimal, precision: 10, scale: 2, null: false, default: 0.0
+    add_column :spree_orders, :included_tax_total, :decimal, precision: 10, scale: 2, null: false, default: 0.0
+  end
+end

data/db/migrate/20131118183431_add_line_item_id_to_spree_inventory_units.rb

@@ -0,0 +1,21 @@
+class AddLineItemIdToSpreeInventoryUnits < ActiveRecord::Migration
+  def change
+    # Stores running the product-assembly extension already have a line_item_id column
+    unless column_exists? Spree::InventoryUnit.table_name, :line_item_id
+      add_column :spree_inventory_units, :line_item_id, :integer
+      add_index :spree_inventory_units, :line_item_id
+
+      shipments = Spree::Shipment.includes(:inventory_units, :order)
+
+      shipments.find_each do |shipment|
+        shipment.inventory_units.group_by(&:variant).each do |variant, units|
+
+          line_item = shipment.order.find_line_item_by_variant(variant)
+          next unless line_item
+
+          Spree::InventoryUnit.where(id: units.map(&:id)).update_all(line_item_id: line_item.id)
+        end
+      end
+    end
+  end
+end

data/db/migrate/20131127001002_add_position_to_classifications.rb

@@ -0,0 +1,5 @@
+class AddPositionToClassifications < ActiveRecord::Migration
+  def change
+    add_column :spree_products_taxons, :position, :integer
+  end
+end

data/db/migrate/20131211112807_create_spree_orders_promotions.rb

@@ -0,0 +1,8 @@
+class CreateSpreeOrdersPromotions < ActiveRecord::Migration
+  def change
+    create_table :spree_orders_promotions, :id => false do |t|
+      t.references :order
+      t.references :promotion
+    end
+  end
+end

data/db/migrate/20131218054603_add_item_count_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddItemCountToSpreeOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :item_count, :integer, :default => 0
+  end
+end

data/db/migrate/20140106224208_rename_permalink_to_slug_for_products.rb

@@ -0,0 +1,5 @@
+class RenamePermalinkToSlugForProducts < ActiveRecord::Migration
+  def change
+    rename_column :spree_products, :permalink, :slug
+  end
+end

data/db/migrate/20140124023232_rename_activator_id_in_rules_and_actions_to_promotion_id.rb

@@ -0,0 +1,6 @@
+class RenameActivatorIdInRulesAndActionsToPromotionId < ActiveRecord::Migration
+  def change
+    rename_column :spree_promotion_rules, :activator_id, :promotion_id
+    rename_column :spree_promotion_actions, :activator_id, :promotion_id
+  end
+end

data/db/migrate/20140203161722_add_approver_id_and_approved_at_to_orders.rb

@@ -0,0 +1,6 @@
+class AddApproverIdAndApprovedAtToOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :approver_id, :integer
+    add_column :spree_orders, :approved_at, :datetime
+  end
+end

data/db/migrate/20140204115338_add_confirmation_delivered_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddConfirmationDeliveredToSpreeOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :confirmation_delivered, :boolean, default: false
+  end
+end

data/db/migrate/20140205120320_create_spree_payment_capture_events.rb

@@ -0,0 +1,12 @@
+class CreateSpreePaymentCaptureEvents < ActiveRecord::Migration
+  def change
+    create_table :spree_payment_capture_events do |t|
+      t.decimal :amount, precision: 10, scale: 2, default: 0.0
+      t.integer :payment_id
+
+      t.timestamps
+    end
+
+    add_index :spree_payment_capture_events, :payment_id
+  end
+end

data/db/migrate/20140205144710_add_uncaptured_amount_to_payments.rb

@@ -0,0 +1,5 @@
+class AddUncapturedAmountToPayments < ActiveRecord::Migration
+  def change
+    add_column :spree_payments, :uncaptured_amount, :decimal, precision: 10, scale: 2, default: 0.0
+  end
+end

data/db/migrate/20140207085910_add_tax_category_id_to_shipping_methods.rb

@@ -0,0 +1,5 @@
+class AddTaxCategoryIdToShippingMethods < ActiveRecord::Migration
+  def change
+    add_column :spree_shipping_methods, :tax_category_id, :integer
+  end
+end

data/db/migrate/20140207093021_add_tax_rate_id_to_shipping_rates.rb

@@ -0,0 +1,5 @@
+class AddTaxRateIdToShippingRates < ActiveRecord::Migration
+  def change
+    add_column :spree_shipping_rates, :tax_rate_id, :integer
+  end
+end

data/db/migrate/20140211040159_add_pre_tax_amount_to_line_items_and_shipments.rb

@@ -0,0 +1,6 @@
+class AddPreTaxAmountToLineItemsAndShipments < ActiveRecord::Migration
+  def change
+    add_column :spree_line_items, :pre_tax_amount, :decimal, precision: 8, scale: 2
+    add_column :spree_shipments, :pre_tax_amount, :decimal, precision: 8, scale: 2
+  end
+end

data/db/migrate/20140213184916_add_more_indexes.rb

@@ -0,0 +1,13 @@
+class AddMoreIndexes < ActiveRecord::Migration
+  def change
+    add_index :spree_payment_methods, [:id, :type]
+    add_index :spree_calculators, [:id, :type]
+    add_index :spree_calculators, [:calculable_id, :calculable_type]
+    add_index :spree_payments, :payment_method_id
+    add_index :spree_promotion_actions, [:id, :type]
+    add_index :spree_promotion_actions, :promotion_id
+    add_index :spree_promotions, [:id, :type]
+    add_index :spree_option_values, :option_type_id
+    add_index :spree_shipments, :stock_location_id
+  end
+end

data/db/migrate/20140219060952_add_considered_risky_to_orders.rb

@@ -0,0 +1,5 @@
+class AddConsideredRiskyToOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :considered_risky, :boolean, :default => false
+  end
+end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -122,12 +122,7 @@ end
     end
 
     def gemfile_path
-      version_file = File.expand_path("../../Versionfile", Dir.pwd)
-      if File.exist?(version_file)
-        '../../../../Gemfile'
-      else
-        '../../../../../Gemfile'
-      end
+      '../../../../../Gemfile'
     end
   end
 end

data/lib/generators/spree/install/install_generator.rb

@@ -70,18 +70,18 @@ Disallow: /account
     def setup_assets
       @lib_name = 'spree'
       %w{javascripts stylesheets images}.each do |path|
-        empty_directory "app/assets/#{path}/store" if defined? Spree::Frontend || Rails.env.test?
-        empty_directory "app/assets/#{path}/admin" if defined? Spree::Backend || Rails.env.test?
+        empty_directory "vendor/assets/#{path}/spree/frontend" if defined? Spree::Frontend || Rails.env.test?
+        empty_directory "vendor/assets/#{path}/spree/backend" if defined? Spree::Backend || Rails.env.test?
       end
 
       if defined? Spree::Frontend || Rails.env.test?
-        template "app/assets/javascripts/store/all.js"
-        template "app/assets/stylesheets/store/all.css"
+        template "vendor/assets/javascripts/spree/frontend/all.js"
+        template "vendor/assets/stylesheets/spree/frontend/all.css"
       end
 
       if defined? Spree::Backend || Rails.env.test?
-        template "app/assets/javascripts/admin/all.js"
-        template "app/assets/stylesheets/admin/all.css"
+        template "vendor/assets/javascripts/spree/backend/all.js"
+        template "vendor/assets/stylesheets/spree/backend/all.css"
       end
     end
 

data/lib/generators/spree/install/templates/{app/assets/javascripts/admin → vendor/assets/javascripts/spree/backend}/all.js

@@ -6,9 +6,9 @@
 //
 //= require jquery
 //= require jquery_ujs
-<% if options[:lib_name] == 'spree' %>
-//= require admin/spree_backend
+<% if options[:lib_name] == 'spree' || options[:lib_name] == 'spree/backend' %>
+//= require spree/backend
 <% else %>
-//= require admin/<%= options[:lib_name].gsub("/", "_") %>
+//= require spree/backend/<%= options[:lib_name].gsub("/", "_") %>
 <% end %>
 //= require_tree .

data/lib/generators/spree/install/templates/{app/assets/javascripts/store → vendor/assets/javascripts/spree/frontend}/all.js

@@ -6,9 +6,9 @@
 //
 //= require jquery
 //= require jquery_ujs
-<% if options[:lib_name] == 'spree' %>
-//= require store/spree_frontend
+<% if options[:lib_name] == 'spree' || options[:lib_name] == 'spree/frontend' %>
+//= require spree/frontend
 <% else %>
-//= require store/<%= options[:lib_name].gsub("/", "_") %>
+//= require spree/frontend/<%= options[:lib_name].gsub("/", "_") %>
 <% end %>
 //= require_tree .

data/lib/generators/spree/install/templates/{app/assets/stylesheets/store → vendor/assets/stylesheets/spree/backend}/all.css

@@ -3,10 +3,10 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *
-<% if options[:lib_name] == 'spree' %>
- *= require store/spree_frontend
+<% if options[:lib_name] == 'spree' || options[:lib_name] == 'spree/backend' %>
+ *= require spree/backend
 <% else %>
- *= require store/<%= options[:lib_name].gsub("/", "_") %>
+ *= require spree/backend/<%= options[:lib_name].gsub("/", "_") %>
 <% end %>
  *= require_self
  *= require_tree .

data/lib/generators/spree/install/templates/{app/assets/stylesheets/admin → vendor/assets/stylesheets/spree/frontend}/all.css

@@ -3,10 +3,10 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *
-<% if options[:lib_name] == 'spree' %>
- *= require admin/spree_backend
+<% if options[:lib_name] == 'spree' || options[:lib_name] == 'spree/frontend' %>
+ *= require spree/frontend
 <% else %>
- *= require admin/<%= options[:lib_name].gsub("/", "_") %>
+ *= require spree/frontend/<%= options[:lib_name].gsub("/", "_") %>
 <% end %>
  *= require_self
  *= require_tree .

data/lib/spree/core.rb

@@ -5,11 +5,11 @@ require 'awesome_nested_set'
 require 'cancan'
 require 'kaminari'
 require 'mail'
-require 'monetize'
 require 'paperclip'
 require 'paranoia'
 require 'ransack'
 require 'state_machine'
+require 'friendly_id'
 
 module Spree
 
@@ -36,24 +36,37 @@ module Spree
   def self.config(&block)
     yield(Spree::Config)
   end
+
+  module Core
+    autoload :ProductFilters, "spree/core/product_filters"
+
+    class GatewayError < RuntimeError; end
+  end
 end
 
 require 'spree/core/version'
+
+require 'spree/core/mail_interceptor'
+require 'spree/core/mail_method'
+require 'spree/core/mail_settings'
+require 'spree/core/environment_extension'
+require 'spree/core/environment/calculators'
+require 'spree/core/environment'
+require 'spree/promo/environment'
 require 'spree/migrations'
 require 'spree/core/engine'
 
 require 'spree/i18n'
 require 'spree/money'
-require 'spree/promo/coupon_applicator'
 
+require 'spree/permitted_attributes'
+require 'spree/core/user_address'
 require 'spree/core/delegate_belongs_to'
 require 'spree/core/permalinks'
 require 'spree/core/token_resource'
 require 'spree/core/calculated_adjustments'
 require 'spree/core/product_duplicator'
-require 'spree/core/mail_method'
-require 'spree/core/mail_settings'
-
-ActiveRecord::Base.class_eval do
-  include CollectiveIdea::Acts::NestedSet
-end
+require 'spree/core/controller_helpers'
+require 'spree/core/controller_helpers/strong_parameters'
+require 'spree/core/controller_helpers/ssl'
+require 'spree/core/controller_helpers/search'