spree_core 2.2.11 → 2.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11ef4d76fbb16b4e612c0fc431cbbe907d106470
-  data.tar.gz: 9e84c5508361845f02f985c0a428ab8a15d3f33e
+  metadata.gz: 92b5e846d05190304783fa5e19dd8b0e69c2fc42
+  data.tar.gz: 993fec4f99e61b8a22498f8a331dc2367bde321d
 SHA512:
-  metadata.gz: 66aaaaa4635f833f2ee9ac0915251bf58e9340fd78c4dadd33c4aaf1eab18ba5d1c08a6039ff9e868cce5902b5d40d232a86e31d9959b4f7535e930fb9302702
-  data.tar.gz: 351836895c5b43cb5573d2dc2dd0ff901419917f4cd16f0b574928b3d6b901b1a76d93a0399bf6bfb479aec59fb59872da5cb306dcbfb37c472f0c2f759dcce2
+  metadata.gz: 973fe4de757aaf4d9513120337d2e8f09b74d6583279fd179c00a9947a9f12de5d63a2a5d052dfe58d58500829f0a7febab70c1f9ef461591c50639c978f41be
+  data.tar.gz: 23d1efe8df2ec9095d9f3a8cc11bd8e96db31fc680764fae7ba22cb3444b2e23832ce3acb7d66d765b622972c0d3ec27bead93cc8bb39c17538d03c6e9b7c163

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

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

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.2.11"
+    "2.2.12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.2.11
+  version: 2.2.12
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant