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

Refactor routes to use cleaner URL structure with order_id parameter

Browse Source
This commit is contained in:
kbe
2025-09-06 03:12:11 +02:00
parent 01b545c83e
commit d9d43f45e5
11 changed files with 75 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/orders_controller.rb
View File

@@ -87,14 +87,14 @@ class OrdersController < ApplicationController
if success
session[:draft_order_id] = @order.id
session.delete(:pending_cart)
redirect_to checkout_order_path(@order)
redirect_to order_checkout_path(@order)
else
redirect_to event_order_new_path(@event.slug, @event.id)
redirect_to order_new_path(@event.slug, @event.id)
end
rescue => e
error_message = e.message.present? ? e.message : "Erreur inconnue"
flash[:alert] = "Une erreur est survenue: #{error_message}"
redirect_to event_order_new_path(@event.slug, @event.id)
redirect_to order_new_path(@event.slug, @event.id)
end
# Display order summary
@@ -146,7 +146,7 @@ class OrdersController < ApplicationController
return
end
redirect_to checkout_order_path(@order)
redirect_to order_checkout_path(@order)
end
# Handle successful payment
@@ -225,7 +225,7 @@ class OrdersController < ApplicationController
order = current_user.orders.find_by(id: order_id, status: "draft")
if order&.can_retry_payment?
redirect_to checkout_order_path(order),
redirect_to order_checkout_path(order),
alert: "Le paiement a été annulé. Vous pouvez réessayer."
else
session.delete(:draft_order_id)
@@ -239,7 +239,7 @@ class OrdersController < ApplicationController
private
def set_order
@order = current_user.orders.includes(:tickets, :event).find(params[:id])
@order = current_user.orders.includes(:tickets, :event).find(params[:order_id] || params[:id])
rescue ActiveRecord::RecordNotFound
redirect_to root_path, alert: "Commande non trouvée"
end

35
app/controllers/tickets_controller.rb
View File

@@ -3,7 +3,7 @@
# This controller now primarily handles legacy redirects and backward compatibility
# Most ticket creation functionality has been moved to OrdersController
class TicketsController < ApplicationController
before_action :authenticate_user!, only: [ :payment_success, :payment_cancel ]
before_action :authenticate_user!, only: [ :show, :ticket_view ]
before_action :set_event, only: [ :checkout, :retry_payment ]
@@ -23,37 +23,20 @@ class TicketsController < ApplicationController
redirect_to event_path(@event.slug, @event), alert: "Aucun billet en attente de paiement"
end
# Redirect to order-based payment success
def payment_success
redirect_to order_payment_success_path(session_id: params[:session_id])
end
# Redirect to order-based payment cancel
def payment_cancel
redirect_to order_payment_cancel_path
end
# Redirect retry payment to order system
def retry_payment
@event = Event.includes(:ticket_types).find(params[:id])
# Look for draft order for this event
order = current_user.orders.find_by(event: @event, status: "draft")
if order&.can_retry_payment?
redirect_to retry_payment_order_path(order)
else
redirect_to event_path(@event.slug, @event),
alert: "Aucune commande disponible pour un nouveau paiement"
end
end
def show
@ticket = current_user.orders.joins(:tickets).find(params[:ticket_id])
@event = @ticket.event
rescue ActiveRecord::RecordNotFound
redirect_to dashboard_path, alert: "Billet non trouvé"
end
def ticket_view
@ticket = current_user.orders.joins(:tickets).find(params[:ticket_id])
@event = @ticket.event
rescue ActiveRecord::RecordNotFound
redirect_to dashboard_path, alert: "Billet non trouvé"
end
private
def set_event

12
app/javascript/controllers/ticket_selection_controller.js
View File

