spree_core 2.4.6 → 2.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74b9cc11b2915cf6a3cb6aa62104f6eaf77c3c33
-  data.tar.gz: dd6804ed2e43a0cb6d87b41ed06c4bd27b4638a6
+  metadata.gz: 6e70453c69a40765c3da043aaa45500faf53a473
+  data.tar.gz: 7f7d4d3f6d687e4ca780d632db70944a51ec4a17
 SHA512:
-  metadata.gz: f8cb30c856f1491e29066c9afb33aeaa0791cd904d7bc8be5824b9c4bcb0eeaa9c7589cf4f72e4cf215bc10e46fd58f6c51b9fa6804e36123334ff326f454a03
-  data.tar.gz: b199cffe7f6c2e46af52e2bb1d68cfeb98a2fa888829f0bf0be962e24b7dd59b2886b4f38d6c693007964cf660b0c0f39f144cc0e2eb74cdb8952860832f4a85
+  metadata.gz: 6cb8f296090b301cef84ba89770fb22df0bccb7a5d6e6baab595adb07e607d181d7608db28d8f29f820d5fe6ead85e5bc71411e523f31f6b296ad2e5e725a004
+  data.tar.gz: 1fd7c088dc684dd038214c82eee41278b4fd18ce874570adb45532fbe918a9c69bcb110e3628585975e66555f32ce93295026c6ba2f321baa3fb9f75dd95171c

data/app/helpers/spree/base_helper.rb

@@ -105,7 +105,7 @@ module Spree
     end
 
     def taxons_tree(root_taxon, current_taxon, max_level = 1)
-      return '' if max_level < 1 || root_taxon.children.empty?
+      return '' if max_level < 1 || root_taxon.leaf?
       content_tag :ul, class: 'taxons-list' do
         root_taxon.children.map do |taxon|
           css_class = (current_taxon && current_taxon.self_and_ancestors.include?(taxon)) ? 'current' : nil

data/app/helpers/spree/products_helper.rb

@@ -45,7 +45,7 @@ module Spree
 
     def line_item_description_text description_text
       if description_text.present?
-        truncate(strip_tags(description_text.gsub(' ', ' ')), length: 100)
+        truncate(strip_tags(description_text.gsub(' ', ' ').squish), length: 100)
       else
         Spree.t(:product_has_no_description)
       end

data/app/models/spree/classification.rb

@@ -2,7 +2,7 @@ module Spree
   class Classification < Spree::Base
     self.table_name = 'spree_products_taxons'
     acts_as_list scope: :taxon
-    belongs_to :product, class_name: "Spree::Product", inverse_of: :classifications
+    belongs_to :product, class_name: "Spree::Product", inverse_of: :classifications, touch: true
     belongs_to :taxon, class_name: "Spree::Taxon", inverse_of: :classifications, touch: true
 
     # For #3494

data/app/models/spree/order.rb

@@ -351,6 +351,13 @@ module Spree
     def outstanding_balance
       if state == 'canceled'
         -1 * payment_total
+      elsif reimbursements.includes(:refunds).size > 0
+        reimbursed = reimbursements.includes(:refunds).inject(0) do |sum, reimbursement|
+          sum + reimbursement.refunds.sum(:amount)
+        end
+        # If reimbursement has happened add it back to total to prevent balance_due payment state
+        # See: https://github.com/spree/spree/issues/6229
+        total - (payment_total + reimbursed)
       else
         total - payment_total
       end

data/app/models/spree/product_property.rb

@@ -1,5 +1,7 @@
 module Spree
   class ProductProperty < Spree::Base
+    acts_as_list scope: :product
+
     belongs_to :product, touch: true, class_name: 'Spree::Product', inverse_of: :product_properties
     belongs_to :property, class_name: 'Spree::Property', inverse_of: :product_properties
 

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

@@ -39,14 +39,23 @@ module Spree
           order = options[:order]
           return unless self.eligible? order
 
+          action_taken = false
           promotion_action_line_items.each do |item|
             current_quantity = order.quantity_of(item.variant)
-            if current_quantity < item.quantity
-              order.contents.add(item.variant, item.quantity - current_quantity)
+            if current_quantity < item.quantity && item_available?(item)
+              line_item = order.contents.add(item.variant, item.quantity - current_quantity)
+              action_taken = true if line_item.try(:valid?)
             end
           end
-          true
+          action_taken
         end
