solidus_legacy_promotions 4.6.1 → 4.6.2

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.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/spree/promotion/rules/first_order.rb +2 -2
  3. data/app/models/spree/promotion_handler/cart.rb +1 -1
  4. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bba42b440c3d59c1d850cd9c8b5c02bbb1c54ff63293740d032aa9b724d67947
4
- data.tar.gz: 9fceff71425ec0cd5bca313747bb602daae0417fe091144c39bf6489f9e44679
3
+ metadata.gz: 5b7fe367087351a80fb8708ce2ab6a162963e0177fe489f32dfda915a3c4696d
4
+ data.tar.gz: 8f923a1d8643d521db0c933cbb01e2e727b4d6db4fa7e919197d21dc33b6a1b9
5
5
  SHA512:
6
- metadata.gz: 797552766577e2912ceb79ed37ff4e1645c906b85f9a168f2291a2f0c07fb1158b30d8df7a68b3e3b66e87cc65c6f1ab3685455d2e2527578ffd62b3488a0913
7
- data.tar.gz: 052be047b145b6798edeeabd7de5d4029048ffb5161bb9d62c743fa7ef6dce6a0b21c81d352c8dd454fd4329e5dc8c0e09b39e61f6dd01b3d95550d990a295ff
6
+ metadata.gz: 359eabd33fb5cf98fef72ca96673d181b85a881366baa48ee3af7e67fa78b73862db2a9f093f846f07353b0c4e2570f517261ceb37b639765ebfbd6ad6d1d883
7
+ data.tar.gz: bdb0dea08feb1ecac391281d670b321f03aa8ad136c9678e2da18a2b0cf6fe455eaecade8aac5a9e55a916c84c8d3a44b9fd6a35c5dbf34198b20370000ac46a
data/app/models/spree/promotion/rules/first_order.rb CHANGED
@@ -24,11 +24,11 @@ module Spree
24
24
  private
25
25
 
26
26
  def completed_orders
27
- user ? user.orders.complete : orders_by_email
27
+ user ? user.orders.complete.not_canceled : orders_by_email
28
28
  end
29
29
 
30
30
  def orders_by_email
31
- Spree::Order.where(email:).complete
31
+ Spree::Order.where(email:).complete.not_canceled
32
32
  end
33
33
  end
34
34
  end
data/app/models/spree/promotion_handler/cart.rb CHANGED
@@ -61,7 +61,7 @@ module Spree
61
61
 
62
62
  def promotion_code(promotion)
63
63
  order_promotion = order.order_promotions.detect { |op| op.promotion_id == promotion.id }
64
- order_promotion.present? ? order_promotion.promotion_code : nil
64
+ order_promotion.presence&.promotion_code
65
65
  end
66
66
 
67
67
  def promotion_includes
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: solidus_legacy_promotions
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.6.1
4
+ version: 4.6.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Solidus Team
@@ -29,28 +29,28 @@ dependencies:
29
29
  requirements:
30
30
  - - '='
31
31
  - !ruby/object:Gem::Version
32
- version: 4.6.1
32
+ version: 4.6.2
33
33
  type: :runtime
34
34
  prerelease: false
35
35
  version_requirements: !ruby/object:Gem::Requirement
36
36
  requirements:
37
37
  - - '='
38
38
  - !ruby/object:Gem::Version
39
- version: 4.6.1
39
+ version: 4.6.2
40
40
  - !ruby/object:Gem::Dependency
41
41
  name: solidus_core
42
42
  requirement: !ruby/object:Gem::Requirement
43
43
  requirements:
44
44
  - - '='
45
45
  - !ruby/object:Gem::Version
46
- version: 4.6.1
46
+ version: 4.6.2
47
47
  type: :runtime
48
48
  prerelease: false
49
49
  version_requirements: !ruby/object:Gem::Requirement
50
50
  requirements:
51
51
  - - '='
52
52
  - !ruby/object:Gem::Version
53
- version: 4.6.1
53
+ version: 4.6.2
54
54
  - !ruby/object:Gem::Dependency
55
55
  name: solidus_support
56
56
  requirement: !ruby/object:Gem::Requirement
@@ -279,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
279
279
  - !ruby/object:Gem::Version
280
280
  version: 1.8.23
281
281
  requirements: []
282
- rubygems_version: 3.6.9
282
+ rubygems_version: 3.7.2
283
283
  specification_version: 4
284
284
  summary: Legacy Solidus promotion system
285
285
  test_files: []