spree_core 3.6.6 → 3.7.0.rc1

data/db/default/spree/countries.rb

@@ -11,7 +11,7 @@ Carmen::Country.all.each do |country|
   ).first_or_create
 end
 
-Spree::Config[:default_country_id] = Spree::Country.find_by(iso: "US").id
+Spree::Config[:default_country_id] = Spree::Country.find_by(iso: 'US').id
 
 # find countries that do not use postal codes (by iso) and set 'zipcode_required' to false for them.
 

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/roles.rb

@@ -1,2 +1,2 @@
-Spree::Role.where(name: "admin").first_or_create
-Spree::Role.where(name: "user").first_or_create
+Spree::Role.where(name: 'admin').first_or_create
+Spree::Role.where(name: 'user').first_or_create

data/db/default/spree/states.rb

@@ -1,6 +1,7 @@
 Spree::Country.where(states_required: true).each do |country|
   carmen_country = Carmen::Country.named(country.name)
-  next if !carmen_country
+  next unless carmen_country
+
   carmen_country.subregions.each do |subregion|
     country.states.where(
       name: subregion.name,

data/db/default/spree/stores.rb

@@ -6,4 +6,4 @@ unless Spree::Store.where(code: 'spree').exists?
     s.url               = 'example.com'
     s.mail_from_address = 'spree@example.com'
   end.save!
-end
+end

data/db/default/spree/zones.rb

@@ -1,11 +1,10 @@
-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')
+eu_vat = Spree::Zone.where(name: 'EU_VAT', description: 'Countries that make up the EU VAT zone.', kind: 'country').first_or_create!
+north_america = Spree::Zone.where(name: 'North America', description: 'USA + Canada', kind: 'country').first_or_create!
 
-%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))
+%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.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
 end
 
 %w(US CA).each do |name|
-  north_america.zone_members.create!(zoneable: Spree::Country.find_by!(iso: name))
+  north_america.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
 end

data/db/migrate/20120831092320_spree_one_two.rb

@@ -18,7 +18,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.string     :code
       t.boolean    :advertise,    default: false
       t.string     :path
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_addresses do |t|
@@ -34,7 +34,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.string     :company
       t.references :state
       t.references :country
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_addresses, [:firstname], name: 'index_addresses_on_firstname'
@@ -49,7 +49,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.boolean    :mandatory
       t.boolean    :locked
       t.boolean    :eligible,   default: true
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_adjustments, [:adjustable_id], name: 'index_adjustments_on_order_id'
@@ -73,13 +73,13 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
     create_table :spree_calculators do |t|
       t.string     :type
       t.references :calculable, polymorphic: true
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_configurations do |t|
       t.string     :name
       t.string     :type, limit: 50
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_configurations, [:name, :type], name: 'index_spree_configurations_on_name_and_type'
@@ -105,7 +105,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.references :address
       t.string     :gateway_customer_profile_id
       t.string     :gateway_payment_profile_id
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_gateways do |t|
@@ -116,7 +116,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.string     :environment, default: 'development'
       t.string     :server,      default: 'test'
       t.boolean    :test_mode,   default: true
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_inventory_units do |t|
@@ -126,7 +126,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.references :order
       t.references :shipment
       t.references :return_authorization
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_inventory_units, [:order_id],    name: 'index_inventory_units_on_order_id'
@@ -138,7 +138,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.references :order
       t.integer    :quantity,                               null: false
       t.decimal    :price,    precision: 8, scale: 2, null: false
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_line_items, [:order_id],   name: 'index_spree_line_items_on_order_id'
@@ -147,20 +147,20 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
     create_table :spree_log_entries do |t|
       t.references :source, polymorphic: true
       t.text     :details
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_mail_methods do |t|
       t.string     :environment
       t.boolean    :active,     default: true
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_option_types do |t|
       t.string    :name,         limit: 100
       t.string    :presentation, limit: 100
       t.integer   :position,                   default: 0, null: false
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_option_types_prototypes, id: false do |t|
@@ -173,7 +173,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.string     :name
       t.string     :presentation
       t.references :option_type
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_option_values_variants, id: false do |t|
@@ -200,7 +200,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.string     :payment_state
       t.string     :email
       t.text       :special_instructions
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_orders, [:number], name: 'index_spree_orders_on_number'
@@ -213,7 +213,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.string     :environment, default: 'development'
       t.datetime   :deleted_at
       t.string     :display_on
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_payments do |t|
@@ -224,7 +224,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.string     :state
       t.string     :response_code
       t.string     :avs_response
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_preferences do |t|
@@ -233,7 +233,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.text       :value
       t.string     :key
       t.string     :value_type
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_preferences, [:key], name: 'index_spree_preferences_on_key', unique: true
@@ -242,14 +242,14 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.integer    :position
       t.references :product
       t.references :option_type
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_product_properties do |t|
       t.string     :value
       t.references :product
       t.references :property
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_product_properties, [:product_id], name: 'index_product_properties_on_product_id'
@@ -265,7 +265,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.references :tax_category
       t.references :shipping_category
       t.integer    :count_on_hand,        default: 0,  null: false
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_products, [:available_on], name: 'index_spree_products_on_available_on'
@@ -284,7 +284,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
     create_table :spree_properties do |t|
       t.string     :name
       t.string     :presentation, null: false
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_properties_prototypes, id: false do |t|
@@ -294,7 +294,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
 
     create_table :spree_prototypes do |t|
       t.string     :name
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_return_authorizations do |t|
@@ -303,7 +303,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.decimal    :amount, precision: 8, scale: 2, default: 0.0, null: false
       t.references :order
       t.text       :reason
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_roles do |t|
@@ -327,14 +327,14 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.references :shipping_method
       t.references :address
       t.string     :state
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_shipments, [:number], name: 'index_shipments_on_number'
 
     create_table :spree_shipping_categories do |t|
       t.string   :name
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_shipping_methods do |t|
@@ -346,7 +346,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.boolean    :match_all
       t.boolean    :match_one
       t.datetime   :deleted_at
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_state_changes do |t|
@@ -356,7 +356,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.references :user
       t.string     :stateful_type
       t.string     :next_state
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_states do |t|
@@ -370,7 +370,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.string     :description
       t.boolean    :is_default, default: false
       t.datetime   :deleted_at
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_tax_rates do |t|
@@ -378,12 +378,12 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.references :zone
       t.references :tax_category
       t.boolean    :included_in_price, default: false
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_taxonomies do |t|
       t.string     :name, null: false
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_taxons do |t|
@@ -399,7 +399,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.integer    :icon_file_size
       t.datetime   :icon_updated_at
       t.text       :description
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_taxons, [:parent_id],   name: 'index_taxons_on_parent_id'
@@ -409,7 +409,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
     create_table :spree_tokenized_permissions, force: true do |t|
       t.references :permissable, polymorphic: true
       t.string     :token
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_tokenized_permissions, [:permissable_id, :permissable_type], name: 'index_tokenized_name_and_type'
@@ -418,7 +418,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.string     :environment
       t.string     :analytics_id
       t.boolean    :active,       default: true
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_users do |t|
@@ -444,7 +444,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.datetime   :locked_at
       t.datetime   :remember_created_at
       t.datetime   :reset_password_sent_at
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_variants do |t|
@@ -467,7 +467,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
     create_table :spree_zone_members do |t|
       t.references :zoneable, polymorphic: true
       t.references :zone
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     create_table :spree_zones do |t|
@@ -475,7 +475,7 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
       t.string     :description
       t.boolean    :default_tax,        default: false
       t.integer    :zone_members_count, default: 0
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
   end
 end

data/db/migrate/20120831092359_spree_promo_one_two.rb

@@ -28,7 +28,7 @@ class SpreePromoOneTwo < ActiveRecord::Migration[4.2]
       t.references :user
       t.references :product_group
       t.string     :type
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_promotion_rules, [:product_group_id], name: 'index_promotion_rules_on_product_group_id'

data/db/migrate/20130211190146_create_spree_stock_items.rb

@@ -6,7 +6,7 @@ class CreateSpreeStockItems < ActiveRecord::Migration[4.2]
       t.integer :count_on_hand, null: false, default: 0
       t.integer :lock_version
 
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
     add_index :spree_stock_items, :stock_location_id
     add_index :spree_stock_items, [:stock_location_id, :variant_id], name: 'stock_item_by_loc_and_var_id'

data/db/migrate/20130211191120_create_spree_stock_locations.rb

@@ -4,7 +4,7 @@ class CreateSpreeStockLocations < ActiveRecord::Migration[4.2]
       t.string :name
       t.belongs_to :address
 
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
     add_index :spree_stock_locations, :address_id
   end

data/db/migrate/20130301162924_create_shipping_method_categories.rb

@@ -4,7 +4,7 @@ class CreateShippingMethodCategories < ActiveRecord::Migration[4.2]
       t.integer :shipping_method_id, null: false
       t.integer :shipping_category_id, null: false
 
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_shipping_method_categories, :shipping_method_id

data/db/migrate/20130304162240_create_spree_shipping_rates.rb

@@ -5,7 +5,7 @@ class CreateSpreeShippingRates < ActiveRecord::Migration[4.2]
       t.belongs_to :shipping_method
       t.boolean :selected, default: false
       t.decimal :cost, precision: 8, scale: 2
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
     add_index(:spree_shipping_rates, [:shipment_id, :shipping_method_id],
               name: 'spree_shipping_rates_join_index',

data/db/migrate/20130305143310_create_stock_movements.rb

@@ -5,7 +5,7 @@ class CreateStockMovements < ActiveRecord::Migration[4.2]
       t.integer :quantity
       t.string :action
 
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
     add_index :spree_stock_movements, :stock_item_id
   end

data/db/migrate/20130418125341_create_spree_stock_transfers.rb

@@ -5,7 +5,7 @@ class CreateSpreeStockTransfers < ActiveRecord::Migration[4.2]
       t.string :reference_number
       t.integer :source_location_id
       t.integer :destination_location_id
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_stock_transfers, :source_location_id

data/db/migrate/20140205120320_create_spree_payment_capture_events.rb

@@ -4,7 +4,7 @@ class CreateSpreePaymentCaptureEvents < ActiveRecord::Migration[4.2]
       t.decimal :amount, precision: 10, scale: 2, default: 0.0
       t.integer :payment_id
 
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_payment_capture_events, :payment_id

data/db/migrate/20140309023735_migrate_old_preferences.rb

@@ -1,6 +1,10 @@
 class MigrateOldPreferences < ActiveRecord::Migration[4.2]
   def up
-    migrate_preferences(Spree::Calculator)
+    if Spree::Calculator.respond_to?(:with_deleted)
+      migrate_preferences(Spree::Calculator.with_deleted)
+    else
+      migrate_preferences(Spree::Calculator)
+    end
     migrate_preferences(Spree::PaymentMethod)
     migrate_preferences(Spree::PromotionRule)
   end