spree_core 3.0.10 → 3.1.0.rc1

data/config/routes.rb

@@ -1 +1,8 @@
+Spree::Core::Engine.add_routes do
+  get '/forbidden', to: 'home#forbidden', as: :forbidden
+  # those routes are needed for mailers
+  root to: 'home#index'
+  resources :products, only: [:index, :show]
+end
+
 Spree::Core::Engine.draw_routes

data/db/default/spree/default_reimbursement_type.rb

@@ -1 +1 @@
-Spree::RefundReason.find_or_create_by(name: "Return processing", mutable: false)
+Spree::RefundReason.find_or_create_by!(name: "Return processing", mutable: false)

data/db/default/spree/zones.rb

@@ -1,6 +1,7 @@
-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")
-%w(PL FI PT RO DE FR SK HU SI IE AT ES IT BE SE LV BG GB LT CY LU MT DK NL EE).
+eu_vat = Spree::Zone.create!(name: "EU_VAT", description: "Countries that make up the EU VAT zone.", kind: 'country')
+north_america = Spree::Zone.create!(name: "North America", description: "USA + Canada", kind: 'country')
+
+%w(PL FI PT RO DE FR SK HU SI IE AT ES IT BE SE LV BG GB LT CY LU MT DK NL EE HR CZ GR).
 each do |name|
   eu_vat.zone_members.create!(zoneable: Spree::Country.find_by!(iso: name))
 end
@@ -8,5 +9,3 @@ end
 %w(US CA).each do |name|
   north_america.zone_members.create!(zoneable: Spree::Country.find_by!(iso: name))
 end
-
-

data/db/migrate/20150118210639_create_spree_store_credits.rb

@@ -0,0 +1,24 @@
+class CreateSpreeStoreCredits < ActiveRecord::Migration
+  def change
+    create_table :spree_store_credits do |t|
+      t.references :user
+      t.references :category
+      t.references :created_by
+      t.decimal :amount, precision: 8, scale: 2, default: 0.0, null: false
+      t.decimal :amount_used, precision: 8, scale: 2, default: 0.0, null: false
+      t.text :memo
+      t.datetime :deleted_at
+      t.string :currency
+      t.decimal :amount_authorized, precision: 8, scale: 2, default: 0.0, null: false
+      t.integer :originator_id
+      t.string :originator_type
+      t.integer :type_id
+      t.timestamps null: false
+    end
+
+    add_index :spree_store_credits, :deleted_at
+    add_index :spree_store_credits, :user_id
+    add_index :spree_store_credits, :type_id
+    add_index :spree_store_credits, [:originator_id, :originator_type], name: :spree_store_credits_originator
+  end
+end

data/db/migrate/20150118211500_create_spree_store_credit_categories.rb

@@ -0,0 +1,8 @@
+class CreateSpreeStoreCreditCategories < ActiveRecord::Migration
+  def change
+    create_table :spree_store_credit_categories do |t|
+      t.string :name
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20150118212051_create_spree_store_credit_events.rb

@@ -0,0 +1,17 @@
+class CreateSpreeStoreCreditEvents < ActiveRecord::Migration
+  def change
+    create_table :spree_store_credit_events do |t|
+      t.integer  :store_credit_id,    null: false
+      t.string   :action,             null: false
+      t.decimal  :amount,             precision: 8,  scale: 2
+      t.string   :authorization_code, null: false
+      t.decimal  :user_total_amount,  precision: 8, scale: 2, default: 0.0, null: false
+      t.integer  :originator_id
+      t.string   :originator_type
+      t.datetime :deleted_at
+      t.timestamps null: false
+    end
+    add_index :spree_store_credit_events, :store_credit_id
+    add_index :spree_store_credit_events, [:originator_id, :originator_type], name: :spree_store_credit_events_originator
+  end
+end

data/db/migrate/20150118212101_create_spree_store_credit_types.rb

@@ -0,0 +1,10 @@
+class CreateSpreeStoreCreditTypes < ActiveRecord::Migration
+  def change
+    create_table :spree_store_credit_types do |t|
+      t.string :name
+      t.integer :priority
+      t.timestamps null: false
+    end
+    add_index :spree_store_credit_types, :priority
+  end
+end

data/db/migrate/20150314013438_add_missing_indexes.rb

@@ -0,0 +1,25 @@
+class AddMissingIndexes < ActiveRecord::Migration
+  def change
+    add_index   :spree_promotion_rules_users,
+                        [:user_id, :promotion_rule_id],
+                        name: 'index_promotion_rules_users_on_user_id_and_promotion_rule_id'
+    add_index   :spree_products_promotion_rules,
+                        [:promotion_rule_id, :product_id],
+                        name: 'index_products_promotion_rules_on_promotion_rule_and_product'
+    add_index :spree_orders, :canceler_id
+    add_index :spree_orders, :store_id
+    add_index :spree_orders_promotions, [:promotion_id, :order_id]
+    add_index :spree_properties_prototypes, :prototype_id
+    add_index   :spree_properties_prototypes,
+                        [:prototype_id, :property_id],
+                        name:  'index_properties_prototypes_on_prototype_and_property'
+    add_index :spree_taxons_prototypes, [:prototype_id, :taxon_id]
+    add_index :spree_option_types_prototypes, :prototype_id
+    add_index   :spree_option_types_prototypes,
+                        [:prototype_id, :option_type_id],
+                        name: 'index_option_types_prototypes_on_prototype_and_option_type'
+    add_index   :spree_option_values_variants,
+                        [:option_value_id, :variant_id],
+                        name: 'index_option_values_variants_on_option_value_and_variant'
+  end
+end

data/db/migrate/20150317174308_remove_duplicated_indexes_from_multi_columns.rb

@@ -0,0 +1,18 @@
+class RemoveDuplicatedIndexesFromMultiColumns < ActiveRecord::Migration
+  def change
+    remove_index :spree_adjustments, name: "index_adjustments_on_order_id"
+    remove_index :spree_option_types_prototypes, :prototype_id
+    add_index :spree_option_types_prototypes, :option_type_id
+    remove_index :spree_option_values_variants, name: 'index_option_values_variants_on_option_value_and_variant'
+    remove_index :spree_option_values_variants, :variant_id
+    add_index :spree_option_values_variants, :option_value_id
+    remove_index :spree_orders, :user_id
+    remove_index :spree_orders_promotions, [:order_id, :promotion_id]
+    add_index :spree_orders_promotions, :order_id
+    remove_index :spree_products_promotion_rules, name: "index_products_promotion_rules_on_promotion_rule_id"
+    remove_index :spree_promotion_rules_users, name: "index_promotion_rules_users_on_user_id"
+    remove_index :spree_properties_prototypes, :prototype_id
+    remove_index :spree_stock_items, :stock_location_id
+    remove_index :spree_taxons_prototypes, :prototype_id
+  end
+end

data/db/migrate/20150324104002_remove_user_index_from_spree_state_changes.rb

@@ -0,0 +1,14 @@
+class RemoveUserIndexFromSpreeStateChanges < ActiveRecord::Migration
+  def up
+    if index_exists? :spree_state_changes, :user_id
+      remove_index :spree_state_changes, :user_id
+    end
+
+  end
+
+  def down
+    unless index_exists? :spree_state_changes, :user_id
+      add_index :spree_state_changes, :user_id
+    end
+  end
+end

data/db/migrate/20150522071831_add_position_to_spree_payment_methods.rb

@@ -0,0 +1,5 @@
+class AddPositionToSpreePaymentMethods < ActiveRecord::Migration
+  def change
+    add_column :spree_payment_methods, :position, :integer, default: 0
+  end
+end

data/db/migrate/20150626181949_add_taxable_adjustment_total_to_line_item.rb