+
+        # Checks that there's enough stock to add the line item to the order
+        def item_available?(item)
+          quantifier = Spree::Stock::Quantifier.new(item.variant)
+          quantifier.can_supply? item.quantity
+        end
+
       end
     end
   end

data/app/models/spree/promotion.rb

@@ -91,23 +91,28 @@ module Spree
       # Promotions without rules are eligible by default.
       return [] if rules.none?
       eligible = lambda { |r| r.eligible?(promotable, options) }
-      specific_rules = rules.for(promotable)
+      specific_rules = rules.select { |rule| rule.applicable?(promotable) }
       return [] if specific_rules.none?
 
+      rule_eligibility = Hash[specific_rules.map do |rule|
+        [rule, rule.eligible?(promotable, options)]
+      end]
+
       if match_all?
         # If there are rules for this promotion, but no rules for this
         # particular promotable, then the promotion is ineligible by default.
-        unless specific_rules.all?(&eligible)
+        unless rule_eligibility.values.all?
           @eligibility_errors = specific_rules.map(&:eligibility_errors).detect(&:present?)
           return nil
         end
         specific_rules
       else
-        unless specific_rules.any?(&eligible)
+        unless rule_eligibility.values.any?
           @eligibility_errors = specific_rules.map(&:eligibility_errors).detect(&:present?)
           return nil
         end
-        specific_rules.select(&eligible)
+
+        [rule_eligibility.detect { |_, eligibility| eligibility }.first]
       end
     end
 
@@ -120,7 +125,8 @@ module Spree
     end
 
     def adjusted_credits_count(promotable)
-      credits_count - promotable.adjustments.promotion.where(:source_id => actions.pluck(:id)).count
+      adjustments = promotable.is_a?(Order) ? promotable.all_adjustments : promotable.adjustments
+      credits_count - adjustments.promotion.where(:source_id => actions.pluck(:id)).count
     end
 
     def credits

data/app/models/spree/shipment.rb

@@ -16,6 +16,8 @@ module Spree
 
     before_validation :set_cost_zero_when_nil
 
+    validates :stock_location, presence: true
+
     attr_accessor :special_instructions
 
     accepts_nested_attributes_for :address

data/app/models/spree/variant.rb

@@ -1,6 +1,7 @@
 module Spree
   class Variant < Spree::Base
     acts_as_paranoid
+    acts_as_list
 
     include Spree::DefaultPrice
 
@@ -47,6 +48,10 @@ module Spree
       joins(:prices).where(deleted_at: nil).where('spree_prices.currency' => currency || Spree::Config[:currency]).where('spree_prices.amount IS NOT NULL')
     end
 
+    def self.having_orders
+      joins(:line_items).distinct
+    end
+
     def tax_category
       if self[:tax_category_id].nil?
         product.tax_category
@@ -172,7 +177,7 @@ module Spree
       return 0 unless options.present?
 
       options.keys.map { |key|
-        m = "#{options[key]}_price_modifier_amount".to_sym
+        m = "#{key}_price_modifier_amount".to_sym
         if self.respond_to? m
           self.send(m, options[key])
         else

data/db/migrate/20140309033438_create_store_from_preferences.rb

@@ -1,5 +1,12 @@
 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/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.4.6"
+    "2.4.7"
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -61,7 +61,9 @@ module Spree
       :meta_keywords, :price, :sku, :deleted_at, :prototype_id,
       :option_values_hash, :weight, :height, :width, :depth,
       :shipping_category_id, :tax_category_id,
-      :taxon_ids, :option_type_ids, :cost_currency, :cost_price]
+      :taxon_ids, :cost_currency, :cost_price,
+      option_type_ids: []
+    ]
 
     @@property_attributes = [:name, :presentation]
 
@@ -101,8 +103,10 @@ module Spree
 
     @@variant_attributes = [
       :name, :presentation, :cost_price, :lock_version,
-      :position, :option_value_ids, :track_inventory,
+      :position, :track_inventory,
       :product_id, :product, :option_values_attributes, :price,
-      :weight, :height, :width, :depth, :sku, :cost_currency, options: [ :name, :value ]]
+      :weight, :height, :width, :depth, :sku, :cost_currency,
+      options: [:name, :value], option_value_ids: []
+    ]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.4.7
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -258,16 +258,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.8
+        version: 4.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.8
+        version: 4.1.9
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement