diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f39af8eff0..3f16322e7d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -135,7 +135,6 @@ class ApplicationController < ActionController::Base def check_order_cycle_expiry if current_order_cycle.andand.closed? - session[:expired_order_cycle_id] = current_order_cycle.id current_order.empty! current_order.set_order_cycle! nil flash[:info] = I18n.t('order_cycle_closed') diff --git a/app/controllers/spree/orders_controller.rb b/app/controllers/spree/orders_controller.rb index 211900f3c5..47e9aef949 100644 --- a/app/controllers/spree/orders_controller.rb +++ b/app/controllers/spree/orders_controller.rb @@ -139,10 +139,6 @@ module Spree redirect_to main_app.enterprise_path(@order.distributor.id) end - def order_cycle_expired - @order_cycle = OrderCycle.find session[:expired_order_cycle_id] - end - def cancel @order = Spree::Order.find_by!(number: params[:id]) authorize! :cancel, @order diff --git a/config/routes/spree.rb b/config/routes/spree.rb index 91215dce90..828586e46a 100644 --- a/config/routes/spree.rb +++ b/config/routes/spree.rb @@ -2,7 +2,6 @@ Openfoodnetwork::Application.routes.draw do scope module: 'spree' do resources :orders do get :clear, :on => :collection - get :order_cycle_expired, :on => :collection put :cancel, on: :member end end diff --git a/spec/controllers/base_controller_spec.rb b/spec/controllers/base_controller_spec.rb index b3084c18f2..5b0de85bd7 100644 --- a/spec/controllers/base_controller_spec.rb +++ b/spec/controllers/base_controller_spec.rb @@ -109,7 +109,6 @@ describe BaseController, type: :controller do get :index - expect(session[:expired_order_cycle_id]).to eq oc.id expect(response).to redirect_to root_url expect(flash[:info]).to eq I18n.t('order_cycle_closed') end