spree_vpago 2.3.1 → 2.3.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a33d7a179146a9146e5848fd9bd49fdac6b615d64d80c5dc7f995d65b548b509
4
- data.tar.gz: 5dba531f67a1d10ba3d4348c4cc24d61c2832f96027ed437516b479187399e50
3
+ metadata.gz: 40b1b2417da2209fc3545dc75fb99354e9fd009adc565d3c4d920b59f18c4655
4
+ data.tar.gz: dbb1754379d9378dcbfb9fb1d225b7c73628475ae1155e1ad5b198df1e323535
5
5
  SHA512:
6
- metadata.gz: c1ec37dcce467ad99d371e73469311ef51b82f772edcb1fb909658f9d81cc11fd415cb3c8c11408136d859ecd1512598625d2a732f998b3fa766f44c8bb6c4f2
7
- data.tar.gz: 6c0ae9f4f51f08404302e46a657c3cd59c29ece5c2d185d0e7315240bc48fd8323bbf77a0896188942751b6a4175f93634e519cb49ef8dd7dafee5daee2c5067
6
+ metadata.gz: 007761d54598f02ee411f16962eec6ad167eb5eb4623f11f27c8e278e05b2fbc023f71ef4ed3e8eb723870692d83d25155f3fffd85d9fd7880057a9fa1ba2791
7
+ data.tar.gz: a5ddf6866c3905d6b12224388e9a1b91ad3b19dbdd7fa6dfd936b23227081d8910820795678fac206a7384066e479ae851a23f75dd035abd62abcf47d9e25446
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- spree_vpago (2.3.1)
4
+ spree_vpago (2.3.2)
5
5
  faraday
6
6
  google-cloud-firestore
7
7
  spree_api (>= 4.5)
@@ -1,11 +1,12 @@
1
1
  module Vpago
2
2
  module OrderDecorator
3
3
  extend Spree::DisplayMoney
4
+
4
5
  money_methods :order_adjustment_total, :shipping_discount
5
6
 
6
7
  def self.prepended(base)
7
8
  base.has_many :payouts, class_name: 'Spree::Payout', through: :payments
8
- base.has_many :vendor_payment_methods, -> { unscope(:order).distinct },
9
+ base.has_many :vendor_payment_methods, -> { where(spree_payment_methods: { deleted_at: nil }).reorder(nil).distinct },
9
10
  class_name: 'Spree::PaymentMethod',
10
11
  through: :line_items
11
12
 
@@ -51,19 +52,29 @@ module Vpago
51
52
 
52
53
  # override
53
54
  def available_payment_methods(store = nil)
54
- payment_methods = if respond_to?(:tenant) && tenant.present?
55
- tenant_payment_methods
56
- elsif vendor_payment_methods.any?
57
- vendor_payment_methods
58
- else
59
- collect_payment_methods(store)
60
- end
61
-
62
- @available_payment_methods ||= if required_payway_payout?
63
- payment_methods.select(&:support_payout?)
64
- else
65
- payment_methods
66
- end
55
+ @available_payment_methods ||= begin
56
+ payment_methods = if respond_to?(:tenant) && tenant.present?
57
+ tenant_payment_methods
58
+ elsif vendor_payment_methods.any?
59
+ vendor_payment_methods
60
+ else
61
+ store ||= self.store
62
+ store.payment_methods
63
+ end
64
+
65
+ payment_methods = if early_adopter?
66
+ payment_methods.available_on_frontend_for_early_adopter.select { |pm| pm.available_for_order?(self) }
67
+ else
68
+ payment_methods.available_on_front_end.select { |pm| pm.available_for_order?(self) }
69
+ end
70
+
71
+ payment_methods = payment_methods.select(&:support_payout?) if required_payway_payout?
72
+ payment_methods
73
+ end
74
+ end
75
+
76
+ def early_adopter?
77
+ user.present? && user.respond_to?(:early_adopter?) && user.early_adopter?
67
78
  end
68
79
 
69
80
  def tenant_payment_methods
@@ -1,7 +1,7 @@
1
1
  module SpreeVpago
2
2
  module_function
3
3
 
4
- VERSION = '2.3.1'.freeze
4
+ VERSION = '2.3.2'.freeze
5
5
 
6
6
  def version
7
7
  Gem::Version.new VERSION
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_vpago
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.1
4
+ version: 2.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - You
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2026-03-25 00:00:00.000000000 Z
11
+ date: 2026-05-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday