solidus_core 2.2.0.beta1 → 2.2.0.rc1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of solidus_core might be problematic. Click here for more details.

checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d5635c0bec12576a350d683b4140c8daa51e160a
4
- data.tar.gz: 1163f3a0a622892863ba88006da9c321de52222f
3
+ metadata.gz: a15522624dfa81f827698dd5fd73ffe5fafd2a52
4
+ data.tar.gz: ff81db8c8c4c87cacf80adbcba7c158607d8bdaf
5
5
  SHA512:
6
- metadata.gz: c7d0c449fce5ebc575ea2c176f0e7577158e3ee09184ff95828abe5a03704bf8f3821b98077c83bba86c9690ceac16bc7e256f1eae96ae76ecf3de78bcf7f162
7
- data.tar.gz: 6ffdb536d3e89da7f98e03a662a681742f053db49b4ec6b24dc023524763da40d5648b71bc6cd9564170f367ee1a6d067330ab633a7f1f3c689b95f017b07dbb
6
+ metadata.gz: 329ac41798ef53df4074ed4177c6e2aba087dc3b649c2347cd42f8b82be890f2e174fce05df657d9db3c807d2aea92f281946913e0bdd068e2360fddb328d57d
7
+ data.tar.gz: 3f2c6804191a32e6885b662ee19d8fb21fac8ea6097e47f34773e84535f61170f1fc6a1acc4437fa65191856294d91d956830dc5085abcb3a4f04c5fc5475218
@@ -673,7 +673,7 @@ module Spree
673
673
  end
674
674
 
675
675
  def total_applicable_store_credit
676
- if confirm? || complete?
676
+ if can_complete? || complete?
677
677
  payments.store_credits.valid.sum(:amount)
678
678
  else
679
679
  [total, (user.try(:total_available_store_credit) || 0.0)].min
@@ -1,6 +1,6 @@
1
1
  module Spree
2
2
  def self.solidus_version
3
- "2.2.0.beta1"
3
+ "2.2.0.rc1"
4
4
  end
5
5
 
6
6
  def self.solidus_gem_version
@@ -155,12 +155,12 @@ RSpec.describe Spree::PromotionCode do
155
155
  end
156
156
  let(:promo_adjustment) { order.adjustments.promotion.first }
157
157
  before do
158
- order.next! until order.confirm?
158
+ order.next! until order.can_complete?
159
159
 
160
160
  FactoryGirl.create(:order_with_line_items, line_items_price: 40, shipment_cost: 0).tap do |order|
161
161
  FactoryGirl.create(:payment, amount: 30, order: order)
162
162
  promotion.activate(order: order, promotion_code: code)
163
- order.next! until order.confirm?
163
+ order.next! until order.can_complete?
164
164
  order.complete!
165
165
  end
166
166
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: solidus_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.0.beta1
4
+ version: 2.2.0.rc1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Solidus Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-04-11 00:00:00.000000000 Z
11
+ date: 2017-04-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activemerchant