spree_core 2.0.13 → 2.1.0

data/app/models/spree/credit_card.rb

@@ -3,50 +3,48 @@ module Spree
     has_many :payments, as: :source
 
     before_save :set_last_digits
-    after_validation :set_card_type
 
     attr_accessor :number, :verification_value
 
-    validates :month, :year, numericality: { only_integer: true }, unless: :has_payment_profile?
+    validates :month, :year, numericality: { only_integer: true }
     validates :number, presence: true, unless: :has_payment_profile?, on: :create
     validates :verification_value, presence: true, unless: :has_payment_profile?, on: :create
     validate :expiry_not_in_the_past
 
-    attr_accessible :first_name, :last_name, :number, :verification_value, :year,
-                    :month, :gateway_customer_profile_id, :gateway_payment_profile_id
-
     scope :with_payment_profile, -> { where('gateway_customer_profile_id IS NOT NULL') }
 
-    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)
+    # needed for some of the ActiveMerchant gateways (eg. SagePay)
+    alias_attribute :brand, :cc_type
+
+    def expiry=(expiry)
+      self[:month], self[:year] = expiry.split(" / ")
+      self[:year] = "20" + self[:year]
     end
 
-    # cheap hack to get to the type? method from deep within ActiveMerchant
-    # without stomping on potentially existing methods in CreditCard
-    class CardDetector
-      class << self
-        include ActiveMerchant::Billing::CreditCardMethods::ClassMethods
-      end
+    def number=(num)
+      @number = num.gsub(/[^0-9]/, '') rescue nil
     end
 
-    # Some payment gateways, such as USA EPay, only support an ActiveMerchant::Billing::CreditCard
-    # object, rather than an object *like* that. So we need to convert it.
-    def to_active_merchant
-      ActiveMerchant::Billing::CreditCard.new(
-        :number => number,
-        :month => month,
-        :year => year,
-        :verification_value => verification_value,
-        :first_name => first_name,
-        :last_name => last_name
-        )
+    # cc_type is set by jquery.payment, which helpfully provides different
+    # types from Active Merchant. Converting them is necessary.
+    def cc_type=(type)
+      real_type = case type
+      when 'mastercard', 'maestro'
+        'master'
+      when 'amex'
+        'american_express'
+      when 'dinersclub'
+        'diners_club'
+      else
+        type
+      end
+      self[:cc_type] = real_type
     end
 
-    # sets self.cc_type while we still have the card number
-    def set_card_type
-      self.cc_type ||= CardDetector.brand?(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
 
     def name?
@@ -66,11 +64,6 @@ module Spree
       "XXXX-XXXX-XXXX-#{last_digits}"
     end
 
-    # needed for some of the ActiveMerchant gateways (eg. SagePay)
-    def brand
-      spree_cc_type
-    end
-
     def actions
       %w{capture void credit}
     end
@@ -94,12 +87,18 @@ module Spree
     end
 
     def has_payment_profile?
-      gateway_customer_profile_id.present? || gateway_payment_profile_id.present?
+      gateway_customer_profile_id.present?
     end
 
-    def spree_cc_type
-      return 'visa' if Rails.env.development?
-      cc_type
+    def to_active_merchant
+      ActiveMerchant::Billing::CreditCard.new(
+        :number => number,
+        :month => month,
+        :year => year,
+        :verification_value => verification_value,
+        :first_name => first_name,
+        :last_name => last_name
+      )
     end
 
     private

data/app/models/spree/gateway/bogus_simple.rb

@@ -6,14 +6,6 @@ module Spree
       false
     end
 
-    def capture(money, response_code, options = {})
-      if response_code == '12345'
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '67890')
-      else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', :error => 'Bogus Gateway: Forced failure', :test => true)
-      end
-    end
-
     def authorize(money, credit_card, options = {})
       if VALID_CCS.include? credit_card.number
         ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345', :avs_result => { :code => 'A' })

data/app/models/spree/gateway.rb

@@ -1,14 +1,12 @@
 module Spree
   class Gateway < PaymentMethod
-    delegate :authorize, :purchase, :capture, :void, :credit, to: :provider
+    delegate_belongs_to :provider, :authorize, :purchase, :capture, :void, :credit
 
     validates :name, :type, presence: true
 
     preference :server, :string, default: 'test'
     preference :test_mode, :boolean, default: true
 
-    attr_accessible :preferred_server, :preferred_test_mode
-
     def payment_source_class
       CreditCard
     end

data/app/models/spree/image.rb

@@ -3,14 +3,12 @@ module Spree
     validates_attachment_presence :attachment
     validate :no_attachment_errors
 
-    attr_accessible :alt, :attachment, :position, :viewable_type, :viewable_id
-
     has_attached_file :attachment,
                       styles: { mini: '48x48>', small: '100x100>', product: '240x240>', large: '600x600>' },
                       default_style: :product,
                       url: '/spree/products/:id/:style/:basename.:extension',
                       path: ':rails_root/public/spree/products/:id/:style/:basename.:extension',
-                      convert_options: { all: '-strip -auto-orient -colorspace sRGB' }
+                      convert_options: { all: '-strip -auto-orient -colorspace RGB' }
 
     # save the w,h of the original image (from which others can be calculated)
     # we need to look at the write-queue for images which have not been saved yet

data/app/models/spree/inventory_unit.rb

@@ -2,21 +2,18 @@ module Spree
   class InventoryUnit < ActiveRecord::Base
     belongs_to :variant, class_name: "Spree::Variant"
     belongs_to :order, class_name: "Spree::Order"
-    belongs_to :shipment, class_name: "Spree::Shipment", touch: true
+    belongs_to :shipment, class_name: "Spree::Shipment"
     belongs_to :return_authorization, class_name: "Spree::ReturnAuthorization"
 
     scope :backordered, -> { where state: 'backordered' }
     scope :shipped, -> { where state: 'shipped' }
     scope :backordered_per_variant, ->(stock_item) do
-      includes(:shipment, :order)
-        .where("spree_shipments.state != 'canceled'")
+      includes(:shipment)
+        .where("spree_shipments.state != 'canceled'").references(:shipment)
         .where(variant_id: stock_item.variant_id)
-        .where('spree_orders.completed_at is not null')
-        .backordered.order("#{Spree::Order.quoted_table_name}.completed_at ASC")
+        .backordered.order("#{self.table_name}.created_at ASC")
     end
 
-    attr_accessible :shipment, :variant_id
-
     # state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
     state_machine initial: :on_hand do
       event :fill_backorder do
@@ -37,7 +34,7 @@ module Spree
     # lead to issues once users tried to modify the objects returned. That's due
     # to ActiveRecord `joins(shipment: :stock_location)` only return readonly
     # objects
-    #
+    # 
     # Returns an array of backordered inventory units as per a given stock item
     def self.backordered_for_stock_item(stock_item)
       backordered_per_variant(stock_item).select do |unit|

data/app/models/spree/legacy_user.rb

@@ -2,14 +2,10 @@
 module Spree
   class LegacyUser < ActiveRecord::Base
     self.table_name = 'spree_users'
-    attr_accessible :email, :password, :password_confirmation
-
     has_many :orders, foreign_key: :user_id
     belongs_to :ship_address, class_name: 'Spree::Address'
     belongs_to :bill_address, class_name: 'Spree::Address'
 
-    scope :registered
-
     before_destroy :check_completed_orders
 
     class DestroyWithOrdersError < StandardError; end

data/app/models/spree/line_item.rb

@@ -20,14 +20,11 @@ module Spree
     validates :price, numericality: true
     validates_with Stock::AvailabilityValidator
 
-    attr_accessible :quantity, :variant_id
+    before_save :update_inventory
 
-    after_save :update_inventory
     after_save :update_order
     after_destroy :update_order
 
-    delegate :name, :description, :should_track_inventory?, to: :variant
-
     attr_accessor :target_shipment
 
     def copy_price
