diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 3d3889f7d0..c9d8e0b187 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -853,7 +853,6 @@ Style/FrozenStringLiteralComment: - 'app/validators/date_time_string_validator.rb' - 'app/validators/distributors_validator.rb' - 'app/validators/integer_array_validator.rb' - - 'app/views/spree/admin/taxons/search.rabl' - 'config.ru' - 'engines/order_management/app/controllers/order_management/application_controller.rb' - 'engines/order_management/app/services/order_management/reports/enterprise_fee_summary/authorizer.rb' diff --git a/Gemfile b/Gemfile index b01600d0d3..31310600a7 100644 --- a/Gemfile +++ b/Gemfile @@ -55,7 +55,6 @@ gem 'aws-sdk' gem 'bugsnag' gem 'db2fog' gem 'haml' -gem 'rabl' gem 'redcarpet' gem 'sass', "~> 3.3" gem 'sass-rails', '~> 3.2.3' diff --git a/Gemfile.lock b/Gemfile.lock index d002b3b556..b129b0cc5e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -502,8 +502,6 @@ GEM byebug (>= 9.0, < 9.1) pry (~> 0.10) public_suffix (4.0.3) - rabl (0.8.4) - activesupport (>= 2.3.14) rack (1.4.7) rack-cache (1.11.0) rack (>= 0.4) @@ -754,7 +752,6 @@ DEPENDENCIES paperclip (~> 3.4.1) pg (~> 0.21.0) pry-byebug (>= 3.4.3) - rabl rack-mini-profiler (< 3.0.0) rack-rewrite rack-ssl diff --git a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee index 0c5176328b..c3f9a0a48f 100644 --- a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee +++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee @@ -1,6 +1,6 @@ Darkswarm.factory 'OrderCycle', ($resource, orderCycleData) -> class OrderCycle - @order_cycle = orderCycleData # Object or {} due to RABL + @order_cycle = orderCycleData # Object or {} @push_order_cycle: (callback) -> new $resource("/shop/order_cycle").save {order_cycle_id: @order_cycle.order_cycle_id}, (order_data)-> OrderCycle.order_cycle.orders_close_at = order_data.orders_close_at diff --git a/app/controllers/spree/admin/taxons_controller.rb b/app/controllers/spree/admin/taxons_controller.rb index ddc1b63c70..240cb2cd03 100644 --- a/app/controllers/spree/admin/taxons_controller.rb +++ b/app/controllers/spree/admin/taxons_controller.rb @@ -3,14 +3,6 @@ module Spree class TaxonsController < Spree::Admin::BaseController respond_to :html, :json, :js - def search - @taxons = if params[:ids] - Spree::Taxon.where(id: params[:ids].split(',')) - else - Spree::Taxon.limit(20).search(name_cont: params[:q]).result - end - end - def create @taxonomy = Taxonomy.find(params[:taxonomy_id]) @taxon = @taxonomy.taxons.build(params[:taxon]) diff --git a/app/views/spree/admin/products/_form.html.haml b/app/views/spree/admin/products/_form.html.haml index cbc7718325..616f7977f3 100644 --- a/app/views/spree/admin/products/_form.html.haml +++ b/app/views/spree/admin/products/_form.html.haml @@ -16,11 +16,6 @@ = sanitize(@product.description) = f.error_message_on :description - = f.field_container :taxons do - = f.label :taxon_ids, t(:taxons) - %br - = f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',') - .right.four.columns.omega .variant_units_form{ 'ng-app' => 'admin.products', 'ng-controller' => 'editUnitsCtrl' } diff --git a/app/views/spree/admin/taxons/search.rabl b/app/views/spree/admin/taxons/search.rabl deleted file mode 100644 index 5214337d12..0000000000 --- a/app/views/spree/admin/taxons/search.rabl +++ /dev/null @@ -1,4 +0,0 @@ -object false -child(@taxons => :taxons) do - attributes :name, :pretty_name, :id -end diff --git a/config/routes/spree.rb b/config/routes/spree.rb index 095350b699..1fb8d9c1d0 100644 --- a/config/routes/spree.rb +++ b/config/routes/spree.rb @@ -154,12 +154,6 @@ Spree::Core::Engine.routes.draw do resources :taxons end - resources :taxons, :only => [] do - collection do - get :search - end - end - resources :tax_rates resource :tax_settings resources :tax_categories