effective_orders 6.23.0 → 6.23.1
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/app/datatables/admin/effective_customers_datatable.rb +1 -1
- data/app/datatables/admin/effective_orders_datatable.rb +5 -5
- data/app/datatables/admin/report_transactions_datatable.rb +1 -1
- data/app/datatables/effective_orders_datatable.rb +5 -5
- data/lib/effective_orders/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: aacbf648e88be000dccd67b2eaf3b5f659f58ce5d04238cc2ce06cf38abb496f
|
4
|
+
data.tar.gz: 88fe0446cc0a7788a199e63020db3605cd165b407836e51e963fafcb8ea4ab64
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 18343e5fbc7c8d6462f40800078f02228afa29a983f1bab6ed5e6ce4c1b7ac7c824a60e30fdd93a9c0767dc1e9960b049fdfa3e9b22dc37925f7d6d7c20b14ba
|
7
|
+
data.tar.gz: 461cb7c6788cff12420017d6d1f4c0358f41131bc76500f92408b75e309a671c8e5baa0e221708a21a1843c4b4df859cc33a213316b5bcf2fbb5c29b7512387f
|
@@ -47,14 +47,14 @@ module Admin
|
|
47
47
|
order.purchased_at&.strftime('%F %H:%M') || ('pending refund' if order.pending_refund?) || ("pending #{order.payment_provider}" if order.deferred?) || 'not purchased'
|
48
48
|
end
|
49
49
|
|
50
|
-
col :purchased_by,
|
50
|
+
col :purchased_by, visible: EffectiveOrders.organization_enabled?
|
51
51
|
|
52
52
|
if attributes[:user_id].blank?
|
53
|
-
col :user,
|
53
|
+
col :user, visible: !EffectiveOrders.organization_enabled?
|
54
54
|
end
|
55
55
|
|
56
56
|
if attributes[:organization_id].blank?
|
57
|
-
col :organization,
|
57
|
+
col :organization, visible: EffectiveOrders.organization_enabled?
|
58
58
|
end
|
59
59
|
|
60
60
|
if defined?(EffectiveMemberships)
|
@@ -70,7 +70,7 @@ module Admin
|
|
70
70
|
col :billing_name, visible: false
|
71
71
|
col :email, visible: false
|
72
72
|
|
73
|
-
col :parent, visible: false
|
73
|
+
col :parent, visible: false
|
74
74
|
|
75
75
|
col :cc, visible: false
|
76
76
|
|
@@ -82,7 +82,7 @@ module Admin
|
|
82
82
|
col :shipping_address, visible: false
|
83
83
|
end
|
84
84
|
|
85
|
-
col(:order_items
|
85
|
+
col(:order_items).search do |collection, term|
|
86
86
|
collection.where(id: Effective::OrderItem.where('name ILIKE ?', "%#{term}%").select('order_id'))
|
87
87
|
end
|
88
88
|
|
@@ -17,7 +17,7 @@ module Admin
|
|
17
17
|
end
|
18
18
|
|
19
19
|
col :purchased_at
|
20
|
-
col :purchased_by,
|
20
|
+
col :purchased_by, visible: EffectiveOrders.organization_enabled?
|
21
21
|
|
22
22
|
if EffectiveOrders.organization_enabled?
|
23
23
|
col :organization
|
@@ -22,9 +22,9 @@ class EffectiveOrdersDatatable < Effective::Datatable
|
|
22
22
|
'#' + order.to_param
|
23
23
|
end
|
24
24
|
|
25
|
-
col :parent, visible: false
|
26
|
-
col :user, visible: false
|
27
|
-
col :organization,
|
25
|
+
col :parent, visible: false
|
26
|
+
col :user, visible: false
|
27
|
+
col :organization, visible: false
|
28
28
|
|
29
29
|
col :status
|
30
30
|
|
@@ -33,7 +33,7 @@ class EffectiveOrdersDatatable < Effective::Datatable
|
|
33
33
|
order.purchased_at&.strftime('%F %H:%M') || 'not purchased'
|
34
34
|
end
|
35
35
|
|
36
|
-
col :purchased_by,
|
36
|
+
col :purchased_by, visible: EffectiveOrders.organization_enabled?
|
37
37
|
end
|
38
38
|
|
39
39
|
if EffectiveOrders.billing_address
|
@@ -44,7 +44,7 @@ class EffectiveOrdersDatatable < Effective::Datatable
|
|
44
44
|
col :shipping_address, visible: false
|
45
45
|
end
|
46
46
|
|
47
|
-
col(:order_items
|
47
|
+
col(:order_items).search do |collection, term|
|
48
48
|
collection.where(id: Effective::OrderItem.where('name ILIKE ?', "%#{term}%").select('order_id'))
|
49
49
|
end
|
50
50
|
|
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.23.
|
4
|
+
version: 6.23.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: 2025-
|
11
|
+
date: 2025-04-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|