@@ -44,16 +41,6 @@ module Spree
       end
     end
 
-    def increment_quantity
-      ActiveSupport::Deprecation.warn("[SPREE] Spree::LineItem#increment_quantity will be deprecated in Spree 2.1, please use quantity.increment! instead.")
-      self.quantity.increment!
-    end
-
-    def decrement_quantity
-      ActiveSupport::Deprecation.warn("[SPREE] Spree::LineItem#decrement_quantity will be deprecated in Spree 2.1, please use quantity.decrement! instead.")
-      self.quantity.decrement!
-    end
-
     def amount
       price * quantity
     end
@@ -75,7 +62,7 @@ module Spree
     end
 
     def sufficient_stock?
-      Stock::Quantifier.new(variant).can_supply? quantity
+      Stock::Quantifier.new(variant_id).can_supply? quantity
     end
 
     def insufficient_stock?

data/app/models/spree/option_type.rb

@@ -1,14 +1,11 @@
 module Spree
   class OptionType < ActiveRecord::Base
-    has_many :option_values, order: "#{Spree::OptionValue.quoted_table_name}.position", dependent: :destroy
+    has_many :option_values, -> { order(:position) }, dependent: :destroy
     has_many :product_option_types, dependent: :destroy
-    has_many :products, through: :product_option_types
     has_and_belongs_to_many :prototypes, join_table: 'spree_option_types_prototypes'
 
-    attr_accessible :name, :presentation, :option_values_attributes
-
     validates :name, :presentation, presence: true
-    default_scope order: "#{quoted_table_name}.position"
+    default_scope -> { order("#{self.table_name}.position") }
 
     accepts_nested_attributes_for :option_values, reject_if: lambda { |ov| ov[:name].blank? || ov[:presentation].blank? }, allow_destroy: true
   end

data/app/models/spree/option_value.rb

@@ -1,11 +1,9 @@
 module Spree
   class OptionValue < ActiveRecord::Base
-    belongs_to :option_type, :class_name => 'Spree::OptionType', :touch => true
+    belongs_to :option_type
     acts_as_list scope: :option_type
     has_and_belongs_to_many :variants, join_table: 'spree_option_values_variants', class_name: "Spree::Variant"
 
     validates :name, :presentation, presence: true
-
-    attr_accessible :name, :presentation
   end
 end

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

@@ -56,7 +56,7 @@ module Spree
               end
 
               event :resume do
-                transition :to => :resumed, :from => :canceled, :if => :canceled?
+                transition :to => :resumed, :from => :canceled, :if => :allow_resume?
               end
 
               event :authorize_return do
@@ -71,16 +71,11 @@ module Spree
 
               before_transition :from => :cart, :do => :ensure_line_items_present
 
-              if states[:address]
-                before_transition :from => :address, :do => :create_tax_charge!
-              end
-
-              if states[:delivery]
-                before_transition :to => :delivery, :do => :create_proposed_shipments
-                before_transition :to => :delivery, :do => :ensure_available_shipping_rates
-              end
+              before_transition :to => :delivery, :do => :create_proposed_shipments
+              before_transition :to => :delivery, :do => :ensure_available_shipping_rates
 
               after_transition :to => :complete, :do => :finalize!
+              after_transition :to => :delivery, :do => :create_tax_charge!
               after_transition :to => :resumed,  :do => :after_resume
               after_transition :to => :canceled, :do => :after_cancel
             end
@@ -150,10 +145,6 @@ module Spree
             @checkout_steps ||= {}
           end
 
-          def self.checkout_step_names
-            self.checkout_steps.keys
-          end
-
           def self.add_transition(options)
             self.next_event_transitions << { options.delete(:from) => options.delete(:to) }.merge(options)
           end

data/app/models/spree/order.rb

@@ -3,15 +3,8 @@ require 'spree/order/checkout'
 
 module Spree
   class Order < ActiveRecord::Base
