solidus_core 1.4.2 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed91e331714aac66f2d62d0cd91f38a017ccc33
-  data.tar.gz: d44b301719f10414d45cd960a1d6d9ead7fc8347
+  metadata.gz: db4e0e9709867fb934de7f6250cf594afbc087c6
+  data.tar.gz: 13f9c0f6043e15d1411234d0a341b80242ba58fb
 SHA512:
-  metadata.gz: ea89683585bf67ec9c2dcab332eef19f5badab7780b0534b85cdea8bc645c1ce053decc62859f1f33a14affc1f34df61983e98da3335d2e1f4b05bc60477ea91
-  data.tar.gz: f7d0fe364457ace7463e77540ea14bfce8df7857b8a157fa717d76b3a3ba16e4a74fc8178bd61939940bcbc107ec649f589e245d3bdf731b0304ed5976a8a87c
+  metadata.gz: d1b74e57ddb5daa0c9066ee20766af6bfc5d825fefb21f52c007eb79484599c6590e0acfb445de074b91c7e3de419ad26b4593937842f7601237cad14379426d
+  data.tar.gz: 6fe815393c2fbee2d930fc52157e1679c2e8b4b228f3d99ea13a5b54d67161cb4e8aa7affbc1ee0a55e39bdae8be67fe0949c4df9514210d6c8c1eeb45069af7

data/app/models/concerns/spree/user_address_book.rb

@@ -92,7 +92,7 @@ module Spree
     # #default_address or not
     def save_in_address_book(address_attributes, default = false)
       return nil unless address_attributes.present?
-      address_attributes = address_attributes.with_indifferent_access
+      address_attributes = address_attributes.to_h.with_indifferent_access
 
       new_address = Address.factory(address_attributes)
       return new_address unless new_address.valid?

data/app/models/spree/adjustment.rb

@@ -26,11 +26,6 @@ module Spree
     validates :amount, numericality: true
     validates :promotion_code, presence: true, if: :require_promotion_code?
 
-    # We need to use `after_commit` here because otherwise it's too early to
-    # tell if any repair is needed.
-    after_commit :repair_adjustments_associations_on_create, on: [:create]
-    after_commit :repair_adjustments_associations_on_destroy, on: [:destroy]
-
     scope :not_finalized, -> { where(finalized: false) }
     scope :open, -> do
       Spree::Deprecation.warn "Adjustment.open is deprecated. Instead use Adjustment.not_finalized", caller
@@ -182,19 +177,5 @@ module Spree
     def require_promotion_code?
       promotion? && source.promotion.codes.any?
     end
-
-    def repair_adjustments_associations_on_create
-      if adjustable.adjustments.loaded? && !adjustable.adjustments.include?(self)
-        Spree::Deprecation.warn("Adjustment was not added to #{adjustable.class}. Add adjustments via `adjustable.adjustments.create!`. Partial call stack: #{caller.select { |line| line =~ %r(/(app|spec)/) }}.", caller)
-        adjustable.adjustments.proxy_association.add_to_target(self)
-      end
-    end
-
-    def repair_adjustments_associations_on_destroy
-      if adjustable.adjustments.loaded? && adjustable.adjustments.include?(self)
-        Spree::Deprecation.warn("Adjustment was not removed from #{adjustable.class}. Remove adjustments via `adjustable.adjustments.destroy`. Partial call stack: #{caller.select { |line| line =~ %r(/(app|spec)/) }}.", caller)
-        adjustable.adjustments.proxy_association.target.delete(self)
-      end
-    end
   end
 end

data/app/models/spree/credit_card.rb

@@ -64,10 +64,11 @@ module Spree
     #
     # @param num [String] the desired credit card number
     def number=(num)
-      @number =
-        if num.is_a?(String)
-          num.gsub(/[^0-9]/, '')
-        end
+      @number = begin
+                  num.gsub(/[^0-9]/, '')
+                rescue
+                  nil
+                end
     end
 
     # Sets the credit card type, converting it to the preferred internal
@@ -88,6 +89,7 @@ module Spree
 
     # Sets the last digits field based on the assigned credit card number.
     def set_last_digits
+      number.to_s.gsub!(/\s/, '')
       verification_value.to_s.gsub!(/\s/, '')
       self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
     end

data/app/models/spree/inventory_unit.rb

@@ -135,12 +135,12 @@ module Spree
     def ensure_can_destroy
       if !backordered? && !on_hand?
         errors.add(:state, :cannot_destroy, state: state)
