spree_core 2.3.9 → 2.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e4467acc56bb7ed67d1c5604816505e8335e3ca
-  data.tar.gz: 0fe54b4093014b0c0250644c146911c72a960658
+  metadata.gz: 728b74de9c0f8e2e371fab35a9a103a220090f4f
+  data.tar.gz: b60a27598a180ae3a23f7c449aeca221ddea1eb5
 SHA512:
-  metadata.gz: cfbd785825e173763381a4fc74cd1304bfe2131b63a947b2efe85dd6a1d529b167dd7fe8da04d3e9b5f1ee4281620a009715cd6690e764c0522b29ef11060f75
-  data.tar.gz: 9121b8723e0b55c561d6c747d6345b40a28a1a4dccca528f9f3784d694781e7083bfc449a3a6b2e3c8c0518a1b175febd1bc6cf6097d630723d9736208b8858d
+  metadata.gz: b70efe721217914f339f792721cdc192e80f17d2e860d8fa7983da76ba2034f071d2c04cb0b46c03e50c14180ee843ec8e224591b1c6991737f083adf5cb6f0b
+  data.tar.gz: e6e6f4412dc66a18e4f7891ebc1d9f440fb682e4f63593a35e83392a3f4982491d268e3f40e7f60f72ec67325244ba85a4ec5462a5ccc71a111cb7776ab96497

data/app/models/spree/app_configuration.rb

@@ -91,7 +91,9 @@ module Spree
       # support all the old preference methods with a warning
       define_method "preferred_#{old_preference_name}" do
         ActiveSupport::Deprecation.warn("#{old_preference_name} is no longer supported on Spree::Config, please access it through #{store_method} on Spree::Store")
-        Store.default.send(store_method)
+        if ActiveRecord::Base.connection.table_exists?("spree_stores") # guards against 2.2 upgraders unable to rake db migration
+          Store.default.send(store_method)
+        end
       end
     end
   end

data/app/models/spree/promotion.rb

@@ -108,7 +108,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/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/stock/package.rb

@@ -55,7 +55,7 @@ module Spree
       end
 
       def currency
-        #TODO calculate from first variant?
+        order.currency
       end
 
       def shipping_categories

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.3.9'
+    '2.3.10'
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -28,7 +28,7 @@ module Spree
     mattr_reader *ATTRIBUTES
 
     @@address_attributes = [
-      :firstname, :lastname, :first_name, :last_name, 
+      :id, :firstname, :lastname, :first_name, :last_name,
       :address1, :address2, :city, :country_id, :state_id, 
       :zipcode, :phone, :state_name, :alternative_phone, :company,
       :country => [:iso, :name, :iso3, :iso_name],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.3.9
+  version: 2.3.10
 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
@@ -244,16 +244,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