spree_core 2.3.13 → 2.4.0.rc1

data/db/default/spree/states.rb

@@ -1,58 +1,76 @@
-country = Spree::Country.find_by(name: 'United States')
+united_states = Spree::Country.find_by(name: 'United States')
 
 Spree::State.create!([
-  { name: 'Michigan', abbr: 'MI', country: country },
-  { name: 'South Dakota', abbr: 'SD', country: country },
-  { name: 'Washington', abbr: 'WA', country: country },
-  { name: 'Wisconsin', abbr: 'WI', country: country },
-  { name: 'Arizona', abbr: 'AZ', country: country },
-  { name: 'Illinois', abbr: 'IL', country: country },
-  { name: 'New Hampshire', abbr: 'NH', country: country },
-  { name: 'North Carolina', abbr: 'NC', country: country },
-  { name: 'Kansas', abbr: 'KS', country: country },
-  { name: 'Missouri', abbr: 'MO', country: country },
-  { name: 'Arkansas', abbr: 'AR', country: country },
-  { name: 'Nevada', abbr: 'NV', country: country },
-  { name: 'District of Columbia', abbr: 'DC', country: country },
-  { name: 'Idaho', abbr: 'ID', country: country },
-  { name: 'Nebraska', abbr: 'NE', country: country },
-  { name: 'Pennsylvania', abbr: 'PA', country: country },
-  { name: 'Hawaii', abbr: 'HI', country: country },
-  { name: 'Utah', abbr: 'UT', country: country },
-  { name: 'Vermont', abbr: 'VT', country: country },
-  { name: 'Delaware', abbr: 'DE', country: country },
-  { name: 'Rhode Island', abbr: 'RI', country: country },
-  { name: 'Oklahoma', abbr: 'OK', country: country },
-  { name: 'Louisiana', abbr: 'LA', country: country },
-  { name: 'Montana', abbr: 'MT', country: country },
-  { name: 'Tennessee', abbr: 'TN', country: country },
-  { name: 'Maryland', abbr: 'MD', country: country },
-  { name: 'Florida', abbr: 'FL', country: country },
-  { name: 'Virginia', abbr: 'VA', country: country },
-  { name: 'Minnesota', abbr: 'MN', country: country },
-  { name: 'New Jersey', abbr: 'NJ', country: country },
-  { name: 'Ohio', abbr: 'OH', country: country },
-  { name: 'California', abbr: 'CA', country: country },
-  { name: 'North Dakota', abbr: 'ND', country: country },
-  { name: 'Maine', abbr: 'ME', country: country },
-  { name: 'Indiana', abbr: 'IN', country: country },
-  { name: 'Texas', abbr: 'TX', country: country },
-  { name: 'Oregon', abbr: 'OR', country: country },
-  { name: 'Wyoming', abbr: 'WY', country: country },
-  { name: 'Alabama', abbr: 'AL', country: country },
-  { name: 'Iowa', abbr: 'IA', country: country },
-  { name: 'Mississippi', abbr: 'MS', country: country },
-  { name: 'Kentucky', abbr: 'KY', country: country },
-  { name: 'New Mexico', abbr: 'NM', country: country },
-  { name: 'Georgia', abbr: 'GA', country: country },
-  { name: 'Colorado', abbr: 'CO', country: country },
-  { name: 'Massachusetts', abbr: 'MA', country: country },
-  { name: 'Connecticut', abbr: 'CT', country: country },
-  { name: 'New York', abbr: 'NY', country: country },
-  { name: 'South Carolina', abbr: 'SC', country: country },
-  { name: 'Alaska', abbr: 'AK', country: country },
-  { name: 'West Virginia', abbr: 'WV', country: country },
-  { name: 'U.S. Armed Forces - Americas', abbr: 'AA', country: country },
-  { name: 'U.S. Armed Forces - Europe', abbr: 'AE', country: country },
-  { name: 'U.S. Armed Forces - Pacific', abbr: 'AP', country: country }
+  { name: 'Michigan', abbr: 'MI', country: united_states },
+  { name: 'South Dakota', abbr: 'SD', country: united_states },
+  { name: 'Washington', abbr: 'WA', country: united_states },
+  { name: 'Wisconsin', abbr: 'WI', country: united_states },
+  { name: 'Arizona', abbr: 'AZ', country: united_states },
+  { name: 'Illinois', abbr: 'IL', country: united_states },
+  { name: 'New Hampshire', abbr: 'NH', country: united_states },
+  { name: 'North Carolina', abbr: 'NC', country: united_states },
+  { name: 'Kansas', abbr: 'KS', country: united_states },
+  { name: 'Missouri', abbr: 'MO', country: united_states },
+  { name: 'Arkansas', abbr: 'AR', country: united_states },
+  { name: 'Nevada', abbr: 'NV', country: united_states },
+  { name: 'District of Columbia', abbr: 'DC', country: united_states },
+  { name: 'Idaho', abbr: 'ID', country: united_states },
+  { name: 'Nebraska', abbr: 'NE', country: united_states },
+  { name: 'Pennsylvania', abbr: 'PA', country: united_states },
+  { name: 'Hawaii', abbr: 'HI', country: united_states },
+  { name: 'Utah', abbr: 'UT', country: united_states },
+  { name: 'Vermont', abbr: 'VT', country: united_states },
+  { name: 'Delaware', abbr: 'DE', country: united_states },
+  { name: 'Rhode Island', abbr: 'RI', country: united_states },
+  { name: 'Oklahoma', abbr: 'OK', country: united_states },
+  { name: 'Louisiana', abbr: 'LA', country: united_states },
+  { name: 'Montana', abbr: 'MT', country: united_states },
+  { name: 'Tennessee', abbr: 'TN', country: united_states },
+  { name: 'Maryland', abbr: 'MD', country: united_states },
+  { name: 'Florida', abbr: 'FL', country: united_states },
+  { name: 'Virginia', abbr: 'VA', country: united_states },
+  { name: 'Minnesota', abbr: 'MN', country: united_states },
+  { name: 'New Jersey', abbr: 'NJ', country: united_states },
+  { name: 'Ohio', abbr: 'OH', country: united_states },
+  { name: 'California', abbr: 'CA', country: united_states },
+  { name: 'North Dakota', abbr: 'ND', country: united_states },
+  { name: 'Maine', abbr: 'ME', country: united_states },
+  { name: 'Indiana', abbr: 'IN', country: united_states },
+  { name: 'Texas', abbr: 'TX', country: united_states },
+  { name: 'Oregon', abbr: 'OR', country: united_states },
+  { name: 'Wyoming', abbr: 'WY', country: united_states },
+  { name: 'Alabama', abbr: 'AL', country: united_states },
+  { name: 'Iowa', abbr: 'IA', country: united_states },
+  { name: 'Mississippi', abbr: 'MS', country: united_states },
+  { name: 'Kentucky', abbr: 'KY', country: united_states },
+  { name: 'New Mexico', abbr: 'NM', country: united_states },
+  { name: 'Georgia', abbr: 'GA', country: united_states },
+  { name: 'Colorado', abbr: 'CO', country: united_states },
+  { name: 'Massachusetts', abbr: 'MA', country: united_states },
+  { name: 'Connecticut', abbr: 'CT', country: united_states },
+  { name: 'New York', abbr: 'NY', country: united_states },
+  { name: 'South Carolina', abbr: 'SC', country: united_states },
+  { name: 'Alaska', abbr: 'AK', country: united_states },
+  { name: 'West Virginia', abbr: 'WV', country: united_states },
+  { name: 'U.S. Armed Forces - Americas', abbr: 'AA', country: united_states },
+  { name: 'U.S. Armed Forces - Europe', abbr: 'AE', country: united_states },
+  { name: 'U.S. Armed Forces - Pacific', abbr: 'AP', country: united_states }
+])
+
+canada = Spree::Country.find_by(name: 'Canada')
+
+Spree::State.create!([
+  { name: "Yukon",                     abbr: "YT", country: canada },
+  { name: "Nunavut",                   abbr: "NU", country: canada },
+  { name: "British Columbia",          abbr: "BC", country: canada },
+  { name: "Alberta",                   abbr: "AB", country: canada },
+  { name: "Saskatchewan",              abbr: "SK", country: canada },
+  { name: "Manitoba",                  abbr: "MB", country: canada },
+  { name: "Ontario",                   abbr: "ON", country: canada },
+  { name: "Quebec",                    abbr: "QC", country: canada },
+  { name: "New Brunswick",             abbr: "NB", country: canada },
+  { name: "Newfoundland and Labrador", abbr: "NL", country: canada },
+  { name: "Nova Scotia",               abbr: "NS", country: canada },
+  { name: "Prince Edward Island",      abbr: "PE", country: canada },
+  { name: "Northwest Territories",     abbr: "NT", country: canada }
 ])

data/db/migrate/20130213191427_create_default_stock.rb

@@ -1,6 +1,7 @@
 class CreateDefaultStock < ActiveRecord::Migration
   def up
     Spree::StockLocation.skip_callback(:create, :after, :create_stock_items)
+    Spree::StockLocation.skip_callback(:save, :after, :ensure_one_default)
     Spree::StockItem.skip_callback(:save, :after, :process_backorders)
     location = Spree::StockLocation.new(name: 'default')
     location.save(validate: false)

data/db/migrate/20130807024301_upgrade_adjustments.rb

@@ -9,14 +9,13 @@ class UpgradeAdjustments < ActiveRecord::Migration
       # Account for possible invalid data
       next if adjustment.source.nil?
       adjustment.source.update_column(:cost, adjustment.amount)
-      adjustment.destroy!
+      adjustment.destroy
     end
 
     # Tax adjustments have their sources altered
     Spree::Adjustment.where(:originator_type => "Spree::TaxRate").find_each do |adjustment|
-      adjustment.source_id = adjustment.originator_id
-      adjustment.source_type = "Spree::TaxRate"
-      adjustment.save!
+      adjustment.source = adjustment.originator
+      adjustment.save
     end
 
     # Promotion adjustments have their source altered also
@@ -34,7 +33,7 @@ class UpgradeAdjustments < ActiveRecord::Migration
         # Fail silently. This is primarily in instances where the calculator no longer exists
       end
 
