spree_vpago 2.4.1 → 2.4.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 +4 -4
- data/Gemfile.lock +1 -1
- data/app/controllers/spree/admin/suspicious_orders_controller.rb +10 -1
- data/lib/spree_vpago/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: af2ee300102ba9c6ca000d69c338ec7b2775d6b367dd0b38ea7c9ae65ccb47f1
|
|
4
|
+
data.tar.gz: f28c459ecab0f6ec6053342a525ad8b4d525ae840aa6a8fb902ddee246edec98
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d468af9361fc9c5055d3523e23df57d24a55d62a14cfc2f3d769e59817c92cff9233f70cd54e49c2d618ebe6ee165205c39278afaaf7c43490a1db9fef4656e1
|
|
7
|
+
data.tar.gz: 3bb37aade93a26049c3aba23a230fc5f337dea599418690583ea774f0c9a0f26b55041ef1414745dc5c3b5c63f97cc78525ce64bf35ef1a8a2721093137d020b
|
data/Gemfile.lock
CHANGED
|
@@ -6,7 +6,7 @@ module Spree
|
|
|
6
6
|
def index
|
|
7
7
|
params[:q] = { completed_at_not_null: 1, payment_state_eq: 'balance_due', s: 'completed_at desc' }.dup if params[:q].blank?
|
|
8
8
|
|
|
9
|
-
@search = scope.ransack(params[:q])
|
|
9
|
+
@search = exclude_request_bookings(scope).ransack(params[:q])
|
|
10
10
|
@orders = @search.result(distinct: true)
|
|
11
11
|
.preload(:payments, :reimbursements)
|
|
12
12
|
.page(params[:page])
|
|
@@ -59,6 +59,15 @@ module Spree
|
|
|
59
59
|
def scope
|
|
60
60
|
current_store.orders.accessible_by(current_ability, :index)
|
|
61
61
|
end
|
|
62
|
+
|
|
63
|
+
# Request bookings complete before the vendor confirms and the customer
|
|
64
|
+
# pays, so balance_due is expected there rather than a lost payment.
|
|
65
|
+
# `request_state` is added by spree_cm_commissioner, hence the column check.
|
|
66
|
+
def exclude_request_bookings(orders)
|
|
67
|
+
return orders unless Spree::Order.column_names.include?('request_state')
|
|
68
|
+
|
|
69
|
+
orders.where(request_state: nil)
|
|
70
|
+
end
|
|
62
71
|
end
|
|
63
72
|
end
|
|
64
73
|
end
|
data/lib/spree_vpago/version.rb
CHANGED
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.4.
|
|
4
|
+
version: 2.4.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-10-
|
|
11
|
+
date: 2026-10-26 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: faraday
|