spree_core 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c0e00c7f8d48f1f8f6a553128e0f324baf1b80b
-  data.tar.gz: 13ad6252099846dd0af9cb82e417d804199ecfa5
+  metadata.gz: 14ac66f9e7ddcb8372dfead29fd08ba8153910c2
+  data.tar.gz: 08206ae70c25c4689dddd12fbab62c82e360fbd0
 SHA512:
-  metadata.gz: c87d7b7176aa8f6447eba1897834beb1889741ab3b2a8fe6d0090d25559a96d2f104447a89ced51264099b4ed43e8cc8a9504e8c986bcb868bec309a73d5c71b
-  data.tar.gz: 884eef22bc8e8e9b6caf813c24b453582089d2966aab9cc924c62fcda7c8fefe0608513b464ed761c157f46047ec3b208b44c1d6e4fa3570e2ffdccdfe204ac9
+  metadata.gz: 6aa9dadaa97ec4cd19384d095b92f3bad8e6b0378906c1fa2de65dc3423837a066c09bc602aafe532e0ba11a9cfae36ef8d8887f44f1ebede67d5f922c77fa34
+  data.tar.gz: 4d405953434dafed6a819848cc601c2b718d971cb89ff3e9e4413a7692b1f99902f4502a9d56ee870020fa6f61328ac41980d3087f8f793fc67467137d9119a4

data/app/helpers/spree/base_helper.rb

@@ -34,7 +34,7 @@ module Spree
       v.options_text
     end
 
-    def meta_data_tags
+    def meta_data
       object = instance_variable_get('@'+controller_name.singularize)
       meta = {}
 
@@ -51,8 +51,11 @@ module Spree
         keywords: Spree::Config[:default_meta_keywords],
         description: Spree::Config[:default_meta_description]
       })
+      meta
+    end
 
-      meta.map do |name, content|
+    def meta_data_tags
+      meta_data.map do |name, content|
         tag('meta', name: name, content: content)
       end.join("\n")
     end

data/app/models/spree/adjustment.rb

@@ -55,8 +55,8 @@ module Spree
     scope :shipping, -> { where(originator_type: 'Spree::ShippingMethod') }
     scope :optional, -> { where(mandatory: false) }
     scope :eligible, -> { where(eligible: true) }
-    scope :charge, -> { where('amount >= 0') }
-    scope :credit, -> { where('amount < 0') }
+    scope :charge, -> { where("#{quoted_table_name}.amount >= 0") }
+    scope :credit, -> { where("#{quoted_table_name}.amount < 0") }
     scope :promotion, -> { where(originator_type: 'Spree::PromotionAction') }
     scope :return_authorization, -> { where(source_type: "Spree::ReturnAuthorization") }
 

data/app/models/spree/gateway.rb

@@ -1,6 +1,6 @@
 module Spree
   class Gateway < PaymentMethod
-    delegate_belongs_to :provider, :authorize, :purchase, :capture, :void, :credit
+    delegate :authorize, :purchase, :capture, :void, :credit, to: :provider
 
     validates :name, :type, presence: true
 

data/app/models/spree/inventory_unit.rb

@@ -2,16 +2,17 @@ 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"
+    belongs_to :shipment, class_name: "Spree::Shipment", touch: true
     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)
+      includes(:shipment, :order)
         .where("spree_shipments.state != 'canceled'")
         .where(variant_id: stock_item.variant_id)
-        .backordered.order("#{self.table_name}.created_at ASC")
+        .where('spree_orders.completed_at is not null')
+        .backordered.order("spree_orders.completed_at ASC")
     end
 
     attr_accessible :shipment, :variant_id
@@ -36,7 +37,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/line_item.rb

@@ -22,12 +22,11 @@ module Spree
 
     attr_accessible :quantity, :variant_id
 
-    before_save :update_inventory
-
+    after_save :update_inventory
     after_save :update_order
     after_destroy :update_order
 
-    delegate :name, :description, to: :variant
+    delegate :name, :description, :should_track_inventory?, to: :variant
 
     attr_accessor :target_shipment
 

data/app/models/spree/option_value.rb

@@ -1,6 +1,6 @@
 module Spree
   class OptionValue < ActiveRecord::Base
-    belongs_to :option_type
+    belongs_to :option_type, :class_name => 'Spree::OptionType', :touch => true
     acts_as_list scope: :option_type
     has_and_belongs_to_many :variants, join_table: 'spree_option_values_variants', class_name: "Spree::Variant"
 

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

@@ -145,6 +145,10 @@ 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