-    # TODO:
-    # Need to use fully qualified name here because during sandbox migration
-    # there is a class called Checkout which conflicts if you use this:
-    #
-    #   include Checkout
-    #
-    # rather than the qualified name. This will most likely be fixed with the
-    # 1.3 release.
-    include Spree::Order::Checkout
+    include Checkout
+
     checkout_flow do
       go_to_state :address
       go_to_state :delivery
@@ -26,11 +19,6 @@ module Spree
 
     token_resource
 
-    attr_accessible :line_items, :bill_address_attributes, :ship_address_attributes,
-                    :payments_attributes, :ship_address, :bill_address, :currency,
-                    :line_items_attributes, :number, :email, :use_billing,
-                    :special_instructions, :shipments_attributes, :coupon_code
-
     attr_reader :coupon_code
 
     if Spree.user_class
@@ -47,15 +35,14 @@ module Spree
     belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address'
     alias_attribute :shipping_address, :ship_address
 
-    has_many :adjustments, as: :adjustable, dependent: :destroy, order: "#{::Spree::Adjustment.quoted_table_name}.created_at ASC"
-    has_many :line_item_adjustments, through: :line_items, source: :adjustments
-    has_many :line_items, dependent: :destroy, order: "#{::Spree::LineItem.quoted_table_name}.created_at ASC"
+    has_many :state_changes, as: :stateful
+    has_many :line_items, -> { order('created_at ASC') }, dependent: :destroy
     has_many :payments, dependent: :destroy
     has_many :return_authorizations, dependent: :destroy
-    has_many :state_changes, as: :stateful
-    has_many :inventory_units
+    has_many :adjustments, -> { order("#{Adjustment.table_name}.created_at ASC") }, as: :adjustable, dependent: :destroy
+    has_many :line_item_adjustments, through: :line_items, source: :adjustments
 
-    has_many :shipments, dependent: :destroy, :class_name => "Shipment" do
+    has_many :shipments, dependent: :destroy do
       def states
         pluck(:state).uniq
       end
@@ -78,7 +65,6 @@ module Spree
 
     validates :email, presence: true, if: :require_email
     validates :email, email: true, if: :require_email, allow_blank: true
-    validates :number, uniqueness: true
     validate :has_available_shipment
     validate :has_available_payment
 
@@ -91,16 +77,12 @@ module Spree
       where(number: number)
     end
 
-    scope :created_between, ->(start_date, end_date) { where(created_at: start_date..end_date) }
-    scope :completed_between, ->(start_date, end_date) { where(completed_at: start_date..end_date) }
-
     def self.between(start_date, end_date)
-      ActiveSupport::Deprecation.warn("Order#between will be deprecated in Spree 2.3, please use either Order#created_between or Order#completed_between instead.")
-      self.created_between(start_date, end_date)
+      where(created_at: start_date..end_date)
     end
 
     def self.by_customer(customer)
-      joins(:user).where("#{Spree.user_class.quoted_table_name}.email" => customer)
+      joins(:user).where("#{Spree.user_class.table_name}.email" => customer)
     end
 
     def self.by_state(state)
@@ -108,7 +90,7 @@ module Spree
     end
 
     def self.complete
-      where("#{quoted_table_name}.completed_at IS NOT NULL")
+      where('completed_at IS NOT NULL')
     end
 
     def self.incomplete
@@ -159,7 +141,7 @@ module Spree
     end
 
     def completed?
-      completed_at.present? || complete?
+      completed_at.present?
     end
 
     # Indicates whether or not the user is allowed to proceed to checkout.
@@ -177,12 +159,7 @@ module Spree
 
     # If true, causes the confirmation step to happen during the checkout process
     def confirmation_required?
-      Spree::Config[:always_include_confirm_step] ||
-        payments.valid.map(&:payment_method).compact.any?(&:payment_profiles_supported?) ||
-        # Little hacky fix for #4117
-        # If this wasn't here, order would transition to address state on confirm failure
-        # because there would be no valid payments any more.
-        state == 'confirm'
+      payments.map(&:payment_method).compact.any?(&:payment_profiles_supported?)
     end
 
     # Indicates the number of items in the order
