diff --git a/Gemfile b/Gemfile index ad05360..2e62c72 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ gem 'rails', '>0.a' # Provides basic authentication functionality for testing parts of your engine gem 'solidus_auth_devise' -# gem 'solidus_reports', github: 'solidusio-contrib/solidus_reports' +gem 'solidus_reports', github: 'solidusio-contrib/solidus_reports' case ENV['DB'] when 'mysql' diff --git a/app/decorators/controllers/solidus_marketplace/spree/admin/reports_controller_decorator.rb b/app/decorators/controllers/solidus_marketplace/spree/admin/reports_controller_decorator.rb index b9ee37c..d4b7c53 100644 --- a/app/decorators/controllers/solidus_marketplace/spree/admin/reports_controller_decorator.rb +++ b/app/decorators/controllers/solidus_marketplace/spree/admin/reports_controller_decorator.rb @@ -48,7 +48,7 @@ def marketplace_reports def get_supplier_earnings grouped_supplier_earnings.each do |se| - se[:earnings] = se[:earnings].inject(Spree::Money.new(0)) do |e, c| + se[:earnings] = se[:earnings].inject(::Spree::Money.new(0)) do |e, c| c + e end end @@ -57,7 +57,7 @@ def get_supplier_earnings def grouped_supplier_earnings params[:q] = search_params - @search = Spree::Order.complete.not_canceled.ransack(params[:q]) + @search = ::Spree::Order.complete.not_canceled.ransack(params[:q]) @orders = @search.result supplier_earnings_map = @orders.map(&:supplier_earnings_map) diff --git a/config/routes.rb b/config/routes.rb index 6db4d2a..27662d4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,7 +6,6 @@ resources :reports, only: [:index] do collection do get :earnings - post :earnings end end diff --git a/spec/features/spree/admin/reports_spec.rb b/spec/features/spree/admin/reports_spec.rb new file mode 100644 index 0000000..2aa4642 --- /dev/null +++ b/spec/features/spree/admin/reports_spec.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +describe 'Reports', type: :feature, js: true do + stub_authorization! + + describe 'Earnings' do + it 'renders correctly' do + visit spree.earnings_admin_reports_path + expect(page).to have_content(I18n.t('spree.earnings')) + end + end +end