effective_orders 6.1.5 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0ca6d841db809f3d3779be1189022a110fc684aa5fb5af9ecd8cf46ea629b03
-  data.tar.gz: 3687c937ca7240acf02172d7ba239e3b53606d7bc90b61d29274e883458408aa
+  metadata.gz: ee5eb2878e3fa8291b4ea432ca80a7e52e2961f52b9d63ff235350922cc4388e
+  data.tar.gz: 27a85cedfbdb24ca8d6de87fac7655127960d320d5f09da77818b20fe1d9e29e
 SHA512:
-  metadata.gz: cefb88bdb77f53fd85905b7e41ac481da3e2b9f8c02fe207bf622f76a2eba83335f80b1d20fef6a8c264564f1bef54382ac46614ed4ab90d57ff7917f874c6e5
-  data.tar.gz: dbe3298d7e427ac041a9f42aa6d60d6a1894b07d6b4b66d855b6b02aee4c7ca3a7256dc7526d750bf6aabfcb80cd1d2a6b75e3c03cbd51395d69455ad278f91a
+  metadata.gz: 8dcb53a3bcb13831db8830265278e922129e9386c58050f337fdee2aefdd39fd551400b77698923141c401157ec2cc8f0a5718ec6f93f522e296eae809c953c6
+  data.tar.gz: 5118ee092b13b7d4de8a19e78662607e798d0c5c819fe5795a1db30c130acc37e9891ccb74af027d5a5461c782f5b795603f522bb9deac5aa29061fa5e040a98

data/app/controllers/admin/order_reports_controller.rb

@@ -6,37 +6,37 @@ module Admin
     include Effective::CrudController
 
     def transactions
-      @page_title = 'Revenue: Individual Transactions'
       @datatable = Admin::ReportTransactionsDatatable.new
+      @page_title = @datatable.datatable_name
 
-      authorize! :index, :report_transactions
+      authorize! :index, @datatable
 
       render 'index'
     end
 
     def transactions_grouped_by_name
-      @page_title = 'Revenue: Transactions Grouped By Name'
       @datatable = Admin::ReportTransactionsGroupedByNameDatatable.new
+      @page_title = @datatable.datatable_name
 
-      authorize! :index, :report_transactions_grouped_by_name
+      authorize! :index, @datatable
 
       render 'index'
     end
 
     def transactions_grouped_by_qb_name
-      @page_title = 'Revenue: Transactions Grouped By Quickbooks Name'
       @datatable = Admin::ReportTransactionsGroupedByQbNameDatatable.new
+      @page_title = @datatable.datatable_name
 
-      authorize! :index, :report_transactions_grouped_by_qb_name
+      authorize! :index, @datatable
 
       render 'index'
     end
 
     def payment_providers
-      @page_title = 'Revenue: Payment Providers'
       @datatable = Admin::ReportPaymentProvidersDatatable.new
+      @page_title = @datatable.datatable_name
 
-      authorize! :index, :report_payment_providers
+      authorize! :index, @datatable
 
       render 'index'
     end

data/app/datatables/admin/report_payment_providers_datatable.rb

@@ -3,8 +3,7 @@
 module Admin
   class ReportPaymentProvidersDatatable < Effective::Datatable
     filters do
-      filter :start_date, nil, as: :date
-      filter :end_date, nil, as: :date
+      filter_date_range :current_month
     end
 
     datatable do
@@ -16,11 +15,11 @@ module Admin
       col :returns, as: :price
       col :total, as: :price
 
-      col :start_date, as: :date, search: false, sort: false, visible: false do
+      col :filtered_start_date, as: :date, search: false, sort: false, visible: false do
         date_range.begin&.strftime('%F')
       end
 
-      col :end_date, as: :date, search: false, sort: false, visible: false do
+      col :filtered_end_date, as: :date, search: false, sort: false, visible: false do
         date_range.end&.strftime('%F')
       end
 
@@ -52,9 +51,5 @@ module Admin
       @payment_providers ||= EffectiveOrders.payment_providers - ['free', 'pretend']
     end
 
-    def date_range
-      @date_range ||= (filters[:start_date].presence)..(filters[:end_date].presence)
-    end
-
   end
 end

data/app/datatables/admin/report_transactions_datatable.rb

@@ -2,10 +2,8 @@
 
 module Admin
   class ReportTransactionsDatatable < Effective::Datatable
-
     filters do
-      filter :start_date, nil, as: :date
-      filter :end_date, nil, as: :date
+      filter_date_range :current_month
     end
 
     datatable do
@@ -35,11 +33,11 @@ module Admin
 
       col :total, as: :price
 
-      col :start_date, as: :date, search: false, sort: false, visible: false do
+      col :filtered_start_date, as: :date, search: false, sort: false, visible: false do
         date_range.begin&.strftime('%F')
       end
 
-      col :end_date, as: :date, search: false, sort: false, visible: false do
+      col :filtered_end_date, as: :date, search: false, sort: false, visible: false do
         date_range.end&.strftime('%F')
       end
 
@@ -54,10 +52,5 @@ module Admin
         .where('total != 0')
         .includes(:user, [order_items: :purchasable])
     end
-
-    def date_range
-      @date_range ||= (filters[:start_date].presence)..(filters[:end_date].presence)
-    end
-
   end
 end

data/app/datatables/admin/report_transactions_grouped_by_name_datatable.rb

@@ -3,8 +3,7 @@
 module Admin
   class ReportTransactionsGroupedByNameDatatable < Effective::Datatable
     filters do
-      filter :start_date, nil, as: :date
-      filter :end_date, nil, as: :date
+      filter_date_range :current_month
     end
 
     datatable do
@@ -24,11 +23,11 @@ module Admin
       col :orders
       col :users
 
-      col :start_date, as: :date, search: false, sort: false, visible: false do
+      col :filtered_start_date, as: :date, search: false, sort: false, visible: false do
         date_range.begin&.strftime('%F')
       end
 
-      col :end_date, as: :date, search: false, sort: false, visible: false do
+      col :filtered_end_date, as: :date, search: false, sort: false, visible: false do
         date_range.end&.strftime('%F')
       end
 
@@ -70,9 +69,5 @@ module Admin
       @payment_providers ||= EffectiveOrders.payment_providers - ['free', 'pretend']
     end
 
-    def date_range
-      @date_range ||= (filters[:start_date].presence)..(filters[:end_date].presence)
-    end
-
   end
 end

data/app/datatables/admin/report_transactions_grouped_by_qb_name_datatable.rb

@@ -3,8 +3,7 @@
 module Admin
   class ReportTransactionsGroupedByQbNameDatatable < Effective::Datatable
     filters do
-      filter :start_date, nil, as: :date
-      filter :end_date, nil, as: :date
+      filter_date_range :current_month
     end
 
     datatable do
@@ -70,9 +69,5 @@ module Admin
       @payment_providers ||= EffectiveOrders.payment_providers - ['free', 'pretend']
     end
 
-    def date_range
-      @date_range ||= (filters[:start_date].presence)..(filters[:end_date].presence)
-    end
-
   end
 end

data/config/locales/effective_orders.en.yml

@@ -0,0 +1,10 @@
+en:
+  effective_orders:
+    name: 'Effective Orders'
+    acronym: 'Finance'
+
+  datatables:
+    admin/report_transactions_datatable: 'Individual Transactions'
+    admin/report_transactions_grouped_by_name_datatable: 'Transactions Grouped By Name'
+    admin/report_transactions_grouped_by_qb_name_datatable: 'Transactions Grouped By Quickbooks Name'
+    admin/report_payment_providers_datatable: 'Payment Providers'

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.1.5'.freeze
+  VERSION = '6.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.1.5
+  version: 6.2.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2023-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -315,6 +315,7 @@ files:
 - app/views/effective/subscripter/_plan.html.haml
 - app/views/layouts/effective_orders_mailer_layout.html.haml
 - config/effective_orders.rb
+- config/locales/effective_orders.en.yml
 - config/routes.rb
 - db/migrate/01_create_effective_orders.rb.erb
 - lib/effective_orders.rb