-        return false
+        throw :abort
       end
 
       unless shipment.pending?
         errors.add(:base, :cannot_destroy_shipment_state, state: shipment.state)
-        return false
+        throw :abort
       end
     end
   end

data/app/models/spree/item_adjustments.rb

@@ -83,7 +83,11 @@ module Spree
     private
 
     def adjustments
-      @adjustments ||= item.adjustments.to_a
+      # This is done intentionally to avoid loading the association. If the
+      # association is loaded, the records may become stale due to code
+      # elsewhere in spree. When that is remedied, this should be changed to
+      # just item.adjustments
+      @adjustments ||= item.adjustments.all.to_a
     end
   end
 end

data/app/models/spree/order/checkout.rb

@@ -244,7 +244,7 @@ module Spree
             checkout_step_index(state) > checkout_step_index(self.state)
           end
 
-          define_callbacks :updating_from_params, terminator: ->(_target, result) { result == false }
+          define_callbacks :updating_from_params, terminator: deprecated_false_terminator
 
           set_callback :updating_from_params, :before, :update_params_payment_source
 

data/app/models/spree/order/payments.rb

@@ -43,6 +43,10 @@ module Spree
           break if payment_total >= total
 
           payment.public_send(method)
+
+          if payment.completed?
+            self.payment_total += payment.amount
+          end
         end
       rescue Core::GatewayError => e
         result = !!Spree::Config[:allow_checkout_on_gateway_error]

data/app/models/spree/order.rb

@@ -47,7 +47,7 @@ module Spree
     belongs_to :store, class_name: 'Spree::Store'
     has_many :state_changes, as: :stateful
     has_many :line_items, -> { order(:created_at, :id) }, dependent: :destroy, inverse_of: :order
-    has_many :payments, dependent: :destroy, inverse_of: :order
+    has_many :payments, dependent: :destroy
     has_many :return_authorizations, dependent: :destroy, inverse_of: :order
     has_many :reimbursements, inverse_of: :order
     has_many :adjustments, -> { order(:created_at) }, as: :adjustable, inverse_of: :adjustable, dependent: :destroy
@@ -503,6 +503,7 @@ module Spree
       elsif shipments.any? { |s| !s.pending? }
         raise CannotRebuildShipments.new(Spree.t(:cannot_rebuild_shipments_shipments_not_pending))
       else
+        adjustments.shipping.destroy_all
         shipments.destroy_all
         self.shipments = Spree::Config.stock.coordinator_class.new(self).shipments
       end
@@ -510,7 +511,9 @@ module Spree
 
     def apply_free_shipping_promotions
       Spree::PromotionHandler::FreeShipping.new(self).activate
-      update!
+      shipments.each { |shipment| ItemAdjustments.new(shipment).update }
+      updater.update_shipment_total
+      persist_totals
     end
 
     # Clean shipments and make order back to address state
@@ -689,23 +692,6 @@ module Spree
       Spree::Money.new(total_available_store_credit - total_applicable_store_credit, { currency: currency })
     end
 
-    def payments_attributes=(attributes)
-      validate_payments_attributes(attributes)
-      super(attributes)
-    end
-
-    def validate_payments_attributes(attributes)
-      attributes = Array.wrap(attributes)
-      # Ensure the payment methods specified are allowed for this user
-      payment_methods = Spree::PaymentMethod.where(id: available_payment_methods)
-      attributes.each do |payment_attributes|
-        payment_method_id = payment_attributes[:payment_method_id]
-
-        # raise RecordNotFound unless it is an allowed payment method
-        payment_methods.find(payment_method_id) if payment_method_id
-      end
-    end
-
     private
 
     def associate_store

data/app/models/spree/order_capturing.rb

@@ -21,15 +21,22 @@ class Spree::OrderCapturing
     Spree::OrderMutex.with_lock!(@order) do
       uncaptured_amount = @order.display_total.cents
 
-      sorted_payments(@order).each do |payment|
-        amount = [uncaptured_amount, payment.money.cents].min
-
-        if amount > 0
-          payment.capture!(amount)
-          uncaptured_amount -= amount
-        elsif Spree::OrderCapturing.void_unused_payments
-          payment.void_transaction!
+      begin
+        sorted_payments(@order).each do |payment|
+          amount = [uncaptured_amount, payment.money.cents].min
+
+          if amount > 0
+            payment.capture!(amount)
+            uncaptured_amount -= amount
+          elsif Spree::OrderCapturing.void_unused_payments
+            payment.void_transaction!
+          end
         end
