diff --git a/app/assets/javascripts/admin/orders/controllers/bulk_cancel_controller.js.coffee b/app/assets/javascripts/admin/orders/controllers/bulk_cancel_controller.js.coffee deleted file mode 100644 index 059f378e5d..0000000000 --- a/app/assets/javascripts/admin/orders/controllers/bulk_cancel_controller.js.coffee +++ /dev/null @@ -1,14 +0,0 @@ -angular.module("admin.orders").controller "bulkCancelCtrl", ($scope, $http, $timeout) -> - - $scope.cancelOrder = (orderIds, sendEmailCancellation, restock_items) -> - $http( - method: 'post' - url: "/admin/orders/bulk_cancel?order_ids=#{orderIds}&send_cancellation_email=#{sendEmailCancellation}&restock_items=#{restock_items}" ).then(-> - window.location.reload() - ) - - $scope.cancelSelectedOrders = -> - ofnCancelOrderAlert((confirm, sendEmailCancellation, restock_items) -> - if confirm - $scope.cancelOrder $scope.selected_orders, sendEmailCancellation, restock_items - ) diff --git a/app/controllers/spree/admin/orders_controller.rb b/app/controllers/spree/admin/orders_controller.rb index 2b686763be..c7bd070146 100644 --- a/app/controllers/spree/admin/orders_controller.rb +++ b/app/controllers/spree/admin/orders_controller.rb @@ -67,18 +67,6 @@ module Spree load_spree_api_key end - def bulk_cancel - order_ids = params[:order_ids].split(',') - - Spree::Order.where(id: order_ids).find_each do |order| - order.send_cancellation_email = params[:send_cancellation_email] != "false" - order.restock_items = params.fetch(:restock_items, "true") == "true" - order.cancel - end - - flash[:success] = Spree.t(:order_updated) - end - def fire event = params[:e] @order.send_cancellation_email = params[:send_cancellation_email] != "false" diff --git a/config/routes/spree.rb b/config/routes/spree.rb index 48e8f99c43..637c1019f6 100644 --- a/config/routes/spree.rb +++ b/config/routes/spree.rb @@ -33,7 +33,6 @@ Spree::Core::Engine.routes.draw do end resource :account, :controller => 'users' - match '/admin/orders/bulk_cancel' => 'admin/orders#bulk_cancel', :as => "admin_bulk_cancel", via: :post match '/admin/orders/bulk_management' => 'admin/orders#bulk_management', :as => "admin_bulk_order_management", via: :get match '/admin/payment_methods/show_provider_preferences' => 'admin/payment_methods#show_provider_preferences', :via => :get