@@ -10,12 +10,17 @@ export default class extends Controller {
"checkoutButton",
"form",
];
static values = { eventSlug: String, eventId: String };
static values = { targetUrl: String, eventSlug: String, eventId: String };
// Initialize the controller and update the cart summary
connect() {
console.log("TicketSelectionController connected");
console.log("Target URL: ", this.target);
this.updateCartSummary();
this.bindFormSubmission();
}
// Bind form submission to handle cart storage
@@ -118,8 +123,9 @@ export default class extends Controller {
await this.storeCartInSession(cartData);
// Redirect to event-scoped orders/new page
const OrderNewUrl = `/events/${this.eventSlugValue}.${this.eventIdValue}/orders/new`;
window.location.href = OrderNewUrl;
// const orderNewUrl = `/orders/new/events/${this.eventSlugValue}.${this.eventIdValue}`;
const orderNewUrl = `/orders/new/events/${this.eventSlugValue}.${this.eventIdValue}`;
window.location.href = orderNewUrl;
} catch (error) {
console.error("Error storing cart:", error);
alert("Une erreur est survenue. Veuillez réessayer.");

6
app/views/components/_header.html.erb
View File

@@ -30,7 +30,7 @@
<path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clip-rule="evenodd" />
</svg>
</button>
<!-- User Dropdown Menu -->
<div data-header-target="userMenu" class="hidden absolute right-0 mt-2 w-56 bg-white rounded-lg shadow-lg border border-gray-200 py-1 z-50">
<div class="px-4 py-2 text-sm text-gray-900 border-b border-gray-100">
@@ -49,9 +49,9 @@
</div>
</div>
<% else %>
<%= link_to t("header.login"), new_user_session_path,
<%= link_to "Se connecter", new_user_session_path,
class: "text-gray-100 hover:text-purple-200 px-3 py-2 rounded-md text-sm font-medium transition-colors duration-200" %>
<%= link_to t("header.register"), new_user_registration_path,
<%= link_to "S'inscrire", new_user_registration_path,
class: "bg-purple-600 text-white font-medium py-2 px-4 rounded-lg hover:bg-purple-700 transition-colors duration-200" %>
<% end %>
</div>

3
app/views/events/show.html.erb
View File

@@ -197,7 +197,8 @@
<!-- Right Column: Ticket Selection -->
<div class="lg:col-span-1">
<%= form_with url: event_order_new_path(@event.slug, @event.id), method: :get, id: "checkout_form", local: true, data: {
<%= form_with url: order_new_path(@event.slug, @event.id), method: :get, id: "checkout_form", local: true, data: {
target: order_new_path(@event.slug, @event.id),
controller: "ticket-selection",
ticket_selection_target: "form",
ticket_selection_event_slug_value: @event.slug,

2
app/views/orders/new.html.erb
View File

@@ -89,7 +89,7 @@
<p class="text-gray-600 max-w-md mx-auto">Veuillez fournir les prénoms et noms des personnes qui utiliseront les billets.</p>
</div>
<%= form_with url: event_order_create_path(@event.slug, @event.id), method: :post, local: true, class: "space-y-8" do |form| %>
<%= form_with url: order_create_path(@event.slug, @event.id), method: :post, local: true, class: "space-y-8" do |form| %>
<div class="space-y-6">
<div class="flex items-center justify-center mb-2">
<div class="bg-purple-600 rounded-full p-2 mr-3">

2
app/views/orders/show.html.erb
View File

@@ -88,7 +88,7 @@
</div>
<% end %>
<% if @order.can_retry_payment? %>
<%= link_to checkout_order_path(@order), class: "bg-purple-600 hover:bg-purple-700 text-white font-medium py-2 px-4 rounded-lg transition-colors" do %>
<%= link_to order_checkout_path(@order), class: "bg-purple-600 hover:bg-purple-700 text-white font-medium py-2 px-4 rounded-lg transition-colors" do %>
<div class="flex items-center">
<svg class="w-4 h-4 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 10h18M7 15h1m4 0h1m-7 4h12a3 3 0 003-3V8a3 3 0 00-3-3H6a3 3 0 00-3 3v8a3 3 0 003 3z"/>