spree_core 2.1.3 → 2.1.4

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

@@ -23,7 +23,7 @@ module Spree
         # We should not define price scopes here, as they require something slightly different
         next if name.to_s.include?("master_price")
         parts = name.to_s.match(/(.*)_by_(.*)/)
-        self.scope(name.to_s, -> { relation.order("#{Product.quoted_table_name}.#{parts[2]} #{parts[1] == 'ascend' ?  "ASC" : "DESC"}") })
+        self.scope(name.to_s, -> { order("#{Product.quoted_table_name}.#{parts[2]} #{parts[1] == 'ascend' ?  "ASC" : "DESC"}") })
       end
     end
 
@@ -207,13 +207,19 @@ module Spree
       group("spree_products.id").joins(:taxons).where(Taxon.arel_table[:name].eq(name))
     end
 
-    # This method needs to be defined *as a method*, otherwise it will cause the
-    # problem shown in #1247.
-    def self.group_by_products_id
+    def self.distinct_by_product_ids(sort_order=nil)
       if (ActiveRecord::Base.connection.adapter_name == 'PostgreSQL')
-        group(column_names.map { |col_name| "#{table_name}.#{col_name}"})
+        sort_column = sort_order.split(" ").first
+        # Don't allow sort_column, a variable coming from params,
+        # to be anything but a column in the database
+        if column_names.include?(sort_column)
+          distinct_fields = ["id", sort_column].compact.join(",")
+          select("DISTINCT ON(#{distinct_fields}) spree_products.*")
+        else
+          scoped
+        end
       else
-        group("#{self.quoted_table_name}.id")
+        select("DISTINCT spree_products.*")
       end
     end
 

data/app/models/spree/product_property.rb

@@ -1,6 +1,6 @@
 module Spree
   class ProductProperty < ActiveRecord::Base
-    belongs_to :product,  class_name: 'Spree::Product'
+    belongs_to :product, touch: true, class_name: 'Spree::Product'
     belongs_to :property, class_name: 'Spree::Property'
 
     validates :property, presence: true

data/app/models/spree/promotion.rb

@@ -21,13 +21,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
@@ -91,7 +84,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/promotion/rules/user_logged_in.rb

@@ -2,11 +2,9 @@ module Spree
   class Promotion
     module Rules
       class UserLoggedIn < PromotionRule
-
         def eligible?(order, options = {})
-          return order.try(:user).try(:anonymous?) == false
+          return order.user.present?
         end
-
       end
     end
   end

data/app/models/spree/property.rb

@@ -9,11 +9,19 @@ module Spree
 
     scope :sorted, -> { order(:name) }
 
+    after_touch :touch_all_products
+
     def self.find_all_by_prototype(prototype)
       id = prototype
       id = prototype.id if prototype.class == Prototype
       joins("LEFT JOIN properties_prototypes ON property_id = #{self.table_name}.id").
         where(prototype_id: id)
     end
+
+    private
+
+    def touch_all_products
+      products.each(&:touch)
+    end
   end
 end

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
@@ -20,7 +19,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') }
@@ -164,8 +163,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
@@ -238,17 +237,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

@@ -8,7 +8,7 @@ module Spree
     has_many :shipments
     has_many :shipping_method_categories
     has_many :shipping_categories, through: :shipping_method_categories
-    has_many :shipping_rates
+    has_many :shipping_rates, inverse_of: :shipping_method
 
     has_and_belongs_to_many :zones, :join_table => 'spree_shipping_methods_zones',
                                     :class_name => 'Spree::Zone',
@@ -30,7 +30,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

@@ -1,19 +1,13 @@
 module Spree
   class ShippingRate < ActiveRecord::Base
     belongs_to :shipment, class_name: 'Spree::Shipment'
-    belongs_to :shipping_method, class_name: 'Spree::ShippingMethod'
+    belongs_to :shipping_method, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates
 
-    scope :frontend,
+    scope :with_shipping_method,
       -> { includes(:shipping_method).
-          where(ShippingMethod.on_frontend_query).
-          references(:shipping_method).
-          order("cost ASC") }
-    scope :backend,
-      -> { includes(:shipping_method).
-           where(ShippingMethod.on_backend_query).
            references(:shipping_method).
            order("cost ASC") }
-    
+
     delegate :order, :currency, to: :shipment
     delegate :name, to: :shipping_method
 
@@ -28,5 +22,9 @@ module Spree
     end
 
     alias_method :display_cost, :display_price
+
+    def shipping_method
+      Spree::ShippingMethod.unscoped { super }
+    end
   end
 end

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

@@ -9,20 +9,17 @@ module Spree
       end
 
       def shipping_rates(package, frontend_only = true)