-      adjustment.save!
+      adjustment.save
     end
   end
 end

data/db/migrate/20140309033438_create_store_from_preferences.rb

@@ -1,12 +1,5 @@
 class CreateStoreFromPreferences < ActiveRecord::Migration
   def change
-    # workaround for spree_i18n and Store translations
-    Spree::Store.class_eval do
-      def self.translated?(name)
-        false
-      end
-    end
-    
     preference_store = Spree::Preferences::Store.instance
     if store = Spree::Store.where(default: true).first
       store.meta_description = preference_store.get('spree/app_configuration/default_meta_description') {}

data/db/migrate/20140318191500_create_spree_taxons_promotion_rules.rb

@@ -0,0 +1,8 @@
+class CreateSpreeTaxonsPromotionRules < ActiveRecord::Migration
+  def change
+    create_table :spree_taxons_promotion_rules do |t|
+      t.references :taxon, index: true
+      t.references :promotion_rule, index: true
+    end
+  end
+end

data/db/migrate/20140530024945_move_order_token_from_tokenized_permission.rb

@@ -10,7 +10,7 @@ class MoveOrderTokenFromTokenizedPermission < ActiveRecord::Migration
       Spree::Order.includes(:tokenized_permission).each do |o|
         o.update_column :guest_token, o.tokenized_permission.token
       end
-    when 'Mysql2', 'MySQL'
+    when 'Mysql2'
       execute "UPDATE spree_orders, spree_tokenized_permissions
                SET spree_orders.guest_token = spree_tokenized_permissions.token
                WHERE spree_tokenized_permissions.permissable_id = spree_orders.id

data/db/migrate/20140601011216_set_shipment_total_for_users_upgrading.rb

@@ -3,8 +3,10 @@ class SetShipmentTotalForUsersUpgrading < ActiveRecord::Migration
     # NOTE You might not need this at all unless you're upgrading from Spree 2.1.x
     # or below. For those upgrading this should populate the Order#shipment_total
     # for legacy orders
-    Spree::Order.complete.where('shipment_total = ?', 0).includes(:shipments).find_each do |order|
-      order.update_column(:shipment_total, order.shipments.sum(:cost))
-    end
+    execute "UPDATE spree_orders
+             SET shipment_total = (SELECT SUM(spree_shipments.cost) AS sum_id
+                                   FROM spree_shipments
+                                   WHERE spree_shipments.order_id = spree_orders.id)
+             WHERE spree_orders.completed_at IS NOT NULL AND spree_orders.shipment_total = 0"
   end
 end

data/db/migrate/20140625214618_create_spree_refunds.rb

@@ -0,0 +1,12 @@
+class CreateSpreeRefunds < ActiveRecord::Migration
+  def change
+    create_table :spree_refunds do |t|
+      t.integer :payment_id
+      t.integer :return_authorization_id
+      t.decimal :amount, precision: 10, scale: 2, default: 0.0, null: false
+      t.string :transaction_id
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140702140656_create_spree_return_authorization_inventory_unit.rb