@@ -28,7 +28,7 @@ module Spree
 
     attr_accessible :line_items, :bill_address_attributes, :ship_address_attributes,
                     :payments_attributes, :ship_address, :bill_address, :currency,
-                    :line_items_attributes, :number, :email, :use_billing, 
+                    :line_items_attributes, :number, :email, :use_billing,
                     :special_instructions, :shipments_attributes, :coupon_code
 
     attr_reader :coupon_code
@@ -103,7 +103,7 @@ module Spree
     end
 
     def self.complete
-      where('completed_at IS NOT NULL')
+      where("#{quoted_table_name}.completed_at IS NOT NULL")
     end
 
     def self.incomplete
@@ -172,11 +172,12 @@ module Spree
 
     # If true, causes the confirmation step to happen during the checkout process
     def confirmation_required?
-      if payments.empty? and Spree::Config[:always_include_confirm_step]
-        true
-      else
-        payments.map(&:payment_method).compact.any?(&:payment_profiles_supported?)
-      end
+      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'
     end
 
     # Indicates the number of items in the order
@@ -401,7 +402,7 @@ module Spree
     end
 
     def available_payment_methods
-      @available_payment_methods ||= PaymentMethod.available(:front_end)
+      @available_payment_methods ||= (PaymentMethod.available(:front_end) + PaymentMethod.available(:both)).uniq
     end
 
     def pending_payments
@@ -498,12 +499,15 @@ module Spree
       state = "#{name}_state"
       if persisted?
         old_state = self.send("#{state}_was")
-        self.state_changes.create({
-          previous_state: old_state,
-          next_state:     self.send(state),
-          name:           name,
-          user_id:        self.user_id
-        }, without_protection: true)
+        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
       end
     end
 
@@ -545,7 +549,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
@@ -565,7 +569,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 state == 'cart'
+        return true unless new_record? or ['cart', 'address'].include?(state)
       end
 
       def ensure_line_items_present
@@ -594,9 +598,10 @@ module Spree
 
       def after_cancel
         shipments.each { |shipment| shipment.cancel! }
+        payments.completed.each { |payment| payment.credit! }
 
         send_cancel_email
-        self.payment_state = 'credit_owed' unless shipped?
+        self.update_column(:payment_state, 'credit_owed') unless shipped?
       end
 
       def send_cancel_email

data/app/models/spree/order_inventory.rb

@@ -65,7 +65,7 @@ module Spree
     end
 
     def add_to_shipment(shipment, variant, quantity)
-      if Config.track_inventory_levels
+      if variant.should_track_inventory?
         on_hand, back_order = shipment.stock_location.fill_status(variant, quantity)
 
         on_hand.times { shipment.set_up_inventory('on_hand', variant, order) }

data/app/models/spree/payment.rb

@@ -4,7 +4,7 @@ module Spree
 
     IDENTIFIER_CHARS = (('A'..'Z').to_a + ('0'..'9').to_a - %w(0 1 I O)).freeze
 
-    belongs_to :order, class_name: 'Spree::Order'
+    belongs_to :order, class_name: 'Spree::Order', touch: true
     belongs_to :source, polymorphic: true
     belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
 
@@ -31,7 +31,7 @@ module Spree
     scope :completed, with_state('completed')
     scope :pending, with_state('pending')
     scope :failed, with_state('failed')
-    scope :valid, where('state NOT IN (?)', %w(failed invalid))
+    scope :valid, where("#{quoted_table_name}.state NOT IN (?)", %w(failed invalid))
 
     after_rollback :persist_invalid
 

data/app/models/spree/price.rb

@@ -24,6 +24,11 @@ module Spree
       self[:amount] = parse_price(price)
     end
 
+    # Remove variant default_scope `deleted_at: nil`
+    def variant
+      Spree::Variant.unscoped { super }
+    end
+
     private
     def check_price
       raise "Price must belong to a variant" if variant.nil?

data/app/models/spree/product/scopes.rb

@@ -24,7 +24,7 @@ module Spree
         next if name.to_s.include?("master_price")
         parts = name.to_s.match(/(.*)_by_(.*)/)
         order_text = "#{Product.quoted_table_name}.#{parts[2]} #{parts[1] == 'ascend' ?  "ASC" : "DESC"}"
-        self.scope(name.to_s, relation.order(order_text))
+        self.scope(name.to_s, order(order_text))
       end
     end
 

data/app/models/spree/product.rb

@@ -220,10 +220,10 @@ module Spree
     end
 
     def total_on_hand