-        shipping_rates = calculate_shipping_rates(package)
-
-        unless shipping_rates.empty?
-          available_rates = shipping_rates.clone
-          available_rates.select! { |rate| rate.shipping_method.frontend? } if frontend_only
-          choose_default_shipping_rate(available_rates)
-        end
-
-        sort_shipping_rates(shipping_rates)
+        rates = calculate_shipping_rates(package)
+        rates.select! { |rate| rate.shipping_method.frontend? } if frontend_only
+        choose_default_shipping_rate(rates)
+        sort_shipping_rates(rates)
       end
 
       private
       def choose_default_shipping_rate(shipping_rates)
-        shipping_rates.min_by(&:cost).selected = true
+        unless shipping_rates.empty?
+          shipping_rates.min_by(&:cost).selected = true
+        end
       end
 
       def sort_shipping_rates(shipping_rates)
@@ -39,12 +36,22 @@ module Spree
       def shipping_methods(package)
         package.shipping_methods.select do |ship_method|
           calculator = ship_method.calculator
-          calculator.available?(package) &&
-          ship_method.include?(order.ship_address) &&
-          (calculator.preferences[:currency].nil? ||
-           calculator.preferences[:currency] == currency)
+          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 log_calculator_exception(ship_method, exception)
+        Rails.logger.info("Something went wrong calculating rates with the #{ship_method.name} (ID=#{ship_method.id}) shipping method.")
+        Rails.logger.info("*" * 50)
+        Rails.logger.info(exception.backtrace.join("\n"))
+      end
     end
   end
 end

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

@@ -82,7 +82,7 @@ module Spree
       end
 
       def shipping_methods
-        shipping_categories.map { |sc| sc.shipping_methods }.flatten.uniq
+        shipping_categories.map(&:shipping_methods).reduce(:&).to_a
       end
 
       def inspect

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

@@ -3,13 +3,13 @@ module Spree
     acts_as_paranoid
 
     belongs_to :stock_location, class_name: 'Spree::StockLocation'
-    belongs_to :variant, class_name: 'Spree::Variant'
+    belongs_to :variant, class_name: 'Spree::Variant', touch: true
     has_many :stock_movements
 
     validates_presence_of :stock_location, :variant
     validates_uniqueness_of :variant_id, scope: [:stock_location_id, :deleted_at]
 
-    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

@@ -44,6 +44,14 @@ module Spree
       move(variant, quantity, originator)
     end
 
+    def restock_backordered(variant, quantity, originator = nil)
+      item = stock_item_or_create(variant)
+      item.update_columns(
+        count_on_hand: item.count_on_hand + quantity,
+        updated_at: Time.now
+      )
+    end
+
     def unstock(variant, quantity, originator = nil)
       move(variant, -quantity, originator)
     end

data/app/models/spree/stock_movement.rb

@@ -16,10 +16,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/taxon.rb

@@ -16,7 +16,7 @@ module Spree
       url: '/spree/taxons/:id/:style/:basename.:extension',
       path: ':rails_root/public/spree/taxons/:id/:style/:basename.:extension',
       default_url: '/assets/default_taxon.png'
-      
+
     include Spree::Core::S3Support
     supports_s3 :icon
 
@@ -76,7 +76,7 @@ module Spree
     #
     #  See #3390 for background.
     def child_index=(idx)
-      move_to_child_with_index(parent, idx.to_i)
+      move_to_child_with_index(parent, idx.to_i) unless self.new_record?
     end
   end
 end

data/app/models/spree/variant.rb

@@ -23,7 +23,7 @@ module Spree
       class_name: 'Spree::Price',
       dependent: :destroy
 
-    delegate_belongs_to :default_price, :display_price, :display_amount, :price, :price=, :currency 
+    delegate_belongs_to :default_price, :display_price, :display_amount, :price, :price=, :currency
 
     has_many :prices,
       class_name: 'Spree::Price',
@@ -40,7 +40,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.not(deleted_at: nil) }
 
     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')
@@ -76,6 +76,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
@@ -94,7 +100,6 @@ module Spree
         # then we have to check to make sure that the product has the option type
         unless self.product.option_types.include? option_type
           self.product.option_types << option_type
-          self.product.save
         end
       end
 
@@ -127,13 +132,17 @@ module Spree
       "#{name} - #{sku}"
     end
 
+    def sku_and_options_text
+      "#{sku} #{options_text}".strip
+    end
+
     # Product may be created with deleted_at already set,
     # which would make AR's default finder return nil.
     # This is a stopgap for that little problem.
     def product
       Spree::Product.unscoped { super }
     end
-    
+
     def in_stock?(quantity=1)
       Spree::Stock::Quantifier.new(self).can_supply?(quantity)
     end
@@ -142,6 +151,12 @@ module Spree
       Spree::Stock::Quantifier.new(self).total_on_hand
     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)