effective_orders 6.2.0 → 6.2.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.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/admin/order_reports_controller.rb +8 -8
  3. data/app/datatables/admin/report_payment_providers_datatable.rb +0 -4
  4. data/app/datatables/admin/report_transactions_datatable.rb +0 -1
  5. data/config/locales/effective_orders.en.yml +10 -0
  6. data/lib/effective_orders/version.rb +1 -1
  7. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2407ab44a43970dfb04a4f9d4c9b8bf089200b3d5db3ce06299cd009f1812507
4
- data.tar.gz: 3f8d77b5e27af60e1ef37ab48edf2e8b49a82ebdc7df0232292f0d69ea2ec44b
3
+ metadata.gz: ee5eb2878e3fa8291b4ea432ca80a7e52e2961f52b9d63ff235350922cc4388e
4
+ data.tar.gz: 27a85cedfbdb24ca8d6de87fac7655127960d320d5f09da77818b20fe1d9e29e
5
5
  SHA512:
6
- metadata.gz: e754e64033aca9541fd069244492ccb66f366c9b66c27d782171a92a23093dbf3e28568ea5acc87e7e02693bb26d5ce6f1f70a2b9809c6f0fe7114c4cca55d68
7
- data.tar.gz: b562aac96357bfa2549bb828410cf6775a491e08adbe5ef94f983b1da58641ab9ae9eddb6a9c0c69c740fa7cc8816ef28b76d962588cd9b368cbcff2af557e49
6
+ metadata.gz: 8dcb53a3bcb13831db8830265278e922129e9386c58050f337fdee2aefdd39fd551400b77698923141c401157ec2cc8f0a5718ec6f93f522e296eae809c953c6
7
+ data.tar.gz: 5118ee092b13b7d4de8a19e78662607e798d0c5c819fe5795a1db30c130acc37e9891ccb74af027d5a5461c782f5b795603f522bb9deac5aa29061fa5e040a98
data/app/controllers/admin/order_reports_controller.rb CHANGED
@@ -6,37 +6,37 @@ module Admin
6
6
  include Effective::CrudController
7
7
 
8
8
  def transactions
9
- @page_title = 'Revenue: Individual Transactions'
10
9
  @datatable = Admin::ReportTransactionsDatatable.new
10
+ @page_title = @datatable.datatable_name
11
11
 
12
- authorize! :index, :report_transactions
12
+ authorize! :index, @datatable
13
13
 
14
14
  render 'index'
15
15
  end
16
16
 
17
17
  def transactions_grouped_by_name
18
- @page_title = 'Revenue: Transactions Grouped By Name'
19
18
  @datatable = Admin::ReportTransactionsGroupedByNameDatatable.new
19
+ @page_title = @datatable.datatable_name
20
20
 
21
- authorize! :index, :report_transactions_grouped_by_name
21
+ authorize! :index, @datatable
22
22
 
23
23
  render 'index'
24
24
  end
25
25
 
26
26
  def transactions_grouped_by_qb_name
27
- @page_title = 'Revenue: Transactions Grouped By Quickbooks Name'
28
27
  @datatable = Admin::ReportTransactionsGroupedByQbNameDatatable.new
28
+ @page_title = @datatable.datatable_name
29
29
 
30
- authorize! :index, :report_transactions_grouped_by_qb_name
30
+ authorize! :index, @datatable
31
31
 
32
32
  render 'index'
33
33
  end
34
34
 
35
35
  def payment_providers
36
- @page_title = 'Revenue: Payment Providers'
37
36
  @datatable = Admin::ReportPaymentProvidersDatatable.new
37
+ @page_title = @datatable.datatable_name
38
38
 
39
- authorize! :index, :report_payment_providers
39
+ authorize! :index, @datatable
40
40
 
41
41
  render 'index'
42
42
  end
data/app/datatables/admin/report_payment_providers_datatable.rb CHANGED
@@ -51,9 +51,5 @@ module Admin
51
51
  @payment_providers ||= EffectiveOrders.payment_providers - ['free', 'pretend']
52
52
  end
53
53
 
54
- def date_range
55
- @date_range ||= (filters[:start_date].presence)..(filters[:end_date].presence)
56
- end
57
-
58
54
  end
59
55
  end
data/app/datatables/admin/report_transactions_datatable.rb CHANGED
@@ -2,7 +2,6 @@
2
2
 
3
3
  module Admin
4
4
  class ReportTransactionsDatatable < Effective::Datatable
5
-
6
5
  filters do
7
6
  filter_date_range :current_month
8
7
  end
data/config/locales/effective_orders.en.yml ADDED
@@ -0,0 +1,10 @@
1
+ en:
2
+ effective_orders:
3
+ name: 'Effective Orders'
4
+ acronym: 'Finance'
5
+
6
+ datatables:
7
+ admin/report_transactions_datatable: 'Individual Transactions'
8
+ admin/report_transactions_grouped_by_name_datatable: 'Transactions Grouped By Name'
9
+ admin/report_transactions_grouped_by_qb_name_datatable: 'Transactions Grouped By Quickbooks Name'
10
+ admin/report_payment_providers_datatable: 'Payment Providers'
data/lib/effective_orders/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EffectiveOrders
2
- VERSION = '6.2.0'.freeze
2
+ VERSION = '6.2.1'.freeze
3
3
  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.2.0
4
+ version: 6.2.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-03-08 00:00:00.000000000 Z
11
+ date: 2023-03-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -315,6 +315,7 @@ files:
315
315
  - app/views/effective/subscripter/_plan.html.haml
316
316
  - app/views/layouts/effective_orders_mailer_layout.html.haml
317
317
  - config/effective_orders.rb
318
+ - config/locales/effective_orders.en.yml
318
319
  - config/routes.rb
319
320
  - db/migrate/01_create_effective_orders.rb.erb
320
321
  - lib/effective_orders.rb