-      if Spree::Config.track_inventory_levels
-        self.stock_items.sum(&:count_on_hand)
-      else
+      if self.variants_including_master.any? { |v| !v.should_track_inventory? }
         Float::INFINITY
+      else
+        self.stock_items.sum(&:count_on_hand)
       end
     end
 

data/app/models/spree/promotion.rb

@@ -26,13 +26,6 @@ module Spree
     validates :path, presence: true, if: lambda{|r| r.event_name == 'spree.content.visited' }
     validates :usage_limit, numericality: { greater_than: 0, allow_nil: true }
 
-    # TODO: This shouldn't be necessary with :autosave option but nested attribute updating of actions is broken without it
-    after_save :save_rules_and_actions
-
-    def save_rules_and_actions
-      (rules + actions).each &:save
-    end
-
     def self.advertised
       where(advertise: true)
     end
@@ -96,7 +89,7 @@ module Spree
     end
 
     def credits
-      Adjustment.promotion.where(originator_id: actions.map(&:id))
+      Adjustment.eligible.promotion.where(originator_id: actions.map(&:id))
     end
 
     def credits_count

data/app/models/spree/shipment.rb

@@ -2,7 +2,7 @@ require 'ostruct'
 
 module Spree
   class Shipment < ActiveRecord::Base
-    belongs_to :order, class_name: 'Spree::Order'
+    belongs_to :order, class_name: 'Spree::Order', touch: true
     belongs_to :address, class_name: 'Spree::Address'
     belongs_to :stock_location, class_name: 'Spree::StockLocation'
 
@@ -12,7 +12,6 @@ module Spree
     has_many :inventory_units, dependent: :delete_all
     has_one :adjustment, as: :source, dependent: :destroy
 
-    before_create :generate_shipment_number
     after_save :ensure_correct_adjustment, :update_order
 
     attr_accessor :special_instructions
@@ -22,7 +21,7 @@ module Spree
     accepts_nested_attributes_for :address
     accepts_nested_attributes_for :inventory_units
 
-    make_permalink field: :number
+    make_permalink field: :number, length: 11, prefix: 'H'
 
     scope :shipped, -> { with_state('shipped') }
     scope :ready,   -> { with_state('ready') }
@@ -166,8 +165,8 @@ module Spree
     end
 
     def line_items
-      if order.complete? and Spree::Config[:track_inventory_levels]
-        order.line_items.select { |li| inventory_units.pluck(:variant_id).include?(li.variant_id) }
+      if order.complete? and Spree::Config.track_inventory_levels
+        order.line_items.select { |li| !li.should_track_inventory? || inventory_units.pluck(:variant_id).include?(li.variant_id) }
       else
         order.line_items
       end
@@ -243,17 +242,13 @@ module Spree
       end
 
       def manifest_restock(item)
-        stock_location.restock item.variant, item.quantity, self
-      end
+        if item.states["on_hand"].to_i > 0
+         stock_location.restock item.variant, item.states["on_hand"], self
+        end
 
-      def generate_shipment_number
-        return number unless number.blank?
-        record = true
-        while record
-          random = "H#{Array.new(11) { rand(9) }.join}"
-          record = self.class.where(number: random).first
+        if item.states["backordered"].to_i > 0
+          stock_location.restock_backordered item.variant, item.states["backordered"]
         end
-        self.number = random
       end
 
       def description_for_shipping_charge

data/app/models/spree/shipping_method.rb

@@ -43,7 +43,8 @@ module Spree
     end
 
     def build_tracking_url(tracking)
-      tracking_url.gsub(/:tracking/, tracking) unless tracking.blank? || tracking_url.blank?
+      return if tracking.blank? || tracking_url.blank?
+      tracking_url.gsub(/:tracking/, ERB::Util.url_encode(tracking)) # :url_encode exists in 1.8.7 through 2.1.0
     end
 
     def self.calculators

data/app/models/spree/shipping_rate.rb

@@ -22,5 +22,9 @@ module Spree
       Spree::Money.new(price, { currency: currency })
     end
     alias_method :display_cost, :display_price
+
+    def shipping_method
+      Spree::ShippingMethod.unscoped { super }
+    end
   end
 end

data/app/models/spree/stock/estimator.rb

@@ -15,7 +15,8 @@ module Spree
 
         shipping_methods.each do |shipping_method|
           cost = calculate_cost(shipping_method, package)
-          shipping_rates << shipping_method.shipping_rates.new(:cost => cost) unless cost.nil?
+          rate = shipping_method.shipping_rates.new(:cost => cost) unless cost.nil?
+          shipping_rates << rate unless rate.nil?
         end
 
         shipping_rates.sort_by! { |r| r.cost || 0 }
@@ -34,17 +35,30 @@ module Spree
       end
 
       private
+
       def shipping_methods(package)
-        shipping_methods = package.shipping_methods
-        shipping_methods.delete_if { |ship_method| !ship_method.calculator.available?(package) }
-        shipping_methods.delete_if { |ship_method| !ship_method.include?(order.ship_address) }
-        shipping_methods.delete_if { |ship_method| !(ship_method.calculator.preferences[:currency].nil? || ship_method.calculator.preferences[:currency] == currency) }
-        shipping_methods
+        package.shipping_methods.select do |ship_method|
+          calculator = ship_method.calculator
+          begin
+            calculator.available?(package) &&
+            ship_method.include?(order.ship_address) &&
+            (calculator.preferences[:currency].nil? ||
+             calculator.preferences[:currency] == currency)
+          rescue Exception => exception
+            log_calculator_exception(ship_method, exception)
+          end
+        end
       end
 
       def calculate_cost(shipping_method, package)
         shipping_method.calculator.compute(package)
       end
+
+      def log_calculator_exception(ship_method, exception)
+        Rails.logger.error("Something went wrong calculating rates with the #{ship_method.name} (ID=#{ship_method.id}) shipping method.")
+        Rails.logger.error("*" * 50)
+        Rails.logger.error(exception.backtrace.join("\n"))
+      end
     end
   end
 end

data/app/models/spree/stock/packer.rb

@@ -20,7 +20,7 @@ module Spree
       def default_package
         package = Package.new(stock_location, order)
         order.line_items.each do |line_item|
-          if Config.track_inventory_levels
+          if line_item.should_track_inventory?
             next unless stock_location.stock_item(line_item.variant)
 
             on_hand, backordered = stock_location.fill_status(line_item.variant, line_item.quantity)

data/app/models/spree/stock/quantifier.rb

@@ -4,12 +4,12 @@ module Spree
       attr_reader :stock_items
 
       def initialize(variant)
-        @variant = variant
+        @variant = resolve_variant_id(variant)
         @stock_items = Spree::StockItem.joins(:stock_location).where(:variant_id => @variant, Spree::StockLocation.table_name =>{ :active => true})
       end
 
       def total_on_hand
-        if Spree::Config.track_inventory_levels
+        if @variant.should_track_inventory?
           stock_items.sum(:count_on_hand)
         else
           Float::INFINITY
@@ -23,6 +23,15 @@ module Spree
       def can_supply?(required)
         total_on_hand >= required || backorderable?
       end
+
+      private
+
+      # return variant when passed either variant object or variant id
+      def resolve_variant_id(variant)
+        variant = Spree::Variant.find_by_id(variant) unless variant.respond_to?(:should_track_inventory?)
+        variant
+      end
+
     end
   end
 end

data/app/models/spree/stock_item.rb

@@ -11,7 +11,7 @@ module Spree
 
     attr_accessible :count_on_hand, :variant, :stock_location, :backorderable, :variant_id
 
-    delegate :weight, to: :variant
+    delegate :weight, :should_track_inventory?, to: :variant
 
     def backordered_inventory_units
       Spree::InventoryUnit.backordered_for_stock_item(self)

data/app/models/spree/stock_location.rb

@@ -48,6 +48,11 @@ module Spree
       move(variant, quantity, originator)
     end
 
+    def restock_backordered(variant, quantity, originator = nil)
+      item = stock_item_or_create(variant)
+      item.update_column(:count_on_hand, item.count_on_hand + quantity)
+    end
+
     def unstock(variant, quantity, originator = nil)
       move(variant, -quantity, originator)
     end

data/app/models/spree/stock_movement.rb

@@ -17,10 +17,12 @@ module Spree
     end
 
     private
+
     def update_stock_item_quantity
-      return unless Spree::Config[:track_inventory_levels]
+      return unless self.stock_item.should_track_inventory?
       stock_item.adjust_count_on_hand quantity
     end
+
   end
 end
 

data/app/models/spree/variant.rb

@@ -11,7 +11,8 @@ module Spree
     attr_accessible :name, :presentation, :cost_price, :lock_version,
                     :position, :option_value_ids,
                     :product_id, :option_values_attributes, :price,
-                    :weight, :height, :width, :depth, :sku, :cost_currency
+                    :weight, :height, :width, :depth, :sku, :cost_currency,
+                    :track_inventory, :options
 
     has_many :inventory_units
     has_many :line_items
