Redirect to order after "Move up" action

app/controllers/reservations_controller.rb

@@ -222,7 +222,15 @@ def move
       flash[:error] = @reservation.errors.full_messages.join("<br/>").html_safe
     end
 
-    redirect_to reservations_status_path(status: "upcoming")
+    redirect_to_order_id = params[:redirect_to_order_id]
+
+    if redirect_to_order_id.present?
+      facility_order = Order.find(redirect_to_order_id)
+
+      redirect_to facility_order_path(current_facility, facility_order)
+    else
+      redirect_to reservations_status_path(status: "upcoming")
+    end
   end
 
   # GET /orders/:order_id/order_details/:order_detail_id/reservations/:reservation_id/move
@@ -239,6 +247,8 @@ def earliest_move_possible
       }
     end
 
+    @redirect_to_order_id = params[:redirect_to_order_id]
+
     render layout: false
   end
 

app/presenters/reservation_user_action_presenter.rb

@@ -127,9 +127,13 @@ def kiosk_switch_actions
   end
 
   def move_link
-    link_to I18n.t("reservations.moving_up.link"), order_order_detail_reservation_move_reservation_path(order, order_detail, reservation),
-            class: "move-res",
-            data: { reservation_id: reservation.id }
+    path = if @redirect_to_order_id.present?
+             order_order_detail_reservation_move_reservation_path(order, order_detail, reservation, redirect_to_order_id: @redirect_to_order_id)
+           else
+             order_order_detail_reservation_move_reservation_path(order, order_detail, reservation)
+           end
+
+    link_to I18n.t("reservations.moving_up.link"), path, class: "move-res", data: { reservation_id: reservation.id }
   end
 
   def report_an_issue_link

app/views/reservations/earliest_move_possible.html.haml

@@ -11,7 +11,8 @@
 
     %p= t('reservations.moving_up.confirm')
   .modal-footer
-    = form_for :reservation, :url => order_order_detail_reservation_move_reservation_path(@reservation.order, @reservation.order_detail, @reservation), :method => "post" do |f|
+    - url = order_order_detail_reservation_move_reservation_path(@reservation.order, @reservation.order_detail, @reservation, redirect_to_order_id: @redirect_to_order_id)
+    = form_for :reservation, url: url, method: "post" do |f|
       = f.submit t('reservations.moving_up.button'), :class => ['btn', 'btn-primary']
       = modal_cancel_button