spree_reports 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea4e4aa3207d724ba43f7a4925af008fb1ea287c
-  data.tar.gz: b00ba569b7311c6c35804c17ec46bdf27a3614cc
+  metadata.gz: 22cef88a7f4eca1368ead4f4841f43654b3daf72
+  data.tar.gz: 2a0568f18fcec38bea9bead64da6f7eef2802390
 SHA512:
-  metadata.gz: 78f54ea040871d823064b14717b6c41bc4794d51f666a28c5c29c231374c58fe28489ebb14432dd89c232545593678fdfc09a2cfe95dc03253c51267ac317af4
-  data.tar.gz: 1a8e4a309263ad6ee1212677953e2fa42dffa566a30d9ad35fd7ee53bf2c12f869438a6713394c44d89ca6e8ef66073d45220ec6ee0177b655a1e891faed8f9b
+  metadata.gz: 0114714084f66f721354460546ff696c2d9bc2103aa6b0e83d5a16b928c2d54ce44cf310f02fbe7375bd54ae86a87e9e3942a91ed11a763355e651ecfa3e56bc
+  data.tar.gz: 4332bcdfc638a420e72954ba5ddd6c75d90931f5fde1658af0fbac9b7df1b8745df8d8cb19f8aa943c9332718f024b9b97599a722a9edee1171336f52cd77699

data/lib/spree_reports.rb

@@ -28,6 +28,12 @@ module SpreeReports
   
   # date formats for different group_by settings
   mattr_accessor :date_formats
+  
+  # these user roles are exluded from all reports
+  mattr_accessor :excluded_roles
+  
+  # these user accounts are exluded from all reports
+  mattr_accessor :excluded_users
    
 end
 
@@ -51,4 +57,6 @@ SpreeReports.date_formats = {
   month: "%m.%Y",
   week: "%W/%Y",
   day: "%m.%d.%y"
-}
+}
+SpreeReports.excluded_roles = %w{admin}
+SpreeReports.excluded_users = []

data/lib/spree_reports/reports/base.rb

@@ -0,0 +1,25 @@
+module SpreeReports
+  module Reports
+    class Base
+      
+      def excluded_user_ids
+        users = []
+
+        if SpreeReports.excluded_roles && SpreeReports.excluded_roles.any?
+          users += Spree::User.joins(:spree_roles).where("spree_roles.name": SpreeReports.excluded_roles).pluck(:id)
+        end
+
+        if SpreeReports.excluded_users && SpreeReports.excluded_users.any?
+          users += Spree::User.where(email: SpreeReports.excluded_users).pluck(:id)
+        end
+        
+        users.uniq
+      end
+      
+    end
+  end
+end
+
+
+
+

data/lib/spree_reports/reports/orders_by_period.rb

@@ -1,6 +1,6 @@
 module SpreeReports
   module Reports
-    class OrdersByPeriod
+    class OrdersByPeriod < SpreeReports::Reports::Base
       
       attr_accessor :params, :data
       attr_accessor :currencies, :currency, :stores, :store, :group_by_list, :group_by, :states, :state, :months, :date_start
@@ -72,6 +72,11 @@ module SpreeReports
         @sales = @sales.where(currency: @currency) if @currencies.size > 1
         @sales = @sales.where(store_id: @store) if @stores.size > 2 && @store != "all"
         
+        if excluded_user_ids.any?
+          excluded_sales = Spree::Order.where(user_id: excluded_user_ids).pluck(:id)
+          @sales = @sales.where.not(id: excluded_sales) if excluded_sales.any?  
+        end
+        
         # group by
 
         if @group_by == :year

data/lib/spree_reports/version.rb

@@ -1,3 +1,3 @@
 module SpreeReports
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_reports
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mike Lieser
@@ -71,6 +71,7 @@ files:
 - lib/spree_reports.rb
 - lib/spree_reports/engine.rb
 - lib/spree_reports/helper.rb
+- lib/spree_reports/reports/base.rb
 - lib/spree_reports/reports/orders_by_period.rb
 - lib/spree_reports/version.rb
 - lib/tasks/spree_reports_tasks.rake