+      ensure
+        # FIXME: Adding the inverse_of on the payments relation for orders -should- fix this,
+        # however it only appears to make it worse (calling with changes three times instead of once.
+        # Warrants an investigation. Reloading for now.
+        @order.reload.update!
       end
     end
   end

data/app/models/spree/order_contents.rb

@@ -119,6 +119,7 @@ module Spree
       shipment = options[:shipment]
       shipment.present? ? shipment.update_amounts : order.ensure_updated_shipments
       PromotionHandler::Cart.new(order, line_item).activate
+      ItemAdjustments.new(line_item).update
       reload_totals
       line_item
     end

data/app/models/spree/order_update_attributes.rb

@@ -14,8 +14,6 @@ module Spree
     # Assign the attributes to the order and save the order
     # @return true if saved, otherwise false and errors will be set on the order
     def apply
-      order.validate_payments_attributes(@payments_attributes)
-
       assign_order_attributes
       assign_payments_attributes
 

data/app/models/spree/order_updater.rb

@@ -80,11 +80,11 @@ module Spree
 
       all_items = line_items + shipments
 
-      order.adjustment_total = all_items.sum(&:adjustment_total) + adjustments.select(&:eligible?).sum(&:amount)
+      order.adjustment_total = all_items.sum(&:adjustment_total) + adjustments.eligible.sum(:amount)
       order.included_tax_total = all_items.sum(&:included_tax_total)
       order.additional_tax_total = all_items.sum(&:additional_tax_total)
 
-      order.promo_total = all_items.sum(&:promo_total) + adjustments.select(&:eligible?).select(&:promotion?).sum(&:amount)
+      order.promo_total = all_items.sum(&:promo_total) + adjustments.promotion.eligible.sum(:amount)
 
       update_order_total
     end

data/app/models/spree/payment.rb

@@ -39,7 +39,6 @@ module Spree
 
     validates :amount, numericality: true
     validates :source, presence: true, if: :source_required?
-    validates :payment_method, presence: true
 
     default_scope -> { order(:created_at) }
 
@@ -221,7 +220,9 @@ WARN
           errors.add(Spree.t(source.class.to_s.demodulize.underscore), "#{field_name} #{error}")
         end
       end
-      !errors.present?
+      if errors.any?
+        throw :abort
+      end
     end
 
     def source_required?

data/app/models/spree/promotion/actions/create_adjustment.rb

@@ -22,9 +22,10 @@ module Spree
           return if promotion_credit_exists?(order)
 
           amount = compute_amount(order)
-          order.adjustments.create!(
+          Spree::Adjustment.create!(
             amount: amount,
             order: order,
+            adjustable: order,
             source: self,
             promotion_code: options[:promotion_code],
             label: "#{Spree.t(:promotion)} (#{promotion.name})"

data/app/models/spree/promotion/actions/create_item_adjustments.rb

@@ -40,9 +40,9 @@ module Spree
         def create_adjustment(adjustable, order, promotion_code)
           amount = compute_amount(adjustable)
           return if amount == 0
-          adjustable.adjustments.create!(
-            source: self,
+          adjustments.create!(
             amount: amount,
+            adjustable: adjustable,
             order: order,
             promotion_code: promotion_code,
             label: "#{Spree.t(:promotion)} (#{promotion.name})"

data/app/models/spree/shipment.rb

@@ -409,7 +409,7 @@ module Spree
     def ensure_can_destroy
       unless pending?
         errors.add(:state, :cannot_destroy, state: state)
-        return false
+        throw :abort
       end
     end
   end

data/app/models/spree/stock_transfer.rb

@@ -103,7 +103,7 @@ module Spree
     def ensure_not_finalized
       if finalized?
         errors.add(:base, Spree.t('errors.messages.cannot_delete_finalized_stock_transfer'))
-        return false
+        throw :abort
       end
     end
   end

data/app/models/spree/tax/item_adjuster.rb

@@ -15,6 +15,7 @@ module Spree
         @rates_for_order_zone = options[:rates_for_order_zone]
         @rates_for_default_zone = options[:rates_for_default_zone]
         @order_tax_zone = options[:order_tax_zone]
+        @skip_destroy_adjustments = options[:skip_destroy_adjustments]
       end
 
       # Deletes all existing tax adjustments and creates new adjustments for all
@@ -26,8 +27,8 @@ module Spree
       # @return [Array<Spree::Adjustment>] newly created adjustments
       def adjust!
         return unless order_tax_zone(order)
-
-        item.adjustments.destroy(item.adjustments.select(&:tax?))
+        # Using .destroy_all to make sure callbacks fire
+        item.adjustments.tax.destroy_all unless @skip_destroy_adjustments
 
         rates_for_item(item).map { |rate| rate.adjust(order_tax_zone(order), item) }
       end

data/app/models/spree/tax/order_adjuster.rb

@@ -16,6 +16,8 @@ module Spree
       def adjust!
         return unless order_tax_zone(order)
 
+        order.all_adjustments.tax.destroy_all
+
         (order.line_items + order.shipments).each do |item|
           ItemAdjuster.new(item, order_wide_options).adjust!
         end
@@ -28,6 +30,7 @@ module Spree
           rates_for_order_zone: rates_for_order_zone(order),
           rates_for_default_zone: rates_for_default_zone,
           order_tax_zone: order_tax_zone(order),
+          skip_destroy_adjustments: true
         }
       end
     end

data/app/models/spree/tax_rate.rb

@@ -85,13 +85,13 @@ module Spree
 
       included = included_in_price && amount > 0
 
-      item.adjustments.create!(
-        source: self,
+      adjustments.create!({
+        adjustable: item,
         amount: amount,
         order_id: item.order_id,
         label: adjustment_label(amount),
         included: included
-      )
+      })
     end
 
     # This method is used by Adjustment#update to recalculate the cost.

data/app/models/spree/transfer_item.rb

@@ -29,14 +29,14 @@ module Spree
     def ensure_stock_transfer_not_finalized
       unless stock_transfer.finalizable?
         errors.add(:base, Spree.t('errors.messages.cannot_delete_transfer_item_with_finalized_stock_transfer'))
-        return false
+        throw :abort
       end
     end
 
     def prevent_expected_quantity_update_stock_transfer_finalized
       if expected_quantity_changed? && stock_transfer.finalized?
         errors.add(:base, Spree.t('errors.messages.cannot_update_expected_transfer_item_with_finalized_stock_transfer'))
-        return false
+        throw :abort
       end
     end
 

data/app/models/spree/unit_cancel.rb

@@ -16,8 +16,8 @@ class Spree::UnitCancel < Spree::Base
 
     amount = compute_amount(inventory_unit.line_item)
 
-    self.adjustment = inventory_unit.line_item.adjustments.create!(
-      source: self,
+    create_adjustment!(
+      adjustable: inventory_unit.line_item,
       amount: amount,
       order: inventory_unit.order,
       label: "#{Spree.t(:cancellation)} - #{reason}",

data/db/migrate/20120831092320_spree_one_two.rb

@@ -1,9 +1,9 @@
-class SpreeOneTwo < ActiveRecord::Migration
+class SpreeOneTwo < ActiveRecord::Migration[4.2]
   def up
     # This migration is just a compressed version of all the previous
     # migrations for spree_core. Do not run it if one of the core tables
     # already exists. Assume the best.
-    return if table_exists?(:spree_addresses)
+    return if data_source_exists?(:spree_addresses)
 
     create_table :spree_activators do |t|
       t.string     :description

data/db/migrate/20120831092359_spree_promo_one_two.rb

@@ -1,7 +1,7 @@
-class SpreePromoOneTwo < ActiveRecord::Migration
+class SpreePromoOneTwo < ActiveRecord::Migration[4.2]
   def up
     # This migration is just a compressed migration for all previous versions of spree_promo
-    return if table_exists?(:spree_products_promotion_rules)
+    return if data_source_exists?(:spree_products_promotion_rules)
 
     create_table :spree_products_promotion_rules, id: false, force: true do |t|
       t.references :product

data/db/migrate/20120905145253_add_tax_rate_label.rb

@@ -1,4 +1,4 @@
-class AddTaxRateLabel < ActiveRecord::Migration
+class AddTaxRateLabel < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_tax_rates, :name, :string
   end

data/db/migrate/20120905151823_add_toggle_tax_rate_display.rb

@@ -1,4 +1,4 @@
-class AddToggleTaxRateDisplay < ActiveRecord::Migration
+class AddToggleTaxRateDisplay < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_tax_rates, :show_rate_in_label, :boolean, default: true
   end

data/db/migrate/20120929093553_remove_unused_preference_columns.rb

@@ -1,4 +1,4 @@
-class RemoveUnusedPreferenceColumns < ActiveRecord::Migration
+class RemoveUnusedPreferenceColumns < ActiveRecord::Migration[4.2]
   def change
     # Columns have already been removed if the application was upgraded from an older version, but must be removed from new apps.
     remove_column :spree_preferences, :name       if ActiveRecord::Base.connection.column_exists?(:spree_preferences, :name)

data/db/migrate/20121009142519_add_lock_version_to_variant.rb

@@ -1,4 +1,4 @@
-class AddLockVersionToVariant < ActiveRecord::Migration
+class AddLockVersionToVariant < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_variants, :lock_version, :integer, default: 0
   end

data/db/migrate/20121010142909_add_states_required_to_countries.rb

@@ -1,4 +1,4 @@
-class AddStatesRequiredToCountries < ActiveRecord::Migration
+class AddStatesRequiredToCountries < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_countries, :states_required, :boolean, default: true
   end

data/db/migrate/20121012071449_add_on_demand_to_product_and_variant.rb

@@ -1,4 +1,4 @@
-class AddOnDemandToProductAndVariant < ActiveRecord::Migration
+class AddOnDemandToProductAndVariant < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_products, :on_demand, :boolean, default: false
     add_column :spree_variants, :on_demand, :boolean, default: false

data/db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb

@@ -1,4 +1,4 @@
-class RemoveNotNullConstraintFromProductsOnHand < ActiveRecord::Migration
+class RemoveNotNullConstraintFromProductsOnHand < ActiveRecord::Migration[4.2]
   def up
     change_column :spree_products, :count_on_hand, :integer, null: true
     change_column :spree_variants, :count_on_hand, :integer, null: true

data/db/migrate/20121031162139_split_prices_from_variants.rb

@@ -1,4 +1,4 @@
-class SplitPricesFromVariants < ActiveRecord::Migration
+class SplitPricesFromVariants < ActiveRecord::Migration[4.2]
   def up
     create_table :spree_prices do |t|
       t.integer :variant_id, null: false

data/db/migrate/20121107003422_remove_not_null_from_spree_prices_amount.rb

@@ -1,4 +1,4 @@
-class RemoveNotNullFromSpreePricesAmount < ActiveRecord::Migration
+class RemoveNotNullFromSpreePricesAmount < ActiveRecord::Migration[4.2]
   def up
     change_column :spree_prices, :amount, :decimal, precision: 8, scale: 2, null: true
   end

data/db/migrate/20121107184631_add_currency_to_line_items.rb

@@ -1,4 +1,4 @@
-class AddCurrencyToLineItems < ActiveRecord::Migration
+class AddCurrencyToLineItems < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_line_items, :currency, :string
   end

data/db/migrate/20121107194006_add_currency_to_orders.rb

@@ -1,4 +1,4 @@
-class AddCurrencyToOrders < ActiveRecord::Migration
+class AddCurrencyToOrders < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_orders, :currency, :string
   end

data/db/migrate/20121109173623_add_cost_currency_to_variants.rb

@@ -1,4 +1,4 @@
-class AddCostCurrencyToVariants < ActiveRecord::Migration
+class AddCostCurrencyToVariants < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_variants, :cost_currency, :string, after: :cost_price
   end

data/db/migrate/20121111231553_remove_display_on_from_payment_methods.rb

@@ -1,4 +1,4 @@
-class RemoveDisplayOnFromPaymentMethods < ActiveRecord::Migration
+class RemoveDisplayOnFromPaymentMethods < ActiveRecord::Migration[4.2]
   def up
     remove_column :spree_payment_methods, :display_on
   end

data/db/migrate/20121124203911_add_position_to_taxonomies.rb

@@ -1,4 +1,4 @@
-class AddPositionToTaxonomies < ActiveRecord::Migration
+class AddPositionToTaxonomies < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_taxonomies, :position, :integer, default: 0
   end

data/db/migrate/20121126040517_add_last_ip_to_spree_orders.rb

@@ -1,4 +1,4 @@
-class AddLastIpToSpreeOrders < ActiveRecord::Migration
+class AddLastIpToSpreeOrders < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_orders, :last_ip_address, :string
   end

data/db/migrate/20121213162028_add_state_to_spree_adjustments.rb

@@ -1,4 +1,4 @@
-class AddStateToSpreeAdjustments < ActiveRecord::Migration
+class AddStateToSpreeAdjustments < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_adjustments, :state, :string
     remove_column :spree_adjustments, :locked

data/db/migrate/20130114053446_add_display_on_to_spree_payment_methods.rb

@@ -1,4 +1,4 @@
-class AddDisplayOnToSpreePaymentMethods < ActiveRecord::Migration
+class AddDisplayOnToSpreePaymentMethods < ActiveRecord::Migration[4.2]
   def self.up
     add_column :spree_payment_methods, :display_on, :string
   end

data/db/migrate/20130120201805_add_position_to_product_properties.spree.rb

@@ -1,4 +1,4 @@
-class AddPositionToProductProperties < ActiveRecord::Migration
+class AddPositionToProductProperties < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_product_properties, :position, :integer, default: 0
   end

data/db/migrate/20130203232234_add_identifier_to_spree_payments.rb

@@ -1,4 +1,4 @@
-class AddIdentifierToSpreePayments < ActiveRecord::Migration
+class AddIdentifierToSpreePayments < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_payments, :identifier, :string
   end

data/db/migrate/20130207155350_add_order_id_index_to_payments.rb

@@ -1,4 +1,4 @@
-class AddOrderIdIndexToPayments < ActiveRecord::Migration
+class AddOrderIdIndexToPayments < ActiveRecord::Migration[4.2]
   def self.up
     add_index :spree_payments, :order_id
   end

data/db/migrate/20130208032954_add_primary_to_spree_products_taxons.rb

@@ -1,4 +1,4 @@
-class AddPrimaryToSpreeProductsTaxons < ActiveRecord::Migration
+class AddPrimaryToSpreeProductsTaxons < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_products_taxons, :id, :primary_key
   end

data/db/migrate/20130211190146_create_spree_stock_items.rb

@@ -1,4 +1,4 @@
-class CreateSpreeStockItems < ActiveRecord::Migration
+class CreateSpreeStockItems < ActiveRecord::Migration[4.2]
   def change
     create_table :spree_stock_items do |t|
       t.belongs_to :stock_location

data/db/migrate/20130211191120_create_spree_stock_locations.rb

@@ -1,4 +1,4 @@
-class CreateSpreeStockLocations < ActiveRecord::Migration
+class CreateSpreeStockLocations < ActiveRecord::Migration[4.2]
   def change
     create_table :spree_stock_locations do |t|
       t.string :name

data/db/migrate/20130213191427_create_default_stock.rb

@@ -1,4 +1,4 @@
-class CreateDefaultStock < ActiveRecord::Migration
+class CreateDefaultStock < ActiveRecord::Migration[4.2]
   class Variant < ActiveRecord::Base
     self.table_name = 'spree_variants'
   end

data/db/migrate/20130222032153_add_order_id_index_to_shipments.rb

@@ -1,4 +1,4 @@
-class AddOrderIdIndexToShipments < ActiveRecord::Migration
+class AddOrderIdIndexToShipments < ActiveRecord::Migration[4.2]
   def change
     add_index :spree_shipments, :order_id
   end

data/db/migrate/20130226032817_change_meta_description_on_spree_products_to_text.rb

@@ -1,4 +1,4 @@
-class ChangeMetaDescriptionOnSpreeProductsToText < ActiveRecord::Migration
+class ChangeMetaDescriptionOnSpreeProductsToText < ActiveRecord::Migration[4.2]
   def change
     change_column :spree_products, :meta_description, :text, limit: nil
   end

data/db/migrate/20130226191231_add_stock_location_id_to_spree_shipments.rb

@@ -1,4 +1,4 @@
-class AddStockLocationIdToSpreeShipments < ActiveRecord::Migration
+class AddStockLocationIdToSpreeShipments < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_shipments, :stock_location_id, :integer
   end

data/db/migrate/20130227143905_add_pending_to_inventory_unit.rb

@@ -1,4 +1,4 @@
-class AddPendingToInventoryUnit < ActiveRecord::Migration
+class AddPendingToInventoryUnit < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_inventory_units, :pending, :boolean, default: true
     Spree::InventoryUnit.update_all(pending: false)

data/db/migrate/20130228164411_remove_on_demand_from_product_and_variant.rb

@@ -1,4 +1,4 @@
-class RemoveOnDemandFromProductAndVariant < ActiveRecord::Migration
+class RemoveOnDemandFromProductAndVariant < ActiveRecord::Migration[4.2]
   def change
     remove_column :spree_products, :on_demand
     remove_column :spree_variants, :on_demand