Fix payee operation redirects

app/controllers/payees_controller.rb

@@ -50,10 +50,10 @@ def update
 
     if payee.update(payee_params)
       flash[:success] = "Recipient updated."
-      redirect_to new_event_payment_path(event_id: @event.slug, payee_id: payee.hashid)
+      redirect_to helpers.new_recipient_transfer_path(params[:destination], @event, payee_id: payee.hashid)
     else
       flash[:error] = payee.errors.full_messages.to_sentence
-      redirect_to new_event_payment_path(event_id: @event.slug, payee_id: payee.hashid, edit_payee: true)
+      redirect_to helpers.new_recipient_transfer_path(params[:destination], @event, payee_id: payee.hashid, edit_payee: true)
     end
   end
 
@@ -64,7 +64,7 @@ def archive
     payee.archive!
 
     flash[:success] = "Recipient archived."
-    redirect_to new_event_payment_path(event_id: @event.slug)
+    redirect_to helpers.new_recipient_transfer_path(params[:destination], @event)
   end
 
   def choose_legal_entity

app/helpers/application_helper.rb

@@ -14,6 +14,7 @@ module ApplicationHelper
   include LoginsHelper
   include LogoHelper
   include OrganizerPosition::Spending::AllowancesHelper
+  include PayeesHelper
   include PopoverHelper
   include SeasonalHelper
   include SessionsHelper

app/views/payees/index.html.erb

@@ -36,13 +36,13 @@
                     data: { turbo: false, "menu-target": "toggle", action: "menu#toggle click@document->menu#close keydown@document->menu#keydown" } %>
               <div class="menu__content menu__content--2 h5 menu__content--compact" data-menu-target="content">
                 <% if policy(payee).update? %>
-                  <%= link_to new_event_payment_path(event_id: @event.slug, payee_id: payee.hashid, edit_payee: true), class: "flex items-center", data: { turbo_frame: "_top" } do %>
+                  <%= link_to new_recipient_transfer_path(destination, @event, payee_id: payee.hashid, edit_payee: true), class: "flex items-center", data: { turbo_frame: "_top" } do %>
                     <%= inline_icon "edit", size: 24 %>
                     Edit recipient
                   <% end %>
                 <% end %>
                 <% if policy(payee).archive? %>
-                  <%= link_to archive_event_payee_path(event_id: @event.slug, id: payee.hashid), class: "flex items-center", data: { turbo_method: :post, turbo_frame: "_top", turbo_confirm: "Archive #{payee.display_name}? They'll be hidden from the recipient list." } do %>
+                  <%= link_to archive_event_payee_path(event_id: @event.slug, id: payee.hashid, destination:), class: "flex items-center", data: { turbo_method: :post, turbo_frame: "_top", turbo_confirm: "Archive #{payee.display_name}? They'll be hidden from the recipient list." } do %>
                     <%= inline_icon "delete", size: 24 %>
                     Archive recipient
                   <% end %>

app/views/payments/_edit_payee.html.erb

@@ -1,11 +1,13 @@
 <%# locals: (event:, payee:) %>
 
-<% cancel_path = params[:selected].present? ? new_event_payment_path(event_id: event.slug, payee_id: payee.hashid) : new_event_payment_path(event_id: event.slug) %>
+<% destination = params[:destination].presence || "payments" %>
+<% cancel_path = params[:selected].present? ? new_recipient_transfer_path(destination, event, payee_id: payee.hashid) : new_recipient_transfer_path(destination, event) %>
 
 <div data-scroll-seek-target="section">
   <h3 class="mb-2">Edit recipient</h3>
   <div class="card mb-4">
     <%= form_with(model: payee, url: event_payee_path(event_id: event.slug, id: payee.hashid), method: :patch, local: true) do |form| %>
+      <%= hidden_field_tag :destination, destination %>
       <div class="flex flex-col gap-3">
         <div>
           <%= form.label :display_name, "Name" %>

app/views/payroll/positions/_form.html.erb

@@ -1,5 +1,9 @@
 <%# locals: (event:, payee: nil, position: nil) %>
 
+<% if payee && params[:edit_payee].present? && policy(payee).update? %>
+  <%= render "payments/edit_payee", event:, payee: %>
+<% else %>
+
 <% editing = position&.persisted? %>
 <% disabled = !policy(event).create_transfer? %>
 
@@ -109,3 +113,4 @@
     </button>
   <% end %>
 </div>
+<% end %>