kbe/aperonight
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Resolve merge conflicts in payout system implementation

Browse Source 
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
kbe
2025-09-18 00:18:02 +02:00
parent c74140c431 4d5d12743d
commit a0640b5401
32 changed files with 997 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
app/views/admin/payouts/index.html.erb
View File

@@ -1,81 +1,51 @@
<%= render 'shared/admin_nav' %>
<div class="container mx-auto px-4 py-8">
<div class="flex justify-between items-center mb-6">
<h1 class="text-3xl font-bold text-gray-900">Admin Payouts</h1>
<h1 class="text-3xl font-bold text-gray-900">Manual Payout Administration</h1>
</div>
<% if @payouts.any? %>
<div class="bg-white rounded-lg shadow overflow-hidden">
<table class="min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50">
<tr>
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Event</th>
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Promoter</th>
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Amount</th>
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Status</th>
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Date</th>
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Actions</th>
</tr>
</thead>
<tbody class="bg-white divide-y divide-gray-200">
<% @payouts.each do |payout| %>
<tr>
<td class="px-6 py-4 whitespace-nowrap">
<div class="text-sm font-medium text-gray-900"><%= payout.event.name %></div>
</td>
<td class="px-6 py-4 whitespace-nowrap">
<div class="text-sm text-gray-900"><%= payout.user.name.presence || payout.user.email %></div>
</td>
<td class="px-6 py-4 whitespace-nowrap">
<div class="text-sm text-gray-900">€<%= payout.amount_euros %></div>
<div class="text-sm text-gray-500">Net: €<%= payout.net_amount_euros %> (Fee: €<%= payout.fee_euros %>)</div>
</td>
<td class="px-6 py-4 whitespace-nowrap">
<% case payout.status %>
<% when 'pending' %>
<span class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-yellow-100 text-yellow-800">
Pending
</span>
<% when 'processing' %>
<span class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-blue-100 text-blue-800">
Processing
</span>
<% when 'completed' %>
<span class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-green-100 text-green-800">
Completed
</span>
<% when 'failed' %>
<span class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-red-100 text-red-800">
Failed
</span>
<% end %>
</td>
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
<%= payout.created_at.strftime("%b %d, %Y") %>
</td>
<td class="px-6 py-4 whitespace-nowrap text-sm font-medium">
<% if payout.can_process? %>
<%= button_to "Process", admin_payout_path(payout), method: :post,
class: "text-indigo-600 hover:text-indigo-900 bg-indigo-100 hover:bg-indigo-200 px-3 py-1 rounded" %>
<% end %>
<% if payout.pending? || payout.processing? %>
<%= button_to "Mark as Manually Processed", mark_as_manually_processed_admin_payout_path(payout), method: :post,
class: "text-green-600 hover:text-green-900 bg-green-100 hover:bg-green-200 px-3 py-1 rounded ml-2",
data: { confirm: "Are you sure you want to mark this payout as manually processed? This will notify the promoter that the bank transfer is being processed." } %>
<% end %>
<%= link_to "View", promoter_payout_path(payout), class: "text-indigo-600 hover:text-indigo-900 ml-2" %>
</td>
</tr>
<% end %>
</tbody>
</table>
</div>
<% if @payouts.respond_to?(:total_pages) %>
<div class="mt-6">
<%= paginate @payouts %>
<!-- Pending Payouts - Require Review -->
<% if @pending_payouts.any? %>
<div class="mb-8">
<h2 class="text-xl font-semibold text-gray-900 mb-4">📋 Pending Review (<%= @pending_payouts.count %>)</h2>
<div class="bg-white rounded-lg shadow overflow-hidden">
<%= render partial: 'payout_table', locals: { payouts: @pending_payouts, show_actions: true, section: 'pending' } %>
</div>
<% end %>
<% else %>
</div>
<% end %>
<!-- Approved Payouts - Ready for Transfer -->
<% if @approved_payouts.any? %>
<div class="mb-8">
<h2 class="text-xl font-semibold text-gray-900 mb-4">✅ Approved - Ready for Transfer (<%= @approved_payouts.count %>)</h2>
<div class="bg-white rounded-lg shadow overflow-hidden">
<%= render partial: 'payout_table', locals: { payouts: @approved_payouts, show_actions: true, section: 'approved' } %>
</div>
</div>
<% end %>
<!-- Processing Payouts - Transfer Initiated -->
<% if @processing_payouts.any? %>
<div class="mb-8">
<h2 class="text-xl font-semibold text-gray-900 mb-4">🔄 Processing - Transfer in Progress (<%= @processing_payouts.count %>)</h2>
<div class="bg-white rounded-lg shadow overflow-hidden">
<%= render partial: 'payout_table', locals: { payouts: @processing_payouts, show_actions: true, section: 'processing' } %>
</div>
</div>
<% end %>
<!-- Recent Completed Payouts -->
<% if @completed_payouts.any? %>
<div class="mb-8">
<h2 class="text-xl font-semibold text-gray-900 mb-4">✨ Recently Completed</h2>
<div class="bg-white rounded-lg shadow overflow-hidden">
<%= render partial: 'payout_table', locals: { payouts: @completed_payouts, show_actions: false, section: 'completed' } %>
</div>
</div>
<% end %>
<% if @pending_payouts.empty? && @approved_payouts.empty? && @processing_payouts.empty? && @completed_payouts.empty? %>
<div class="bg-white rounded-lg shadow p-6 text-center">
<p class="text-gray-500">No payouts found.</p>
</div>