@@ -0,0 +1,12 @@
+class CreateSpreeReturnAuthorizationInventoryUnit < ActiveRecord::Migration
+  def change
+    create_table :spree_return_authorization_inventory_units do |t|
+      t.integer :return_authorization_id
+      t.integer :inventory_unit_id
+      t.integer :exchange_variant_id
+      t.datetime :received_at
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140707125621_rename_return_authorization_inventory_unit_to_return_items.rb

@@ -0,0 +1,5 @@
+class RenameReturnAuthorizationInventoryUnitToReturnItems < ActiveRecord::Migration
+  def change
+    rename_table :spree_return_authorization_inventory_units, :spree_return_items
+  end
+end

data/db/migrate/20140709160534_backfill_line_item_pre_tax_amount.rb

@@ -0,0 +1,10 @@
+class BackfillLineItemPreTaxAmount < ActiveRecord::Migration
+  def change
+    # set pre_tax_amount to discounted_amount - included_tax_total
+    execute(<<-SQL)
+      UPDATE spree_line_items
+      SET pre_tax_amount = ((price * quantity) + promo_total) - included_tax_total
+      WHERE pre_tax_amount IS NULL;
+    SQL
+  end
+end

data/db/migrate/20140710041921_recreate_spree_return_authorizations.rb

@@ -0,0 +1,55 @@
+class RecreateSpreeReturnAuthorizations < ActiveRecord::Migration
+  def up
+    # If the app has any legacy return authorizations then rename the table & columns and leave them there
+    # for the spree_legacy_return_authorizations extension to pick up with.
+    # Otherwise just drop the tables/columns as they are no longer used in stock spree.  The spree_legacy_return_authorizations
+    # extension will recreate these tables for dev environments & etc as needed.
+    if Spree::ReturnAuthorization.exists?
+      rename_table :spree_return_authorizations, :spree_legacy_return_authorizations
+      rename_column :spree_inventory_units, :return_authorization_id, :legacy_return_authorization_id
+    else
+      drop_table :spree_return_authorizations
+      remove_column :spree_inventory_units, :return_authorization_id
+    end
+
+    Spree::Adjustment.where(source_type: 'Spree::ReturnAuthorization').update_all(source_type: 'Spree::LegacyReturnAuthorization')
+
+    # For now just recreate the table as it was.  Future changes to the schema (including dropping "amount") will be coming in a
+    # separate commit.
+    create_table :spree_return_authorizations do |t|
+      t.string   "number"
+      t.string   "state"
+      t.decimal  "amount", precision: 10, scale: 2, default: 0.0, null: false
+      t.integer  "order_id"
+      t.text     "reason"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.integer  "stock_location_id"
+    end
+
+  end
+
+  def down
+    drop_table :spree_return_authorizations
+
+    Spree::Adjustment.where(source_type: 'Spree::LegacyReturnAuthorization').update_all(source_type: 'Spree::ReturnAuthorization')
+
+    if table_exists?(:spree_legacy_return_authorizations)
+      rename_table :spree_legacy_return_authorizations, :spree_return_authorizations
+      rename_column :spree_inventory_units, :legacy_return_authorization_id, :return_authorization_id
+    else
+      create_table :spree_return_authorizations do |t|
+        t.string   "number"
+        t.string   "state"
+        t.decimal  "amount", precision: 10, scale: 2, default: 0.0, null: false
+        t.integer  "order_id"
+        t.text     "reason"
+        t.datetime "created_at"
+        t.datetime "updated_at"
+        t.integer  "stock_location_id"
+      end
+      add_column :spree_inventory_units, :return_authorization_id, :integer, after: :shipment_id
+      add_index :spree_inventory_units, :return_authorization_id
+    end
+  end
+end

data/db/migrate/20140710181204_add_amount_fields_to_return_items.rb

@@ -0,0 +1,7 @@
+class AddAmountFieldsToReturnItems < ActiveRecord::Migration
+  def change
+    add_column :spree_return_items, :pre_tax_amount, :decimal, precision: 10, scale: 2, default: 0.0, null: false
+    add_column :spree_return_items, :included_tax_total, :decimal, precision: 10, scale: 2, default: 0.0, null: false
+    add_column :spree_return_items, :additional_tax_total, :decimal, precision: 10, scale: 2, default: 0.0, null: false
+  end
+end

data/db/migrate/20140710190048_drop_return_authorization_amount.rb

@@ -0,0 +1,5 @@
+class DropReturnAuthorizationAmount < ActiveRecord::Migration
+  def change
+    remove_column :spree_return_authorizations, :amount
+  end
+end

data/db/migrate/20140713140455_create_spree_return_authorization_reasons.rb