@@ -197,8 +174,7 @@ module Spree
     # Returns the relevant zone (if any) to be used for taxation purposes.
     # Uses default tax zone unless there is a specific match
     def tax_zone
-      zone_address = Spree::Config[:tax_using_ship_address] ? ship_address : bill_address
-      Zone.match(zone_address) || Zone.default_tax
+      Zone.match(tax_address) || Zone.default_tax
     end
 
     # Indicates whether tax should be backed out of the price calcualtions in
@@ -209,9 +185,9 @@ module Spree
       return tax_zone != Zone.default_tax
     end
 
-    def price_adjustments
-      ActiveSupport::Deprecation.warn("Order#price_adjustments will be deprecated in Spree 2.1, please use Order#line_item_adjustments instead.")
-      self.line_item_adjustments
+    # Returns the address for taxation based on configuration
+    def tax_address
+      Spree::Config[:tax_using_ship_address] ? ship_address : bill_address
     end
 
     # Array of totals grouped by Adjustment#label. Useful for displaying line item
@@ -224,11 +200,6 @@ module Spree
       end]
     end
 
-    def price_adjustment_totals
-      ActiveSupport::Deprecation.warn("Order#price_adjustment_totals will be deprecated in Spree 2.1, please use Order#line_item_adjustment_totals instead.")
-      self.line_item_adjustment_totals
-    end
-
     def updater
       @updater ||= OrderUpdater.new(self)
     end
@@ -255,6 +226,13 @@ module Spree
       shipment_state.nil? || %w{ready backorder pending}.include?(shipment_state)
     end
 
+    def allow_resume?
+      # we shouldn't allow resume for legacy orders b/c we lack the information
+      # necessary to restore to a previous state
+      return false if state_changes.empty? || state_changes.last.previous_state.nil?
+      true
+    end
+
     def awaiting_returns?
       return_authorizations.any? { |return_authorization| return_authorization.authorized? }
     end
@@ -263,18 +241,6 @@ module Spree
       @contents ||= Spree::OrderContents.new(self)
     end
 
-    def add_variant(variant, quantity = 1, currency = nil)
-      ActiveSupport::Deprecation.warn("[SPREE] Spree::Order#add_variant will be deprecated in Spree 2.1, please use order.contents.add instead.")
-      contents.currency = currency unless currency.nil?
-      contents.add(variant, quantity)
-    end
-
-
-    def remove_variant(variant, quantity = 1)
-      ActiveSupport::Deprecation.warn("[SPREE] Spree::Order#remove_variant will be deprecated in Spree 2.1, please use order.contents.remove instead.")
-      contents.remove(variant, quantity)
-    end
-
     # Associates the specified user with the order.
     def associate_user!(user)
       self.user = user
@@ -287,16 +253,15 @@ module Spree
       end
     end
 
+    # FIXME refactor this method and implement validation using validates_* utilities
     def generate_order_number
-      self.number ||= loop do
+      record = true
+      while record
         random = "R#{Array.new(9){rand(9)}.join}"
-        break random unless self.class.exists?(number: random)
+        record = self.class.where(number: random).first
       end
-    end
-
-    def shipment
-      ActiveSupport::Deprecation.warn("[SPREE] Spree::Order#shipment is typically incorrect due to multiple shipments and will be deprecated in Spree 2.1, please process Spree::Order#shipments instead.")
-      @shipment ||= shipments.last
+      self.number = random if self.number.blank?
+      self.number
     end
 
     def shipped_shipments
@@ -324,12 +289,6 @@ module Spree
       adjustments.tax.map(&:amount).sum
     end
 
-    # Clear shipment when transitioning to delivery step of checkout if the
-    # current shipping address is not eligible for the existing shipping method
-    def remove_invalid_shipments!
-      shipments.each { |s| s.destroy unless s.shipping_method.available_to_order?(self) }
-    end
-
     # Creates new tax charges if there are any applicable rates. If prices already
     # include taxes then price adjustments are created instead.
     def create_tax_charge!
