effective_orders 6.1.5 → 6.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/datatables/admin/report_payment_providers_datatable.rb +3 -4
- data/app/datatables/admin/report_transactions_datatable.rb +3 -9
- data/app/datatables/admin/report_transactions_grouped_by_name_datatable.rb +3 -8
- data/app/datatables/admin/report_transactions_grouped_by_qb_name_datatable.rb +1 -6
- 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: 2407ab44a43970dfb04a4f9d4c9b8bf089200b3d5db3ce06299cd009f1812507
|
4
|
+
data.tar.gz: 3f8d77b5e27af60e1ef37ab48edf2e8b49a82ebdc7df0232292f0d69ea2ec44b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e754e64033aca9541fd069244492ccb66f366c9b66c27d782171a92a23093dbf3e28568ea5acc87e7e02693bb26d5ce6f1f70a2b9809c6f0fe7114c4cca55d68
|
7
|
+
data.tar.gz: b562aac96357bfa2549bb828410cf6775a491e08adbe5ef94f983b1da58641ab9ae9eddb6a9c0c69c740fa7cc8816ef28b76d962588cd9b368cbcff2af557e49
|
@@ -3,8 +3,7 @@
|
|
3
3
|
module Admin
|
4
4
|
class ReportPaymentProvidersDatatable < Effective::Datatable
|
5
5
|
filters do
|
6
|
-
|
7
|
-
filter :end_date, nil, as: :date
|
6
|
+
filter_date_range :current_month
|
8
7
|
end
|
9
8
|
|
10
9
|
datatable do
|
@@ -16,11 +15,11 @@ module Admin
|
|
16
15
|
col :returns, as: :price
|
17
16
|
col :total, as: :price
|
18
17
|
|
19
|
-
col :
|
18
|
+
col :filtered_start_date, as: :date, search: false, sort: false, visible: false do
|
20
19
|
date_range.begin&.strftime('%F')
|
21
20
|
end
|
22
21
|
|
23
|
-
col :
|
22
|
+
col :filtered_end_date, as: :date, search: false, sort: false, visible: false do
|
24
23
|
date_range.end&.strftime('%F')
|
25
24
|
end
|
26
25
|
|
@@ -4,8 +4,7 @@ module Admin
|
|
4
4
|
class ReportTransactionsDatatable < Effective::Datatable
|
5
5
|
|
6
6
|
filters do
|
7
|
-
|
8
|
-
filter :end_date, nil, as: :date
|
7
|
+
filter_date_range :current_month
|
9
8
|
end
|
10
9
|
|
11
10
|
datatable do
|
@@ -35,11 +34,11 @@ module Admin
|
|
35
34
|
|
36
35
|
col :total, as: :price
|
37
36
|
|
38
|
-
col :
|
37
|
+
col :filtered_start_date, as: :date, search: false, sort: false, visible: false do
|
39
38
|
date_range.begin&.strftime('%F')
|
40
39
|
end
|
41
40
|
|
42
|
-
col :
|
41
|
+
col :filtered_end_date, as: :date, search: false, sort: false, visible: false do
|
43
42
|
date_range.end&.strftime('%F')
|
44
43
|
end
|
45
44
|
|
@@ -54,10 +53,5 @@ module Admin
|
|
54
53
|
.where('total != 0')
|
55
54
|
.includes(:user, [order_items: :purchasable])
|
56
55
|
end
|
57
|
-
|
58
|
-
def date_range
|
59
|
-
@date_range ||= (filters[:start_date].presence)..(filters[:end_date].presence)
|
60
|
-
end
|
61
|
-
|
62
56
|
end
|
63
57
|
end
|
@@ -3,8 +3,7 @@
|
|
3
3
|
module Admin
|
4
4
|
class ReportTransactionsGroupedByNameDatatable < Effective::Datatable
|
5
5
|
filters do
|
6
|
-
|
7
|
-
filter :end_date, nil, as: :date
|
6
|
+
filter_date_range :current_month
|
8
7
|
end
|
9
8
|
|
10
9
|
datatable do
|
@@ -24,11 +23,11 @@ module Admin
|
|
24
23
|
col :orders
|
25
24
|
col :users
|
26
25
|
|
27
|
-
col :
|
26
|
+
col :filtered_start_date, as: :date, search: false, sort: false, visible: false do
|
28
27
|
date_range.begin&.strftime('%F')
|
29
28
|
end
|
30
29
|
|
31
|
-
col :
|
30
|
+
col :filtered_end_date, as: :date, search: false, sort: false, visible: false do
|
32
31
|
date_range.end&.strftime('%F')
|
33
32
|
end
|
34
33
|
|
@@ -70,9 +69,5 @@ module Admin
|
|
70
69
|
@payment_providers ||= EffectiveOrders.payment_providers - ['free', 'pretend']
|
71
70
|
end
|
72
71
|
|
73
|
-
def date_range
|
74
|
-
@date_range ||= (filters[:start_date].presence)..(filters[:end_date].presence)
|
75
|
-
end
|
76
|
-
|
77
72
|
end
|
78
73
|
end
|
@@ -3,8 +3,7 @@
|
|
3
3
|
module Admin
|
4
4
|
class ReportTransactionsGroupedByQbNameDatatable < Effective::Datatable
|
5
5
|
filters do
|
6
|
-
|
7
|
-
filter :end_date, nil, as: :date
|
6
|
+
filter_date_range :current_month
|
8
7
|
end
|
9
8
|
|
10
9
|
datatable do
|
@@ -70,9 +69,5 @@ module Admin
|
|
70
69
|
@payment_providers ||= EffectiveOrders.payment_providers - ['free', 'pretend']
|
71
70
|
end
|
72
71
|
|
73
|
-
def date_range
|
74
|
-
@date_range ||= (filters[:start_date].presence)..(filters[:end_date].presence)
|
75
|
-
end
|
76
|
-
|
77
72
|
end
|
78
73
|
end
|
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.
|
4
|
+
version: 6.2.0
|
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-
|
11
|
+
date: 2023-03-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|