@@ -0,0 +1,28 @@
+class CreateSpreeReturnAuthorizationReasons < ActiveRecord::Migration
+  def change
+    create_table :spree_return_authorization_reasons do |t|
+      t.string :name
+      t.boolean :active, default: true
+      t.boolean :mutable, default: true
+
+      t.timestamps
+    end
+
+    reversible do |direction|
+      direction.up do
+        Spree::ReturnAuthorizationReason.create!(name: 'Better price available')
+        Spree::ReturnAuthorizationReason.create!(name: 'Missed estimated delivery date')
+        Spree::ReturnAuthorizationReason.create!(name: 'Missing parts or accessories')
+        Spree::ReturnAuthorizationReason.create!(name: 'Damaged/Defective')
+        Spree::ReturnAuthorizationReason.create!(name: 'Different from what was ordered')
+        Spree::ReturnAuthorizationReason.create!(name: 'Different from description')
+        Spree::ReturnAuthorizationReason.create!(name: 'No longer needed/wanted')
+        Spree::ReturnAuthorizationReason.create!(name: 'Accidental order')
+        Spree::ReturnAuthorizationReason.create!(name: 'Unauthorized purchase')
+      end
+    end
+
+    add_column :spree_return_authorizations, :return_authorization_reason_id, :integer
+    add_index :spree_return_authorizations, :return_authorization_reason_id, name: 'index_return_authorizations_on_return_authorization_reason_id'
+  end
+end

data/db/migrate/20140713140527_create_spree_refund_reasons.rb

@@ -0,0 +1,14 @@
+class CreateSpreeRefundReasons < ActiveRecord::Migration
+  def change
+    create_table :spree_refund_reasons do |t|
+      t.string :name
+      t.boolean :active, default: true
+      t.boolean :mutable, default: true
+
+      t.timestamps
+    end
+
+    add_column :spree_refunds, :refund_reason_id, :integer
+    add_index :spree_refunds, :refund_reason_id, name: 'index_refunds_on_refund_reason_id'
+  end
+end

data/db/migrate/20140713142214_rename_return_authorization_reason.rb

@@ -0,0 +1,5 @@
+class RenameReturnAuthorizationReason < ActiveRecord::Migration
+  def change
+    rename_column :spree_return_authorizations, :reason, :memo
+  end
+end

data/db/migrate/20140715182625_create_spree_promotion_categories.rb

@@ -0,0 +1,11 @@
+class CreateSpreePromotionCategories < ActiveRecord::Migration
+  def change
+    create_table :spree_promotion_categories do |t|
+      t.string :name
+      t.timestamps
+    end
+
+    add_column :spree_promotions, :promotion_category_id, :integer
+    add_index :spree_promotions, :promotion_category_id
+  end
+end

data/db/migrate/20140716204111_drop_received_at_on_return_items.rb

@@ -0,0 +1,9 @@
+class DropReceivedAtOnReturnItems < ActiveRecord::Migration
+  def up
+    remove_column :spree_return_items, :received_at
+  end
+
+  def down
+    add_column :spree_return_items, :received_at, :datetime
+  end
+end

data/db/migrate/20140716212330_add_reception_and_acceptance_status_to_return_items.rb

@@ -0,0 +1,6 @@
+class AddReceptionAndAcceptanceStatusToReturnItems < ActiveRecord::Migration
+  def change
+    add_column :spree_return_items, :reception_status, :string
+    add_column :spree_return_items, :acceptance_status, :string
+  end
+end

data/db/migrate/20140717155155_create_default_refund_reason.rb

@@ -0,0 +1,9 @@
+class CreateDefaultRefundReason < ActiveRecord::Migration
+  def up
+    Spree::RefundReason.create!(name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false)
+  end
+
+  def down
+    Spree::RefundReason.find_by(name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false).destroy
+  end
+end

data/db/migrate/20140717185932_add_default_to_spree_stock_locations.rb

@@ -0,0 +1,5 @@
+class AddDefaultToSpreeStockLocations < ActiveRecord::Migration
+  def change
+    add_column :spree_stock_locations, :default, :boolean, null: false, default: false
+  end
+end

data/db/migrate/20140718133010_create_spree_customer_returns.rb

@@ -0,0 +1,9 @@
+class CreateSpreeCustomerReturns < ActiveRecord::Migration
+  def change
+    create_table :spree_customer_returns do |t|
+      t.string :number
+      t.integer :stock_location_id
+      t.timestamps
+    end
+  end
+end