effective_orders 6.1.5 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0ca6d841db809f3d3779be1189022a110fc684aa5fb5af9ecd8cf46ea629b03
-  data.tar.gz: 3687c937ca7240acf02172d7ba239e3b53606d7bc90b61d29274e883458408aa
+  metadata.gz: 2407ab44a43970dfb04a4f9d4c9b8bf089200b3d5db3ce06299cd009f1812507
+  data.tar.gz: 3f8d77b5e27af60e1ef37ab48edf2e8b49a82ebdc7df0232292f0d69ea2ec44b
 SHA512:
-  metadata.gz: cefb88bdb77f53fd85905b7e41ac481da3e2b9f8c02fe207bf622f76a2eba83335f80b1d20fef6a8c264564f1bef54382ac46614ed4ab90d57ff7917f874c6e5
-  data.tar.gz: dbe3298d7e427ac041a9f42aa6d60d6a1894b07d6b4b66d855b6b02aee4c7ca3a7256dc7526d750bf6aabfcb80cd1d2a6b75e3c03cbd51395d69455ad278f91a
+  metadata.gz: e754e64033aca9541fd069244492ccb66f366c9b66c27d782171a92a23093dbf3e28568ea5acc87e7e02693bb26d5ce6f1f70a2b9809c6f0fe7114c4cca55d68
+  data.tar.gz: b562aac96357bfa2549bb828410cf6775a491e08adbe5ef94f983b1da58641ab9ae9eddb6a9c0c69c740fa7cc8816ef28b76d962588cd9b368cbcff2af557e49

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
 

data/app/datatables/admin/report_transactions_datatable.rb

@@ -4,8 +4,7 @@ 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 +34,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 +53,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/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.1.5'.freeze
+  VERSION = '6.2.0'.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.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails