diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 8430cc0b46..91b958b867 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -443,22 +443,6 @@ Naming/VariableNumber: - 'spec/models/spree/tax_rate_spec.rb' - 'spec/requests/api/orders_spec.rb' -# Offense count: 9 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: ExpectedOrder, Include. -# ExpectedOrder: index, show, new, edit, create, update, destroy -# Include: app/controllers/**/*.rb -Rails/ActionOrder: - Exclude: - - 'app/controllers/admin/resource_controller.rb' - - 'app/controllers/api/v0/orders_controller.rb' - - 'app/controllers/spree/admin/images_controller.rb' - - 'app/controllers/spree/admin/invoices_controller.rb' - - 'app/controllers/spree/admin/products_controller.rb' - - 'app/controllers/spree/admin/taxons_controller.rb' - - 'app/controllers/spree/admin/variants_controller.rb' - - 'app/controllers/user_confirmations_controller.rb' - # Offense count: 12 # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: Include. diff --git a/app/controllers/admin/resource_controller.rb b/app/controllers/admin/resource_controller.rb index 56fa7c5a5f..753b7d130a 100644 --- a/app/controllers/admin/resource_controller.rb +++ b/app/controllers/admin/resource_controller.rb @@ -24,9 +24,10 @@ module Admin end end - def update - if @object.update(permitted_resource_params) - flash[:success] = flash_message_for(@object, :successfully_updated) + def create + @object.attributes = permitted_resource_params + if @object.save + flash[:success] = flash_message_for(@object, :successfully_created) respond_with(@object) do |format| format.html { redirect_to location_after_save } format.js { render layout: false } @@ -36,10 +37,9 @@ module Admin end end - def create - @object.attributes = permitted_resource_params - if @object.save - flash[:success] = flash_message_for(@object, :successfully_created) + def update + if @object.update(permitted_resource_params) + flash[:success] = flash_message_for(@object, :successfully_updated) respond_with(@object) do |format| format.html { redirect_to location_after_save } format.js { render layout: false } diff --git a/app/controllers/api/v0/orders_controller.rb b/app/controllers/api/v0/orders_controller.rb index f36157db21..8570ac3db5 100644 --- a/app/controllers/api/v0/orders_controller.rb +++ b/app/controllers/api/v0/orders_controller.rb @@ -5,11 +5,6 @@ module Api class OrdersController < Api::V0::BaseController include PaginationData - def show - authorize! :read, order - render json: order, serializer: Api::OrderDetailedSerializer, current_order: order - end - def index authorize! :admin, Spree::Order @@ -26,6 +21,11 @@ module Api } end + def show + authorize! :read, order + render json: order, serializer: Api::OrderDetailedSerializer, current_order: order + end + def update authorize! :admin, order diff --git a/app/controllers/spree/admin/images_controller.rb b/app/controllers/spree/admin/images_controller.rb index ae160523b4..4fed1aba31 100644 --- a/app/controllers/spree/admin/images_controller.rb +++ b/app/controllers/spree/admin/images_controller.rb @@ -20,6 +20,10 @@ module Spree render layout: !request.xhr? end + def edit + @url_filters = ::ProductFilters.new.extract(request.query_parameters) + end + def create @url_filters = ::ProductFilters.new.extract(request.query_parameters) set_viewable @@ -34,10 +38,6 @@ module Spree end end - def edit - @url_filters = ::ProductFilters.new.extract(request.query_parameters) - end - def update @url_filters = ::ProductFilters.new.extract(request.query_parameters) set_viewable diff --git a/app/controllers/spree/admin/invoices_controller.rb b/app/controllers/spree/admin/invoices_controller.rb index c304a63697..b2035b9826 100644 --- a/app/controllers/spree/admin/invoices_controller.rb +++ b/app/controllers/spree/admin/invoices_controller.rb @@ -10,6 +10,13 @@ module Spree authorize! :invoice, @order end + def show + invoice_id = params[:id] + invoice_pdf = BulkInvoiceService.new.filepath(invoice_id) + + send_file(invoice_pdf, type: 'application/pdf', disposition: :inline) + end + def create Spree::Order.where(id: params[:order_ids]).find_each do |order| authorize! :invoice, order @@ -40,13 +47,6 @@ module Spree redirect_back(fallback_location: spree.admin_dashboard_path) end - def show - invoice_id = params[:id] - invoice_pdf = BulkInvoiceService.new.filepath(invoice_id) - - send_file(invoice_pdf, type: 'application/pdf', disposition: :inline) - end - def poll invoice_id = params[:invoice_id] diff --git a/app/controllers/spree/admin/products_controller.rb b/app/controllers/spree/admin/products_controller.rb index fb4726f7a5..4a7f954a7c 100644 --- a/app/controllers/spree/admin/products_controller.rb +++ b/app/controllers/spree/admin/products_controller.rb @@ -16,10 +16,24 @@ module Spree before_action :load_spree_api_key, only: [:index, :variant_overrides] before_action :strip_new_properties, only: [:create, :update] + def index + @current_user = spree_current_user + @show_latest_import = params[:latest_import] || false + end + + def show + session[:return_to] ||= request.referer + redirect_to( action: :edit ) + end + def new @object.shipping_category = DefaultShippingCategory.find_or_create end + def edit + @url_filters = ::ProductFilters.new.extract(request.query_parameters) + end + def create delete_stock_params_and_set_after do @object.attributes = permitted_resource_params @@ -35,20 +49,6 @@ module Spree end end - def show - session[:return_to] ||= request.referer - redirect_to( action: :edit ) - end - - def index - @current_user = spree_current_user - @show_latest_import = params[:latest_import] || false - end - - def edit - @url_filters = ::ProductFilters.new.extract(request.query_parameters) - end - def update @url_filters = ::ProductFilters.new.extract(request.query_parameters) diff --git a/app/controllers/spree/admin/taxons_controller.rb b/app/controllers/spree/admin/taxons_controller.rb index ae625e9da6..b586866110 100644 --- a/app/controllers/spree/admin/taxons_controller.rb +++ b/app/controllers/spree/admin/taxons_controller.rb @@ -5,6 +5,12 @@ module Spree class TaxonsController < Spree::Admin::BaseController respond_to :html, :json, :js + def edit + @taxonomy = Taxonomy.find(params[:taxonomy_id]) + @taxon = @taxonomy.taxons.find(params[:id]) + @permalink_part = @taxon.permalink.split("/").last + end + def create @taxonomy = Taxonomy.find(params[:taxonomy_id]) @taxon = @taxonomy.taxons.build(params[:taxon]) @@ -26,12 +32,6 @@ module Spree end end - def edit - @taxonomy = Taxonomy.find(params[:taxonomy_id]) - @taxon = @taxonomy.taxons.find(params[:id]) - @permalink_part = @taxon.permalink.split("/").last - end - def update @taxonomy = Taxonomy.find(params[:taxonomy_id]) @taxon = @taxonomy.taxons.find(params[:id]) diff --git a/app/controllers/spree/admin/variants_controller.rb b/app/controllers/spree/admin/variants_controller.rb index 6ccdd7f0f0..b7dbd0ddb4 100644 --- a/app/controllers/spree/admin/variants_controller.rb +++ b/app/controllers/spree/admin/variants_controller.rb @@ -11,27 +11,14 @@ module Spree @url_filters = ::ProductFilters.new.extract(request.query_parameters) end - def edit - @url_filters = ::ProductFilters.new.extract(request.query_parameters) - end - - def update - @url_filters = ::ProductFilters.new.extract(request.query_parameters) - - if @object.update(permitted_resource_params) - flash[:success] = flash_message_for(@object, :successfully_updated) - redirect_to spree.admin_product_variants_url(params[:product_id], @url_filters) - else - redirect_to spree.edit_admin_product_variant_url(params[:product_id], - @object, - @url_filters) - end - end - def new @url_filters = ::ProductFilters.new.extract(request.query_parameters) end + def edit + @url_filters = ::ProductFilters.new.extract(request.query_parameters) + end + def create @url_filters = ::ProductFilters.new.extract(request.query_parameters) @@ -53,6 +40,19 @@ module Spree @object.on_hand = on_hand.to_i if on_hand.present? end + def update + @url_filters = ::ProductFilters.new.extract(request.query_parameters) + + if @object.update(permitted_resource_params) + flash[:success] = flash_message_for(@object, :successfully_updated) + redirect_to spree.admin_product_variants_url(params[:product_id], @url_filters) + else + redirect_to spree.edit_admin_product_variant_url(params[:product_id], + @object, + @url_filters) + end + end + def search scoper = OpenFoodNetwork::ScopeVariantsForSearch.new(variant_search_params) @variants = scoper.search diff --git a/app/controllers/user_confirmations_controller.rb b/app/controllers/user_confirmations_controller.rb index c0634d49e7..d8b6b221fe 100644 --- a/app/controllers/user_confirmations_controller.rb +++ b/app/controllers/user_confirmations_controller.rb @@ -5,6 +5,13 @@ class UserConfirmationsController < DeviseController include Spree::Core::ControllerHelpers::Auth include CablecarResponses + # GET /resource/confirmation?confirmation_token=abcdef + def show + self.resource = resource_class.confirm_by_token(params[:confirmation_token]) + + respond_with_navigational(resource){ redirect_to after_confirmation_path_for(resource) } + end + # GET /resource/confirmation/new def new build_resource({}) @@ -33,13 +40,6 @@ class UserConfirmationsController < DeviseController respond_with_navigational(resource){ redirect_to login_path } end - # GET /resource/confirmation?confirmation_token=abcdef - def show - self.resource = resource_class.confirm_by_token(params[:confirmation_token]) - - respond_with_navigational(resource){ redirect_to after_confirmation_path_for(resource) } - end - protected def set_return_url