@@ -44,7 +45,7 @@ module Spree
     after_create :set_position
 
     # default variant scope only lists non-deleted variants
-    scope :deleted, lambda { where('deleted_at IS NOT NULL') }
+    scope :deleted, lambda { where("#{quoted_table_name}.deleted_at IS NOT NULL") }
 
     def self.active(currency = nil)
       joins(:prices).where(deleted_at: nil).where('spree_prices.currency' => currency || Spree::Config[:currency]).where('spree_prices.amount IS NOT NULL')
@@ -80,6 +81,12 @@ module Spree
       deleted_at
     end
 
+    def options=(options = {})
+      options.each do |option|
+        set_option_value(option[:name], option[:value])
+      end
+    end
+
     def set_option_value(opt_name, opt_value)
       # no option values on master
       return if self.is_master
@@ -146,6 +153,12 @@ module Spree
       Spree::Product.unscoped { super }
     end
 
+    # Shortcut method to determine if inventory tracking is enabled for this variant
+    # This considers both variant tracking flag and site-wide inventory tracking settings
+    def should_track_inventory?
+      self.track_inventory? && Spree::Config.track_inventory_levels
+    end
+
     private
       # strips all non-price-like characters from the price, taking into account locale settings
       def parse_price(price)

data/app/models/spree/zone.rb

@@ -133,7 +133,7 @@ module Spree
 
       def remove_defunct_members
         if zone_members.any?
-          zone_members.where('zoneable_id IS NULL OR zoneable_type != ?', "Spree::#{kind.capitalize}").destroy_all
+          zone_members.where('zoneable_id IS NULL OR zoneable_type != ?', "Spree::#{kind.classify}").destroy_all
         end
       end
 

data/config/locales/en.yml

@@ -702,6 +702,7 @@ en:
     no_rules_added: No rules added
     no_resource_found: ! 'No %{resource} found'
     no_shipping_methods_found: No shipping methods found
+    no_eligible_shipping_methods_found: No eligible shipping methods found
     no_trackers_found: No Trackers Found
     no_stock_locations_found: No stock locations found
     no_tracking_present: No tracking details provided.
@@ -954,6 +955,7 @@ en:
     shipment_state: Shipment State
     shipment_states:
       backorder: backorder
+      canceled: canceled
       partial: partial
       pending: pending
       ready: ready
@@ -1052,6 +1054,8 @@ en:
     time: Time
     to_add_variants_you_must_first_define: To add variants, you must first define
     total: Total
+    total_price: Total price
+    track_inventory: Track Inventory
     tracking: Tracking
     tracking_number: Tracking Number
     tracking_url: Tracking URL

data/db/migrate/20130417120034_add_index_to_source_columns_on_adjustments.rb

@@ -0,0 +1,5 @@
+class AddIndexToSourceColumnsOnAdjustments < ActiveRecord::Migration
+  def change
+    add_index :spree_adjustments, [:source_type, :source_id]
+  end
+end

data/db/migrate/20131026154747_add_track_inventory_to_variant.rb

@@ -0,0 +1,5 @@
+class AddTrackInventoryToVariant < ActiveRecord::Migration
+  def change
+    add_column :spree_variants, :track_inventory, :boolean, :default => true
+  end
+end

data/db/migrate/20140120160805_add_index_to_variant_id_and_currency_on_prices.rb

@@ -0,0 +1,5 @@
+class AddIndexToVariantIdAndCurrencyOnPrices < ActiveRecord::Migration
+  def change
+    add_index :spree_prices, [:variant_id, :currency]
+  end
+end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -53,9 +53,9 @@ module Spree
     def test_dummy_inject_extension_requirements
       if DummyGeneratorHelper.inject_extension_requirements
         inside dummy_path do
-          %w(spree_frontend spree_backend spree_api).each do |requirement|
-            inject_into_file 'config/application.rb', "require '#{requirement}'\n", :before => /require '#{@lib_name}'/, :verbose => true
-          end
+          inject_require_for('spree_frontend') if Object.const_defined?("Spree::Frontend")
+          inject_require_for('spree_backend') if Object.const_defined?("Spree::Backend")
+          inject_require_for('spree_api') if Object.const_defined?("Spree::Api")
         end
       end
     end
@@ -82,6 +82,11 @@ module Spree
     attr :database
 
     protected
+
+    def inject_require_for(requirement)
+      inject_into_file 'config/application.rb', "require '#{requirement}'\n", :before => /require '#{@lib_name}'/, :verbose => true
+    end
+
     def dummy_path
       ENV['DUMMY_PATH'] || 'spec/dummy'
     end