solidus_core 2.2.0.beta1 → 2.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5635c0bec12576a350d683b4140c8daa51e160a
-  data.tar.gz: 1163f3a0a622892863ba88006da9c321de52222f
+  metadata.gz: a15522624dfa81f827698dd5fd73ffe5fafd2a52
+  data.tar.gz: ff81db8c8c4c87cacf80adbcba7c158607d8bdaf
 SHA512:
-  metadata.gz: c7d0c449fce5ebc575ea2c176f0e7577158e3ee09184ff95828abe5a03704bf8f3821b98077c83bba86c9690ceac16bc7e256f1eae96ae76ecf3de78bcf7f162
-  data.tar.gz: 6ffdb536d3e89da7f98e03a662a681742f053db49b4ec6b24dc023524763da40d5648b71bc6cd9564170f367ee1a6d067330ab633a7f1f3c689b95f017b07dbb
+  metadata.gz: 329ac41798ef53df4074ed4177c6e2aba087dc3b649c2347cd42f8b82be890f2e174fce05df657d9db3c807d2aea92f281946913e0bdd068e2360fddb328d57d
+  data.tar.gz: 3f2c6804191a32e6885b662ee19d8fb21fac8ea6097e47f34773e84535f61170f1fc6a1acc4437fa65191856294d91d956830dc5085abcb3a4f04c5fc5475218

data/app/models/spree/order.rb

@@ -673,7 +673,7 @@ module Spree
     end
 
     def total_applicable_store_credit
-      if confirm? || complete?
+      if can_complete? || complete?
         payments.store_credits.valid.sum(:amount)
       else
         [total, (user.try(:total_available_store_credit) || 0.0)].min

data/lib/spree/core/version.rb

@@ -1,6 +1,6 @@
 module Spree
   def self.solidus_version
-    "2.2.0.beta1"
+    "2.2.0.rc1"
   end
 
   def self.solidus_gem_version

data/spec/models/spree/promotion_code_spec.rb

@@ -155,12 +155,12 @@ RSpec.describe Spree::PromotionCode do
     end
     let(:promo_adjustment) { order.adjustments.promotion.first }
     before do
-      order.next! until order.confirm?
+      order.next! until order.can_complete?
 
       FactoryGirl.create(:order_with_line_items, line_items_price: 40, shipment_cost: 0).tap do |order|
         FactoryGirl.create(:payment, amount: 30, order: order)
         promotion.activate(order: order, promotion_code: code)
-        order.next! until order.confirm?
+        order.next! until order.can_complete?
         order.complete!
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.2.0.beta1
+  version: 2.2.0.rc1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant