Replace spree_order_path with order_path so we can use scope in the routes file

app/controllers/checkout_controller.rb

@@ -142,7 +142,7 @@ class CheckoutController < ::BaseController
   def handle_redirect_from_stripe
     if OrderWorkflow.new(@order).next && order_complete?
       checkout_succeeded
-      redirect_to(spree_order_path(@order)) && return
+      redirect_to(order_path(@order)) && return
     else
       checkout_failed
     end
@@ -202,10 +202,10 @@ class CheckoutController < ::BaseController
   def update_succeeded_response
     respond_to do |format|
       format.html do
-        respond_with(@order, location: spree_order_path(@order))
+        respond_with(@order, location: order_path(@order))
       end
       format.json do
-        render json: { path: spree_order_path(@order) }, status: :ok
+        render json: { path: order_path(@order) }, status: :ok
       end
     end
   end

app/controllers/spree/admin/payments_controller.rb

@@ -153,7 +153,7 @@ module Spree
       def authorize_stripe_sca_payment
         return unless @payment.payment_method.class == Spree::Gateway::StripeSCA
 
-        @payment.authorize!(main_app.spree_order_path(@payment.order, only_path: false))
+        @payment.authorize!(main_app.order_path(@payment.order, only_path: false))
 
         raise Spree::Core::GatewayError, I18n.t('authorization_failure') unless @payment.pending?
 

app/controllers/spree/orders_controller.rb

@@ -85,7 +85,7 @@ module Spree
               @order.next_transition.run_callbacks if @order.cart?
               redirect_to checkout_state_path(@order.checkout_steps.first)
             elsif @order.complete?
-              redirect_to spree_order_path(@order)
+              redirect_to order_path(@order)
             else
               redirect_to main_app.cart_path
             end
@@ -152,7 +152,7 @@ module Spree
       else
         flash[:error] = I18n.t(:orders_could_not_cancel)
       end
-      redirect_to request.referer || spree_order_path(@order)
+      redirect_to request.referer || order_path(@order)
     end
 
     private
@@ -216,7 +216,7 @@ module Spree
 
       if items.empty?
         flash[:error] = I18n.t(:orders_cannot_remove_the_final_item)
-        redirect_to spree_order_path(order_to_update)
+        redirect_to order_path(order_to_update)
       end
     end
 

app/controllers/spree/paypal_controller.rb

@@ -234,7 +234,7 @@ module Spree
     end
 
     def completion_route(order)
-      main_app.spree_order_path(order, token: order.token)
+      main_app.order_path(order, token: order.token)
     end
 
     def address_required?

app/helpers/spree/orders_helper.rb

@@ -28,7 +28,7 @@ module Spree
     end
 
     def changeable_orders_link_path
-      changeable_orders.one? ? spree_order_path(changeable_orders.first) : spree.account_path
+      changeable_orders.one? ? order_path(changeable_orders.first) : spree.account_path
     end
 
     def shop_changeable_orders_alert_html

app/serializers/api/order_serializer.rb

@@ -42,13 +42,13 @@ module Api
     end
 
     def path
-      spree_order_path(object)
+      order_path(object)
     end
 
     def cancel_path
       return nil unless object.changes_allowed?
 
-      cancel_spree_order_path(object)
+      cancel_order_path(object)
     end
 
     def changes_allowed

app/views/checkout/_form.html.haml

@@ -4,7 +4,7 @@
   = inject_saved_credit_cards
 
 = form_for current_order,
-  url: spree_order_path(current_order),
+  url: order_path(current_order),
   html: {name: "checkout",
     id: "checkout_form",
     novalidate: true,

app/views/spree/orders/form/_update_buttons.html.haml

@@ -12,7 +12,7 @@
   - if order.changes_allowed?
     .columns.show-for-medium-up.medium-3  
     .columns.small-12.medium-3
-      = link_to cancel_spree_order_path(@order), method: :put, :class => "button secondary expand", "confirm-link-click" => t('orders_confirm_cancel') do
+      = link_to cancel_order_path(@order), method: :put, :class => "button secondary expand", "confirm-link-click" => t('orders_confirm_cancel') do
         %i.ofn-i_009-close
         = t(:cancel_order)
     .columns.small-12.medium-3

app/views/spree/shared/_order_details.html.haml

@@ -41,7 +41,7 @@
         = t(:orders_changeable_orders_alert_html, oc_close: l(order.order_cycle.orders_close_at, format: "%b %d, %Y %H:%M"))
         %a.close{ "ng-click" => "close()" } ×
 
-    = form_for order, url: spree_order_path(order), html: {id: 'update-order', name: 'update_order_form' } do |order_form|
+    = form_for order, url: order_path(order), html: {id: 'update-order', name: 'update_order_form' } do |order_form|
       - if order.changes_allowed?
         = render 'spree/orders/form', order_form: order_form
       -else

spec/controllers/checkout_controller_concurrency_spec.rb

@@ -82,7 +82,7 @@ describe CheckoutController, concurrency: true, type: :controller do
     # see the order page. This is basically verifying a "double click"
     # scenario.
     expect(response.status).to eq(200)
-    expect(response.body).to eq({ path: spree_order_path(order) }.to_json)
+    expect(response.body).to eq({ path: order_path(order) }.to_json)
     expect(order.payments.count).to eq 1
     expect(order.completed?).to be true
   end

spec/controllers/checkout_controller_spec.rb

@@ -110,7 +110,7 @@ describe CheckoutController, type: :controller do
         it "completes the order and redirects to the order confirmation page" do
           get :edit, { payment_intent: "pi_123" }
           expect(order.completed?).to be true
-          expect(response).to redirect_to spree_order_path(order)
+          expect(response).to redirect_to order_path(order)
         end
       end
     end
@@ -242,7 +242,7 @@ describe CheckoutController, type: :controller do
 
       spree_post :update, format: :json, order: {}
       expect(response.status).to eq(200)
-      expect(response.body).to eq({ path: spree_order_path(order) }.to_json)
+      expect(response.body).to eq({ path: order_path(order) }.to_json)
     end
 
     it "returns an error on unexpected failure" do

spec/controllers/spree/orders_controller_spec.rb

@@ -68,12 +68,12 @@ describe Spree::OrdersController, type: :controller do
       let(:current_user) { nil }
 
       before do
-        request.env["PATH_INFO"] = spree_order_path(order)
+        request.env["PATH_INFO"] = order_path(order)
       end
 
       it "redirects to unauthorized" do
         get :show, id: order.number
-        expect(response).to redirect_to(root_path(anchor: "login?after_login=#{spree_order_path(order)}"))
+        expect(response).to redirect_to(root_path(anchor: "login?after_login=#{order_path(order)}"))
         expect(flash[:error]).to eq("Please log in to view your order.")
       end
     end
@@ -318,7 +318,7 @@ describe Spree::OrdersController, type: :controller do
       it "removes the items" do
         spree_post :update, params
         expect(flash[:error]).to be nil
-        expect(response).to redirect_to spree_order_path(order)
+        expect(response).to redirect_to order_path(order)
         expect(order.reload.line_items.count).to eq 1
       end
     end
@@ -329,7 +329,7 @@ describe Spree::OrdersController, type: :controller do
       it "does not remove items, flash suggests cancellation" do
         spree_post :update, params
         expect(flash[:error]).to eq I18n.t(:orders_cannot_remove_the_final_item)
-        expect(response).to redirect_to spree_order_path(order)
+        expect(response).to redirect_to order_path(order)
         expect(order.reload.line_items.count).to eq 2
       end
     end
@@ -426,7 +426,7 @@ describe Spree::OrdersController, type: :controller do
       context "when the order is not yet complete" do
         it "responds with forbidden" do
           spree_put :cancel, params
-          expect(response.status).to redirect_to spree_order_path(order)
+          expect(response.status).to redirect_to order_path(order)
           expect(flash[:error]).to eq I18n.t(:orders_could_not_cancel)
         end
       end
@@ -440,7 +440,7 @@ describe Spree::OrdersController, type: :controller do
 
         it "responds with success" do
           spree_put :cancel, params
-          expect(response.status).to redirect_to spree_order_path(order)
+          expect(response.status).to redirect_to order_path(order)
           expect(flash[:success]).to eq I18n.t(:orders_your_order_has_been_cancelled)
         end
       end

spec/features/consumer/account_spec.rb

@@ -85,12 +85,12 @@ feature '
           visit '/account'
           expect(page).to have_content I18n.t('spree.users.orders.open_orders')
 
-          expect(page).to have_link d1o1.number, href: spree_order_path(d1o1)
-          expect(page).to have_link d1o2.number, href: spree_order_path(d1o2)
+          expect(page).to have_link d1o1.number, href: order_path(d1o1)
+          expect(page).to have_link d1o2.number, href: order_path(d1o2)
           expect(page).to have_link(distributor1.name,
                                     href: "#{distributor1.permalink}/shop", count: 2)
-          expect(page).to have_link I18n.t('spree.users.open_orders.cancel'), href: cancel_spree_order_path(d1o1)
-          expect(page).to have_link I18n.t('spree.users.open_orders.cancel'), href: cancel_spree_order_path(d1o2)
+          expect(page).to have_link I18n.t('spree.users.open_orders.cancel'), href: cancel_order_path(d1o1)
+          expect(page).to have_link I18n.t('spree.users.open_orders.cancel'), href: cancel_order_path(d1o2)
         end
       end
     end

spec/features/consumer/shopping/orders_spec.rb

@@ -44,16 +44,16 @@ feature "Order Management", js: true do
 
       it "allows the user to see the details" do
         # Cannot load the page without token
-        visit spree_order_path(order)
+        visit order_path(order)
         expect(page).to_not be_confirmed_order_page
 
         # Can load the page with token
-        visit spree_order_path(order, token: order.token)
+        visit order_path(order, token: order.token)
         expect(page).to be_confirmed_order_page
 
         # Can load the page even without the token, after loading the page with
         # token.
-        visit spree_order_path(order)
+        visit order_path(order)
         expect(page).to be_confirmed_order_page
       end
     end
@@ -66,7 +66,7 @@ feature "Order Management", js: true do
       end
 
       it "allows the user to see order details" do
-        visit spree_order_path(order)
+        visit order_path(order)
         expect(page).to be_confirmed_order_page
       end
     end
@@ -76,7 +76,7 @@ feature "Order Management", js: true do
 
       it "allows the user to see order details after login" do
         # Cannot load the page without signing in
-        visit spree_order_path(order)
+        visit order_path(order)
         expect(page).to_not be_confirmed_order_page
 
         # Can load the page after signing in
@@ -115,7 +115,7 @@ feature "Order Management", js: true do
     end
 
     it 'shows the name of the shipping method' do
-      visit spree_order_path(order)
+      visit order_path(order)
       expect(find('#order')).to have_content(shipping_method.name)
     end
 
@@ -125,7 +125,7 @@ feature "Order Management", js: true do
       end
 
       it "doesn't show form elements for editing the order" do
-        visit spree_order_path(order)
+        visit order_path(order)
         expect(find("tr.variant-#{item1.variant.id}")).to have_content item1.product.name
         expect(find("tr.variant-#{item2.variant.id}")).to have_content item2.product.name
         expect(find("tr.variant-#{item3.variant.id}")).to have_content item3.product.name
@@ -142,7 +142,7 @@ feature "Order Management", js: true do
       end
 
       it "allows quantity to be changed, items to be removed and the order to be cancelled" do
-        visit spree_order_path(order)
+        visit order_path(order)
 
         expect(page).to have_button I18n.t(:order_saved), disabled: true
         expect(page).to have_no_button I18n.t(:save_changes)

spec/requests/checkout/paypal_spec.rb

@@ -58,7 +58,7 @@ describe "checking out an order with a paypal express payment method", type: :re
       get spree.confirm_paypal_path, params
 
       # Processing was successful, order is complete
-      expect(response).to redirect_to spree_order_path(order, token: order.token)
+      expect(response).to redirect_to order_path(order, token: order.token)
       expect(order.reload.complete?).to be true
 
       # We have only one payment, and one transaction fee

spec/requests/checkout/stripe_sca_spec.rb

@@ -130,7 +130,7 @@ describe "checking out an order with a Stripe SCA payment method", type: :reques
       it "should process the payment without storing card details" do
         put update_checkout_path, params
 
-        expect(json_response["path"]).to eq spree_order_path(order)
+        expect(json_response["path"]).to eq order_path(order)
         expect(order.payments.completed.count).to be 1
 
         card = order.payments.completed.first.source
@@ -218,7 +218,7 @@ describe "checking out an order with a Stripe SCA payment method", type: :reques
         it "should process the payment, and store the card/customer details" do
           put update_checkout_path, params
 
-          expect(json_response["path"]).to eq spree_order_path(order)
+          expect(json_response["path"]).to eq order_path(order)
           expect(order.payments.completed.count).to be 1
 
           card = order.payments.completed.first.source
@@ -303,7 +303,7 @@ describe "checking out an order with a Stripe SCA payment method", type: :reques
         it "should process the payment, and keep the profile ids and other card details" do
           put update_checkout_path, params
 
-          expect(json_response["path"]).to eq spree_order_path(order)
+          expect(json_response["path"]).to eq order_path(order)
           expect(order.payments.completed.count).to be 1
 
           card = order.payments.completed.first.source