@@ -0,0 +1,19 @@
+class AddTaxableAdjustmentTotalToLineItem < ActiveRecord::Migration
+  def change
+    add_column :spree_line_items, :taxable_adjustment_total, :decimal,
+               precision: 10, scale: 2, default: 0.0, null: false
+    add_column :spree_line_items, :non_taxable_adjustment_total, :decimal,
+               precision: 10, scale: 2, default: 0.0, null: false
+
+    add_column :spree_shipments, :taxable_adjustment_total, :decimal,
+               precision: 10, scale: 2, default: 0.0, null: false
+    add_column :spree_shipments, :non_taxable_adjustment_total, :decimal,
+               precision: 10, scale: 2, default: 0.0, null: false
+
+    add_column :spree_orders, :taxable_adjustment_total, :decimal,
+               precision: 10, scale: 2, default: 0.0, null: false
+    add_column :spree_orders, :non_taxable_adjustment_total, :decimal,
+               precision: 10, scale: 2, default: 0.0, null: false
+    # TODO migration that updates old orders
+  end
+end

data/db/migrate/20150627090949_migrate_payment_methods_display.rb

@@ -0,0 +1,12 @@
+class MigratePaymentMethodsDisplay < ActiveRecord::Migration
+  def change
+    Spree::PaymentMethod.all.each do |method|
+      if method.display_on.blank?
+        method.display_on = "both"
+        method.save
+      end
+    end
+
+    change_column :spree_payment_methods, :display_on, :string, default: "both"
+  end
+end

data/db/migrate/20150714154102_spree_payment_method_store_credits.rb

@@ -0,0 +1,12 @@
+class SpreePaymentMethodStoreCredits < ActiveRecord::Migration
+  def up
+    # Reload to pick up new position column for acts_as_list
+    Spree::PaymentMethod.reset_column_information
+    Spree::PaymentMethod::StoreCredit.find_or_create_by(name: 'Store Credit', description: 'Store Credit',
+                                                        active: true, display_on: 'back_end')
+  end
+
+  def down
+    Spree::PaymentMethod.find_by(type: 'Spree::PaymentMethod::StoreCredit', name: 'Store Credit').try(&:destroy)
+  end
+end

data/db/migrate/20150726141425_rename_has_and_belongs_to_associations_to_model_names.rb

@@ -0,0 +1,18 @@
+class RenameHasAndBelongsToAssociationsToModelNames < ActiveRecord::Migration
+  def change
+    {
+      'spree_option_types_prototypes' => 'spree_option_type_prototypes',
+      'spree_option_values_variants' => 'spree_option_value_variants',
+      'spree_orders_promotions' => 'spree_order_promotions',
+      'spree_products_promotion_rules' => 'spree_product_promotion_rules',
+      'spree_taxons_promotion_rules' => 'spree_promotion_rule_taxons',
+      'spree_promotion_rules_users' => 'spree_promotion_rule_users',
+      'spree_properties_prototypes' => 'spree_property_prototypes',
+      'spree_taxons_prototypes' => 'spree_prototype_taxons',
+      'spree_roles_users' => 'spree_role_users',
+      'spree_shipping_methods_zones' => 'spree_shipping_method_zones'
+    }.each do |old_name, new_name|
+      rename_table old_name, new_name
+    end
+  end
+end

data/db/migrate/20150727191614_spree_store_credit_types.rb

@@ -0,0 +1,11 @@
+class SpreeStoreCreditTypes < ActiveRecord::Migration
+  def up
+    Spree::StoreCreditType.find_or_create_by(name: 'Expiring', priority: 1)
+    Spree::StoreCreditType.find_or_create_by(name: 'Non-expiring', priority: 2)
+  end
+
+  def down
+    Spree::StoreCreditType.find_by(name: 'Expiring').try(&:destroy)
+    Spree::StoreCreditType.find_by(name: 'Non-expiring').try(&:destroy)
+  end
+end

data/db/migrate/20150819154308_add_discontinued_to_products_and_variants.rb

