spree_vpago 2.2.2.pre.pre37 → 2.2.2.pre.pre38
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 +4 -4
- data/Gemfile.lock +1 -1
- data/app/controllers/spree/admin/payment_payway_queriers_controller.rb +2 -10
- data/app/models/spree/gateway/payway_v2.rb +1 -1
- data/app/models/vpago/payment_decorator.rb +9 -0
- data/app/models/vpago/payouts_generator.rb +1 -1
- data/lib/spree_vpago/version.rb +1 -1
- data/lib/vpago/payway_v2/payment_request_updater.rb +1 -3
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6f928f176e0a9faa7c833f8a84357ef1b47b54e90317a746572e82990ec2fb70
|
|
4
|
+
data.tar.gz: 2575d2d9ed15e63f58efa5ab80efe48a82f21cadef0b42e0277d59b64adfe98e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1c783db7c54b8692924880f17c19e589e7b0ed097031fd93778e701364e5520c341e02ae1c2bf957ae4c014450d9411bfee35a14e73c27327ce6418e2d903c42
|
|
7
|
+
data.tar.gz: aa2a7c19225b123ef6e6c1dd1531cef9402fe67c7fbf04da3aa035ab54f46a5214501fbcbb4bf2393f84a602ba813fdf4cbe60910a1aa0937f126c9619a58572
|
data/Gemfile.lock
CHANGED
|
@@ -2,11 +2,11 @@ module Spree
|
|
|
2
2
|
module Admin
|
|
3
3
|
class PaymentPaywayQueriersController < PaymentPaywayBaseController
|
|
4
4
|
include Spree::Backend::Callbacks
|
|
5
|
+
|
|
5
6
|
around_action :set_writing_role, only: %i[show]
|
|
6
7
|
|
|
7
8
|
def show
|
|
8
|
-
tran_status =
|
|
9
|
-
tran_status.call
|
|
9
|
+
tran_status = @payment.payment_method.check_transaction(@payment)
|
|
10
10
|
|
|
11
11
|
if tran_status.success?
|
|
12
12
|
@payment.update_column(:gateway_status, true)
|
|
@@ -19,14 +19,6 @@ module Spree
|
|
|
19
19
|
redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
|
|
20
20
|
end
|
|
21
21
|
|
|
22
|
-
def transaction_status_service
|
|
23
|
-
if @payment.payment_method.type_payway_v2?
|
|
24
|
-
Vpago::PaywayV2::TransactionStatus
|
|
25
|
-
elsif @payment.payment_method.type_payway?
|
|
26
|
-
Vpago::Payway::TransactionStatus
|
|
27
|
-
end
|
|
28
|
-
end
|
|
29
|
-
|
|
30
22
|
private
|
|
31
23
|
|
|
32
24
|
def set_writing_role
|
|
@@ -159,7 +159,7 @@ module Spree
|
|
|
159
159
|
# ABA requires the use of the v2 API, but it does not yet support payout responses.
|
|
160
160
|
# Until v2 fully supports payouts, we fall back to v1 when payouts are enabled.
|
|
161
161
|
# Otherwise, we use v2 by default.
|
|
162
|
-
checker = if payment.
|
|
162
|
+
checker = if payment.preload_payout_ids.any?
|
|
163
163
|
Vpago::PaywayV2::TransactionStatus.new(payment)
|
|
164
164
|
else
|
|
165
165
|
Vpago::PaywayV2::TransactionStatusV2.new(payment)
|
|
@@ -33,6 +33,15 @@ module Vpago
|
|
|
33
33
|
end
|
|
34
34
|
end
|
|
35
35
|
|
|
36
|
+
def preload_payout_ids=(ids)
|
|
37
|
+
self.private_metadata ||= {}
|
|
38
|
+
self.private_metadata['preload_payout_ids'] = ids
|
|
39
|
+
end
|
|
40
|
+
|
|
41
|
+
def preload_payout_ids
|
|
42
|
+
self.private_metadata&.fetch('preload_payout_ids', []) || []
|
|
43
|
+
end
|
|
44
|
+
|
|
36
45
|
# override
|
|
37
46
|
def process!
|
|
38
47
|
reset_for_retry! if failed?
|
|
@@ -39,7 +39,7 @@ module Vpago
|
|
|
39
39
|
|
|
40
40
|
# If any payouts were rounded, the total may increase slightly.
|
|
41
41
|
# Update the payment amount to match the sum of payouts to avoid mismatch errors.
|
|
42
|
-
payment.update(amount: payouts.map(&:amount).sum)
|
|
42
|
+
payment.update(amount: payouts.map(&:amount).sum, preload_payout_ids: payouts.map(&:id))
|
|
43
43
|
|
|
44
44
|
payouts
|
|
45
45
|
end
|
data/lib/spree_vpago/version.rb
CHANGED