effective_orders 6.1.3 → 6.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d89c7eaee9322884706dfaacae71335ca4b8284b06ab69459194cb09b523eb53
-  data.tar.gz: 2c667a68c9e3e68fe764cd3386495698d55c8c86c7d213ce5691e0a35f37821c
+  metadata.gz: a0ca6d841db809f3d3779be1189022a110fc684aa5fb5af9ecd8cf46ea629b03
+  data.tar.gz: 3687c937ca7240acf02172d7ba239e3b53606d7bc90b61d29274e883458408aa
 SHA512:
-  metadata.gz: cadaa028284a3ee34b1cdfefe2165722cec9edd5307771d8c2e7c5f5fa5afff5ccbd3926d0c6a535369b163dd3987eb4be4afef1572aafd5c6367268cb7e9591
-  data.tar.gz: c5cc2bee6db200d5ba490a61f987b5d00df5c7e7bc78c1bf7bfabb11e536ff2899c4fe1c8be3fef886fb62cfff266aa29b8164a0c3e864b8fa4800437e9ce923
+  metadata.gz: cefb88bdb77f53fd85905b7e41ac481da3e2b9f8c02fe207bf622f76a2eba83335f80b1d20fef6a8c264564f1bef54382ac46614ed4ab90d57ff7917f874c6e5
+  data.tar.gz: dbe3298d7e427ac041a9f42aa6d60d6a1894b07d6b4b66d855b6b02aee4c7ca3a7256dc7526d750bf6aabfcb80cd1d2a6b75e3c03cbd51395d69455ad278f91a

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

@@ -1,7 +1,7 @@
-# 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

data/app/datatables/admin/report_transactions_grouped_by_qb_name_datatable.rb

@@ -0,0 +1,78 @@
+# Revenue: Transactions Grouped By Name
+
+module Admin
+  class ReportTransactionsGroupedByQbNameDatatable < Effective::Datatable
+    filters do
+      filter :start_date, nil, as: :date
+      filter :end_date, nil, as: :date
+    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
+
+    def date_range
+      @date_range ||= (filters[:start_date].presence)..(filters[:end_date].presence)
+    end
+
+  end
+end

data/app/models/effective/order.rb

@@ -17,6 +17,7 @@ module Effective
     end
 
     acts_as_addressable(billing: { singular: true }, shipping: { singular: true })
+    acts_as_reportable if respond_to?(:acts_as_reportable)
 
     attr_accessor :terms_and_conditions # Yes, I agree to the terms and conditions
     attr_accessor :confirmed_checkout   # Set on the Checkout Step 1
@@ -85,6 +86,11 @@ module Effective
     scope :refunds, -> { purchased.where('total < ?', 0) }
     scope :pending_refunds, -> { not_purchased.where('total < ?', 0) }
 
+    # effective_reports
+    def reportable_scopes
+      { purchased: nil, not_purchased: nil, deferred: nil, refunds: nil, pending_refunds: nil }
+    end
+
     before_validation do
       self.state ||= EffectiveOrders::PENDING
       self.state = EffectiveOrders::CONFIRMED if pending? && confirmed_checkout

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.3'.freeze
+  VERSION = '6.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.1.3
+  version: 6.1.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-29 00:00:00.000000000 Z
+date: 2023-02-21 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