@@ -356,7 +315,7 @@ module Spree
 
     def credit_cards
       credit_card_ids = payments.from_credit_card.pluck(:source_id).uniq
-      CreditCard.scoped(conditions: { id: credit_card_ids })
+      CreditCard.where(id: credit_card_ids)
     end
 
     # Finalizes an in progress order after checkout is complete.
@@ -380,12 +339,12 @@ module Spree
 
       deliver_order_confirmation_email
 
-      self.state_changes.create({
+      self.state_changes.create(
         previous_state: 'cart',
         next_state:     'complete',
         name:           'order' ,
         user_id:        self.user_id
-      }, without_protection: true)
+      )
     end
 
     def deliver_order_confirmation_email
@@ -403,7 +362,7 @@ module Spree
     end
 
     def available_payment_methods
-      @available_payment_methods ||= (PaymentMethod.available(:front_end) + PaymentMethod.available(:both)).uniq
+      @available_payment_methods ||= PaymentMethod.available(:front_end)
     end
 
     def pending_payments
@@ -459,13 +418,13 @@ module Spree
     end
 
     def insufficient_stock_lines
-     line_items.select(&:insufficient_stock?)
+      line_items.select &:insufficient_stock?
     end
 
-    def merge!(order, user = nil)
+    def merge!(order)
       order.line_items.each do |line_item|
         next unless line_item.currency == currency
-        current_line_item = self.line_items.find_by_variant_id(line_item.variant_id)
+        current_line_item = self.line_items.find_by(variant: line_item.variant)
         if current_line_item
           current_line_item.quantity += line_item.quantity
           current_line_item.save
@@ -474,17 +433,14 @@ module Spree
           line_item.save
         end
       end
-
-      self.associate_user!(user) if !self.user && !user.blank?
-
       # So that the destroy doesn't take out line items which may have been re-assigned
       order.line_items.reload
       order.destroy
     end
 
     def empty!
-      adjustments.destroy_all
       line_items.destroy_all
+      adjustments.destroy_all
     end
 
     def clear_adjustments!
@@ -500,15 +456,12 @@ module Spree
       state = "#{name}_state"
       if persisted?
         old_state = self.send("#{state}_was")
-        new_state = self.send(state)
-        unless old_state == new_state
-          self.state_changes.create({
-            previous_state: old_state,
-            next_state:     new_state,
-            name:           name,
-            user_id:        self.user_id
-          }, :without_protection => true)
-        end
+        self.state_changes.create(
+          previous_state: old_state,
+          next_state:     self.send(state),
+          name:           name,
+          user_id:        self.user_id
+        )
       end
     end
 
@@ -550,7 +503,7 @@ module Spree
     #
     # At some point the might need to force the order to transition from address
     # to delivery again so that proper updated shipments are created.
-    # e.g. customer goes back from payment step and changes order items
+    # e.g. customer goes back from payment step and changes order items 
     def ensure_updated_shipments
       if shipments.any?
         self.shipments.destroy_all
@@ -570,7 +523,7 @@ module Spree
 
       # Determine if email is required (we don't want validation errors before we hit the checkout)
       def require_email
-        return true unless new_record? or ['cart', 'address'].include?(state)
+        return true unless new_record? or state == 'cart'
       end
 
       def ensure_line_items_present
@@ -593,20 +546,15 @@ module Spree
       end
 
       def has_available_payment
-        return unless has_step?("delivery") && delivery?
+        return unless delivery?
         # errors.add(:base, :no_payment_methods_available) if available_payment_methods.empty?
       end
 
       def after_cancel
         shipments.each { |shipment| shipment.cancel! }
-        payments.completed.each { |payment| payment.cancel! }
-
-        send_cancel_email
-        self.update_column(:payment_state, 'credit_owed') unless shipped?
-      end
 
-      def send_cancel_email
         OrderMailer.cancel_email(self.id).deliver
+        self.payment_state = 'credit_owed' unless shipped?
       end
 
       def after_resume