effective_orders 3.1.4 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95a8ee70cdfec1d0abf23bd3a3d983f9ac6d853a6e795464bcd77bae043799d4
-  data.tar.gz: 4465d2da717814cdb4de4ca1efc6d606c57e41e034dfe8299aedf9ea93ca1ed3
+  metadata.gz: 829b63c36f8fc5cff852f4d6c20c71b0e4da56dab9b48da0781342b34157ccf5
+  data.tar.gz: 987977d07b8add975f0b834354b3f21dc087efcc69e4cac6f011da6e7327521a
 SHA512:
-  metadata.gz: 738feb98567d85fc601d721e79ba2c06d223d69252287623cca17c4540c362b514bb535000980c3421f30e9c792b40514550eeee5c53a486efb8f02bc8c8054e
-  data.tar.gz: cca56bc31234719b1ddb3f61721e98ce2ceca177e48eeb812305b270222f8b9f4e5fbc54ac1c24b0fec7166b81b7f12371ee563ab2e36a804330cb933b17d9d6
+  metadata.gz: ae49e925c7282e59af58d78b034a9a720726df52b878b9ad6ac85d4f1dc8b7e627cf75b36b5fa9efbdc23591fbe1f71dbeca3ce1ab665d2d50eae6b21bd9e656
+  data.tar.gz: 3d0a6819d97f0f85432e4bec5627cb0fa8e46cfabc5458a78cdb0ea29d12aee6c938f5b7c3af5a5d1a53810e26be939a393678bcefaa5542109d4bc1f12aef72

data/app/datatables/effective_orders_datatable.rb

@@ -15,6 +15,13 @@ class EffectiveOrdersDatatable < Effective::Datatable
     )
   end
 
+  filters do
+    if admin_namespace?
+      filter :start_date, nil, as: :effective_date_picker
+      filter :end_date, nil, as: :effective_date_picker
+    end
+  end
+
   datatable do
     order :created_at, :desc
 
@@ -94,6 +101,14 @@ class EffectiveOrdersDatatable < Effective::Datatable
       scope = EffectiveOrders.orders_collection_scope.call(scope)
     end
 
+    if filters[:start_date].present?
+      scope = scope.where('created_at > ?', Time.zone.parse(filters[:start_date]).beginning_of_day)
+    end
+
+    if filters[:end_date].present?
+      scope = scope.where('created_at < ?', Time.zone.parse(filters[:end_date]).end_of_day)
+    end
+
     attributes[:user_id].present? ? scope.where(user_id: attributes[:user_id]) : scope
   end
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '3.1.4'.freeze
+  VERSION = '3.1.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-23 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails