effective_orders 6.6.0 → 6.6.1
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1e85399d8a94ed81ae67ced9f120983d83a626cbd7bd0fe410610803f7b65e32
|
4
|
+
data.tar.gz: f903881c98703d5ac9e3d6a7f356b45b5b02280b0ad4dc6125de970d887d3e2a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8163a7d6cf97d35c85e1464fee0932d4e4159513c01d76e5d281598a52f67e2259455af9e35aeb46ee61fa97bd4908e7e440684e22165120906072f43f70bb40
|
7
|
+
data.tar.gz: 88f47fabff177758de90fb826424626af5496b14fc4a56e28e9a949a5477d68b8edba970c3413387aee4b50b09ccf84ec79b34cc1996482f3c8524ba44553299
|
@@ -44,7 +44,7 @@ module Admin
|
|
44
44
|
order.purchased_at&.strftime('%F %H:%M') || ('pending refund' if order.pending_refund?) || ("pending #{order.payment_provider}" if order.deferred?) || 'not purchased'
|
45
45
|
end
|
46
46
|
|
47
|
-
col :purchased_by, search: :string
|
47
|
+
col :purchased_by, search: :string, visible: EffectiveOrders.organization_enabled?
|
48
48
|
|
49
49
|
if attributes[:user_id].blank?
|
50
50
|
col :user, search: :string
|
@@ -17,6 +17,12 @@ module Admin
|
|
17
17
|
end
|
18
18
|
|
19
19
|
col :purchased_at
|
20
|
+
col :purchased_by, search: :string, visible: EffectiveOrders.organization_enabled?
|
21
|
+
|
22
|
+
if EffectiveOrders.organization_enabled?
|
23
|
+
col :organization
|
24
|
+
end
|
25
|
+
|
20
26
|
col :user
|
21
27
|
col :order_items
|
22
28
|
col :payment_provider, search: EffectiveOrders.payment_providers
|
@@ -49,10 +55,9 @@ module Admin
|
|
49
55
|
end
|
50
56
|
|
51
57
|
collection do
|
52
|
-
Effective::Order.purchased
|
58
|
+
Effective::Order.purchased.deep
|
53
59
|
.where(purchased_at: date_range)
|
54
60
|
.where('total != 0')
|
55
|
-
.includes(:user, [order_items: :purchasable])
|
56
61
|
end
|
57
62
|
end
|
58
63
|
end
|
@@ -29,7 +29,7 @@ class EffectiveOrdersDatatable < Effective::Datatable
|
|
29
29
|
order.purchased_at&.strftime('%F %H:%M') || 'not purchased'
|
30
30
|
end
|
31
31
|
|
32
|
-
col :purchased_by, search: :string
|
32
|
+
col :purchased_by, search: :string, visible: EffectiveOrders.organization_enabled?
|
33
33
|
end
|
34
34
|
|
35
35
|
if EffectiveOrders.billing_address
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: effective_orders
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 6.6.
|
4
|
+
version: 6.6.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Code and Effect
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-08-
|
11
|
+
date: 2023-08-02 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|