effective_orders 6.1.4 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c1bf14140fc511842bc5dfbfd7f5ef1ad41ef96f027a44ecd6386822cee4978
-  data.tar.gz: 390d84968bf785bf8690b027812f9c8233cbf6393880b88114310f32a48718f4
+  metadata.gz: 2407ab44a43970dfb04a4f9d4c9b8bf089200b3d5db3ce06299cd009f1812507
+  data.tar.gz: 3f8d77b5e27af60e1ef37ab48edf2e8b49a82ebdc7df0232292f0d69ea2ec44b
 SHA512:
-  metadata.gz: f95f8037a92ece1208a9637676d2eec45e5a4ba15d593a1b22d6a9befc1323a30e96c96d70eed847a207583abfc6488cee444f74085ef3911aea4cbf8260b37a
-  data.tar.gz: 78f2caf56e27d306b7a242e6e3a84172a5fcaa01105a6d6516c4da1c8589cd74e7a0513ad4f45f3204461dba8dea39af92691332b2d021eb26821995722dd0d7
+  metadata.gz: e754e64033aca9541fd069244492ccb66f366c9b66c27d782171a92a23093dbf3e28568ea5acc87e7e02693bb26d5ce6f1f70a2b9809c6f0fe7114c4cca55d68
+  data.tar.gz: b562aac96357bfa2549bb828410cf6775a491e08adbe5ef94f983b1da58641ab9ae9eddb6a9c0c69c740fa7cc8816ef28b76d962588cd9b368cbcff2af557e49

data/README.md

@@ -364,11 +364,13 @@ In addition to the above, the following permissions allow access to the `/admin`
 can :admin, :effective_orders # Can access the admin screens
 
 can :index, :report_transactions
-can :index, :report_grouped_transactions
+can :index, :report_transactions_grouped_by_name
+can :index, :report_transactions_grouped_by_qb_name
 can :index, :report_payment_providers
 
 can :index, Admin::ReportTransactionsDatatable
-can :index, Admin::ReportGroupedTransactionsDatatable
+can :index, Admin::ReportTransactionsGroupedByNameDatatable
+can :index, Admin::ReportTransactionsGroupedByQbNameDatatable
 can :index, Admin::ReportPaymentProvidersDatatable
 ```
 

data/app/controllers/admin/order_reports_controller.rb

@@ -14,11 +14,20 @@ module Admin
       render 'index'
     end
 
-    def grouped_transactions
-      @page_title = 'Revenue: Grouped Transactions'
-      @datatable = Admin::ReportGroupedTransactionsDatatable.new
+    def transactions_grouped_by_name
+      @page_title = 'Revenue: Transactions Grouped By Name'
+      @datatable = Admin::ReportTransactionsGroupedByNameDatatable.new
 
-      authorize! :index, :report_grouped_transactions
+      authorize! :index, :report_transactions_grouped_by_name
+
+      render 'index'
+    end
+
+    def transactions_grouped_by_qb_name
+      @page_title = 'Revenue: Transactions Grouped By Quickbooks Name'
+      @datatable = Admin::ReportTransactionsGroupedByQbNameDatatable.new
+
+      authorize! :index, :report_transactions_grouped_by_qb_name
 
       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
 

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_grouped_transactions_datatable.rb → report_transactions_grouped_by_name_datatable.rb}

@@ -1,10 +1,9 @@
-# Revenue: Grouped Transactions
+# Revenue: Transactions Grouped By Name
 
 module Admin
-  class ReportGroupedTransactionsDatatable < Effective::Datatable
+  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

@@ -0,0 +1,73 @@
+# Revenue: Transactions Grouped By Name
+
+module Admin
+  class ReportTransactionsGroupedByQbNameDatatable < Effective::Datatable
+    filters do
+      filter_date_range :current_month
+    end
+
+    datatable do
+      length 250
+
+      col :qb_item_name
+      col :subtotal, as: :price
+      col :tax, as: :price
+      col :total, as: :price
+
+      payment_providers.each do |provider|
+        col(provider, as: :price)
+      end
+
+      col :orders_count
+
+      col :orders
+      col :users
+
+      col :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
+        date_range.end&.strftime('%F')
+      end
+
+      aggregate :total
+    end
+
+    collection do
+      start_date = date_range.begin&.strftime('%F')
+      end_date = date_range.end&.strftime('%F')
+
+      orders = Effective::Order.purchased.where(purchased_at: date_range).where('total != 0')
+      order_items = Effective::OrderItem.includes(:qb_order_item).where(order_id: orders).includes(:purchasable, order: :user)
+
+      items = order_items.group_by(&:qb_item_name).map do |name, items|
+        row = [
+          name,
+          items.sum { |item| item.subtotal }.to_i,
+          items.sum { |item| item.tax }.to_i,
+          items.sum { |item| item.total }.to_i,
+        ]
+
+        row += payment_providers.map do |payment_provider|
+          items.sum { |item| (item.order.payment_provider == payment_provider) ? item.total : 0 }.to_i
+        end
+
+        row += [
+          items.map(&:order_id).uniq.length,
+          items.map { |item| item.order },
+          items.map { |item| item.order.user },
+          start_date,
+          end_date
+        ]
+
+        row
+      end
+    end
+
+    def payment_providers
+      @payment_providers ||= EffectiveOrders.payment_providers - ['free', 'pretend']
+    end
+
+  end
+end

data/config/routes.rb

@@ -67,7 +67,8 @@ EffectiveOrders::Engine.routes.draw do
     resources :order_reports, only: [] do
       collection do
         get :transactions
-        get :grouped_transactions
+        get :transactions_grouped_by_name
+        get :transactions_grouped_by_qb_name
         get :payment_providers
       end
     end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.1.4'.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.4
+  version: 6.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -208,9 +208,10 @@ files:
 - app/controllers/effective/webhooks_controller.rb
 - app/datatables/admin/effective_customers_datatable.rb
 - app/datatables/admin/effective_orders_datatable.rb
-- app/datatables/admin/report_grouped_transactions_datatable.rb
 - app/datatables/admin/report_payment_providers_datatable.rb
 - app/datatables/admin/report_transactions_datatable.rb
+- app/datatables/admin/report_transactions_grouped_by_name_datatable.rb
+- app/datatables/admin/report_transactions_grouped_by_qb_name_datatable.rb
 - app/datatables/effective_orders_datatable.rb
 - app/helpers/effective_carts_helper.rb
 - app/helpers/effective_moneris_checkout_helper.rb