@@ -0,0 +1,68 @@
+class AddDiscontinuedToProductsAndVariants < ActiveRecord::Migration
+  def up
+    add_column :spree_products, :discontinue_on, :datetime, after: :available_on
+    add_column :spree_variants, :discontinue_on, :datetime, after: :deleted_at
+
+    add_index :spree_products, :discontinue_on
+    add_index :spree_variants, :discontinue_on
+
+    puts "Warning: This migration changes the meaning of 'deleted'. Before this change, 'deleted' meant products that were no longer being sold in your store. After this change, you can only delete a product or variant if it has not already been sold to a customer (a model-level check enforces this). Instead, you should use the new field 'discontinue_on' for products or variants which were sold in the past but no longer for sale. This fixes bugs when other objects are attached to deleted products and variants. (Even though acts_as_paranoid gem keeps the records in the database, most associations are automatically scoped to exclude the deleted records.) In thew meaning of 'deleted,' you can still use the delete function on products & variants which are *truly user-error mistakes*, specifically before an order has been placed or the items have gone on sale. You also must use the soft-delete function (which still works after this change) to clean up slug (product) and SKU (variant) duplicates. Otherwise, you should generally over ever need to discontinue products.
+
+Data Fix: We will attempt to reverse engineer the old meaning of 'deleted' (no longer for sale) to the new database field 'discontinue_on'. However, since Slugs and SKUs cannot be duplicated on Products and Variants, we cannot gaurantee this to be foolproof if you have deteled Products and Variants that have duplicate Slugs or SKUs in non-deleted records. In these cases, we recommend you use the additional rake task to clean up your old records (see rake db:fix_orphan_line_items). If you have such records, this migration will leave them in place, preferring the non-deleted records over the deleted ones. However, since old line items will still be associated with deleted objects, you will still the bugs in your app until you run:
+
+rake db:fix_orphan_line_items
+
+We will print out a report of the data we are fixing now: "
+
+    Spree::Product.only_deleted.each do |product|
+      # determine if there is a slug duplicate
+      the_dup = Spree::Product.find_by(slug: product.slug)
+      if the_dup.nil?
+        # check to see if there are line items attached to any variants
+        if Spree::Variant.with_deleted.where(product_id: product.id).map(&:line_items).any?
+          puts "recovering deleted product id #{product.id} ... this will un-delete the record and set it to be discontinued"
+
+          old_deleted = product.deleted_at
+          product.update_column(:deleted_at, nil) # for some reason .recover doesn't appear to be a method
+          product.update_column(:discontinue_on, old_deleted)
+        else
+          puts "leaving product id #{product.id} deleted because there are no line items attached to it..."
+        end
+      else
+        puts "leaving product id #{product.id} deleted because there is a duplicate slug for '#{product.slug}' (product id #{the_dup.id}) "
+        if product.variants.map(&:line_items).any?
+          puts "WARNING: You may still have bugs with product id #{product.id} (#{product.name}) until you run rake db:fix_orphan_line_items"
+        end
+      end
+    end
+
+    Spree::Variant.only_deleted.each do |variant|
+      # determine if there is a slug duplicate
+      the_dup = Spree::Variant.find_by(sku: variant.sku)
+      if the_dup.nil?
+        # check to see if there are line items attached to any variants
+        if variant.line_items.any?
+          puts "recovering deleted variant id #{variant.id} ... this will un-delete the record and set it to be discontinued"
+          old_deleted = variant.deleted_at
+          variant.update_column(:deleted_at, nil) # for some reason .recover doesn't appear to be a method
+          variant.update_column(:discontinue_on, old_deleted)
+        else
+          puts "leaving variant id #{variant.id} deleted because there are no line items attached to it..."
+        end
+      else
+        puts "leaving variant id #{variant.id} deleted because there is a duplicate SKU for '#{variant.sku}' (variant id #{the_dup.id}) "
+        if variant.line_items.any?
+          puts "WARNING: You may still have bugs with variant id #{variant.id} (#{variant.name}) until you run rake db:fix_orphan_line_items"
+        end
+      end
+    end
+  end
+
+  def down
+    execute "UPDATE `spree_products` SET `deleted_at` = `discontinue_on` WHERE `deleted_at` IS NULL"
+    execute "UPDATE `spree_variants` SET `deleted_at` = `discontinue_on` WHERE `deleted_at` IS NULL"
+
+    remove_column :spree_products, :discontinue_on
+    remove_column :spree_variants, :discontinue_on
+  end
+end

data/db/migrate/20151220072838_remove_shipping_method_id_from_spree_orders.rb

@@ -0,0 +1,13 @@
+class RemoveShippingMethodIdFromSpreeOrders < ActiveRecord::Migration
+  def up
+    if column_exists?(:spree_orders, :shipping_method_id, :integer)
+      remove_column :spree_orders, :shipping_method_id, :integer
+    end
+  end
+
+  def down
+    unless column_exists?(:spree_orders, :shipping_method_id, :integer)
+      add_column :spree_orders, :shipping_method_id, :integer
+    end
+  end
+end

data/db/migrate/20160207191757_add_id_column_to_earlier_habtm_tables.rb

@@ -0,0 +1,16 @@
+class AddIdColumnToEarlierHabtmTables < ActiveRecord::Migration
+  def up
+    add_column :spree_option_type_prototypes, :id, :primary_key
+    add_column :spree_option_value_variants, :id, :primary_key
+    add_column :spree_order_promotions, :id, :primary_key
+    add_column :spree_product_promotion_rules, :id, :primary_key
+    add_column :spree_promotion_rule_users, :id, :primary_key
+    add_column :spree_property_prototypes, :id, :primary_key
+    add_column :spree_role_users, :id, :primary_key
+    add_column :spree_shipping_method_zones, :id, :primary_key
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20160219165458_add_indexes.rb

@@ -0,0 +1,14 @@
+class AddIndexes < ActiveRecord::Migration
+  def change
+    add_index :spree_assets, :position
+    add_index :spree_option_types, :name
+    add_index :spree_option_values, :name
+    add_index :spree_prices, :variant_id
+    add_index :spree_properties, :name
+    add_index :spree_roles, :name
+    add_index :spree_shipping_categories, :name
+    add_index :spree_taxons, :lft
+    add_index :spree_taxons, :rgt
+    add_index :spree_taxons, :name
+  end
+end

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

@@ -1,6 +1,8 @@
 <% if agent_number = ENV['TC_AGENT_NUMBER']
 database_prefix = agent_number + '_'
 end %>
+<% db_password = ENV['DB_PASSWORD'] %>
+<% db_username = ENV['DB_USERNAME'] %>
 <% case ENV['DB']
   when 'sqlite' %>
 development:
@@ -14,44 +16,49 @@ production:
   adapter: sqlite3
   database: db/spree_production.sqlite3
 <% when 'mysql' %>
-development:
+mysql: &mysql
   adapter: mysql2
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_development
   encoding: utf8
+  <% unless db_username.blank? %>
+  username: <%= db_username %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+
+development:
+  <<: *mysql
+  database: <%= database_prefix %><%= options[:lib_name] %>_spree_development
 test:
-  adapter: mysql2
+  <<: *mysql
   database: <%= database_prefix %><%= options[:lib_name] %>_spree_test
-  encoding: utf8
 production:
-  adapter: mysql2
+  <<: *mysql
   database: <%= database_prefix %><%= options[:lib_name] %>_spree_production
-  encoding: utf8
 <% when 'postgres' %>
 <% db_host = ENV['DB_HOST'] %>
-development:
+postgres: &postgres
   adapter: postgresql
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_development
-  username: postgres
-  min_messages: warning
-<% unless db_host.blank? %>
+  <% unless db_username.blank? %>
+  username: <%= db_username || 'postgres' %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
   host: <%= db_host %>
-<% end %>
+  <% end %>
+  min_messages: warning
+
+development:
+  <<: *postgres
+  database: <%= database_prefix %><%= options[:lib_name] %>_spree_development
 test:
-  adapter: postgresql
+  <<: *postgres
   database: <%= database_prefix %><%= options[:lib_name] %>_spree_test
-  username: postgres
-  min_messages: warning
-<% unless db_host.blank? %>
-  host: <%= db_host %>
-<% end %>
 production:
-  adapter: postgresql
+  <<: *postgres
   database: <%= database_prefix %><%= options[:lib_name] %>_spree_production
-  username: postgres
-  min_messages: warning
-<% unless db_host.blank? %>
-  host: <%= db_host %>
-<% end %>
 <% else %>
 development:
   adapter: sqlite3