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

develop #3

Merged
kbe merged 227 commits from develop into main 2025-09-16 14:35:23 +00:00
Conversation 0 Commits 227 Files Changed 295 +125 -40
4 changed files with 125 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit da420ccd76 - Show all commits

18
app/controllers/orders_controller.rb
View File

@@ -12,7 +12,7 @@ class OrdersController < ApplicationController
# On this page user can see order summary and complete the tickets details
# (first name and last name) for each ticket ordered
def new
@cart_data = session[:pending_cart] || {}
@cart_data = params[:cart_data] || session[:pending_cart] || {}
if @cart_data.empty?
redirect_to event_path(@event.slug, @event), alert: "Veuillez d'abord sélectionner vos billets sur la page de l'événement"
@@ -44,7 +44,7 @@ class OrdersController < ApplicationController
# Here a new order is created with associated tickets in draft state.
# When user is ready they can proceed to payment via the order checkout
def create
@cart_data = session[:pending_cart] || {}
@cart_data = params[:cart_data] || session[:pending_cart] || {}
if @cart_data.empty?
redirect_to event_path(@event.slug, @event), alert: "Aucun billet sélectionné"
@@ -146,7 +146,7 @@ class OrdersController < ApplicationController
return
end
redirect_to order_checkout_path(@order)
redirect_to checkout_order_path(@order)
end
# Handle successful payment
@@ -158,7 +158,7 @@ class OrdersController < ApplicationController
Rails.logger.debug "Payment success - Stripe configured: #{stripe_configured}"
unless stripe_configured
redirect_to dashboard_path, alert: "Le système de paiement n'est pas correctement configuré. Veuillez contacter l'administrateur."
redirect_to root_path, alert: "Le système de paiement n'est pas correctement configuré. Veuillez contacter l'administrateur."
return
end
@@ -219,20 +219,20 @@ class OrdersController < ApplicationController
# Handle payment failure/cancellation
def payment_cancel
order_id = session[:draft_order_id]
order_id = params[:order_id] || session[:draft_order_id]
if order_id.present?
order = current_user.orders.find_by(id: order_id, status: "draft")
if order&.can_retry_payment?
redirect_to order_checkout_path(order),
redirect_to checkout_order_path(order),
alert: "Le paiement a été annulé. Vous pouvez réessayer."
else
session.delete(:draft_order_id)
redirect_to dashboard_path, alert: "Le paiement a été annulé et votre commande a expiré."
redirect_to root_path, alert: "Le paiement a été annulé et votre commande a expiré."
end
else
redirect_to dashboard_path, alert: "Le paiement a été annulé"
redirect_to root_path, alert: "Le paiement a été annulé"
end
end
@@ -241,7 +241,7 @@ class OrdersController < ApplicationController
def set_order
@order = current_user.orders.includes(:tickets, :event).find(params[:id])
rescue ActiveRecord::RecordNotFound
redirect_to dashboard_path, alert: "Commande non trouvée"
redirect_to root_path, alert: "Commande non trouvée"
end
def set_event

5
app/views/devise/registrations/edit.html.erb
View File

@@ -30,19 +30,18 @@
<div>
<%= f.label :password, "Nouveau mot de passe", class: "block text-sm font-medium text-neutral-700" %>
<i class="text-sm text-neutral-500">(laissez vide si vous ne souhaitez pas le changer)</i>
<%= f.password_field :password, autocomplete: "new-password",
class: "mt-1 block w-full px-3 py-2 border border-neutral-300 rounded-md shadow-sm placeholder-neutral-400 focus:outline-none focus:ring-purple-500 focus:border-purple-500 sm:text-sm" %>
</div>
<div>
<%= f.label :password_confirmation, t('devise.registrations.edit.confirm_new_password'), class: "block text-sm font-medium text-neutral-700" %>
<%= f.label :password_confirmation, "Confirmer le nouveau mot de passe", class: "block text-sm font-medium text-neutral-700" %>
<%= f.password_field :password_confirmation, autocomplete: "new-password",
class: "mt-1 block w-full px-3 py-2 border border-neutral-300 rounded-md shadow-sm placeholder-neutral-400 focus:outline-none focus:ring-purple-500 focus:border-purple-500 sm:text-sm" %>
</div>
<div>
<%= f.label :current_password, t('devise.registrations.edit.current_password'), class: "block text-sm font-medium text-neutral-700" %>
<%= f.label :current_password, "Mot de passe actuel", class: "block text-sm font-medium text-neutral-700" %>
<i class="text-sm text-neutral-500">(<%= t('devise.registrations.edit.current_password_required') %>)</i>
<%= f.password_field :current_password, autocomplete: "current-password",
class: "mt-1 block w-full px-3 py-2 border border-neutral-300 rounded-md shadow-sm placeholder-neutral-400 focus:outline-none focus:ring-purple-500 focus:border-purple-500 sm:text-sm" %>

104
app/views/orders/show.html.erb Normal file
View File

@@ -0,0 +1,104 @@
<div class="min-h-screen bg-gradient-to-br from-gray-50 to-gray-100 py-8">
<div class="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8">
<!-- Breadcrumb -->
<nav class="mb-8" aria-label="Breadcrumb">
<ol class="flex items-center space-x-2 text-sm">
<%= link_to root_path, class: "text-gray-500 hover:text-purple-600 transition-colors" do %>
<svg class="w-4 h-4 inline-block mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z"/>
</svg>
Accueil
<% end %>
<svg class="w-4 h-4 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/>
</svg>
<%= link_to events_path, class: "text-gray-500 hover:text-purple-600 transition-colors" do %>
Événements
<% end %>
<svg class="w-4 h-4 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/>
</svg>
<%= link_to event_path(@order.event.slug, @order.event), class: "text-gray-500 hover:text-purple-600 transition-colors" do %>
<%= @order.event.name %>
<% end %>
<svg class="w-4 h-4 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/>
</svg>
<li class="font-medium text-gray-900" aria-current="page">Commande #<%= @order.id %></li>
</ol>
</nav>
<div class="bg-white rounded-2xl shadow-xl p-6 md:p-8">
<div class="border-b border-gray-200 pb-6 mb-6">
<h1 class="text-2xl font-bold text-gray-900 mb-2">Détails de la commande</h1>
<div class="flex items-center text-sm text-gray-600 space-x-4">
<div class="flex items-center">
<svg class="w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"/>
</svg>
Commande #<%= @order.id %>
</div>
<div class="flex items-center">
<svg class="w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z"/>
</svg>
<%= @order.status.titleize %>
</div>
</div>
</div>
<!-- Order Items -->
<div class="space-y-4 mb-6">
<h3 class="text-lg font-semibold text-gray-900 mb-4">Billets commandés</h3>
<% @tickets.each do |ticket| %>
<div class="flex items-center justify-between py-4 border-b border-gray-100 last:border-b-0">
<div class="flex-1 min-w-0">
<h4 class="text-sm font-medium text-gray-900"><%= ticket.ticket_type.name %></h4>
<div class="flex items-center text-xs text-gray-500 mt-1">
<svg class="w-3 h-3 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"/>
</svg>
<%= ticket.first_name %> <%= ticket.last_name %>
</div>
<div class="text-xs text-gray-500 mt-1">
Statut: <%= ticket.status.titleize %>
</div>
</div>
<div class="text-right">
<div class="text-lg font-semibold text-gray-900"><%= ticket.price_euros %>€</div>
</div>
</div>
<% end %>
</div>
<!-- Order Total -->
<div class="border-t border-gray-200 pt-6">
<div class="flex items-center justify-between text-lg">
<span class="font-medium text-gray-900">Total</span>
<span class="font-bold text-2xl text-purple-600"><%= @order.total_amount_euros %>€</span>
</div>
<p class="text-xs text-gray-500 mt-2">TVA incluse</p>
</div>
<!-- Actions -->
<div class="border-t border-gray-200 pt-6 mt-6">
<div class="flex space-x-4">
<%= link_to event_path(@order.event.slug, @order.event), class: "bg-gray-100 hover:bg-gray-200 text-gray-700 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="M10 19l-7-7m0 0l7-7m-7 7h18"/>
</svg>
Retour à l'événement
</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 %>
<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"/>
</svg>
Procéder au paiement
</div>
<% end %>
<% end %>
</div>
</div>
</div>
</div>
</div>

38
test/controllers/orders_controller_test.rb
View File

@@ -72,11 +72,9 @@ class OrdersControllerTest < ActionDispatch::IntegrationTest
# === New Action Tests ===
test "should get new with valid event" do
# Mock session to have cart data - use integration test syntax
get event_order_new_path(@event.slug, @event.id), session: {
pending_cart: {
@ticket_type.id.to_s => { "quantity" => "2" }
}
# Pass cart data as parameter for testing
get event_order_new_path(@event.slug, @event.id), params: {
cart_data: { @ticket_type.id.to_s => { "quantity" => "2" } }
}
assert_response :success
@@ -89,18 +87,14 @@ class OrdersControllerTest < ActionDispatch::IntegrationTest
end
test "new should redirect when cart is empty" do
# Clear any cart data
@request.session[:pending_cart] = {}
get event_order_new_path(@event.slug, @event.id)
# Pass empty cart data as parameter
get event_order_new_path(@event.slug, @event.id), params: { cart_data: {} }
assert_redirected_to event_path(@event.slug, @event)
assert_match /sélectionner vos billets/, flash[:alert]
end
test "new should redirect when no cart data" do
# No cart data in session
@request.session.delete(:pending_cart)
# No cart data passed as parameter
get event_order_new_path(@event.slug, @event.id)
assert_redirected_to event_path(@event.slug, @event)
assert_match /sélectionner vos billets/, flash[:alert]
@@ -109,13 +103,10 @@ class OrdersControllerTest < ActionDispatch::IntegrationTest
# === Create Action Tests ===
test "should create order with valid ticket data" do
@request.session[:pending_cart] = {
@ticket_type.id.to_s => { "quantity" => "1" }
}
assert_difference "Order.count", 1 do
assert_difference "Ticket.count", 1 do
post event_order_create_path(@event.slug, @event.id), params: {
cart_data: { @ticket_type.id.to_s => { "quantity" => "1" } },
tickets_attributes: {
"0" => {
ticket_type_id: @ticket_type.id,
@@ -139,10 +130,8 @@ class OrdersControllerTest < ActionDispatch::IntegrationTest
end
test "create should redirect when cart is empty" do
@request.session[:pending_cart] = {}
assert_no_difference "Order.count" do
post event_order_create_path(@event.slug, @event.id)
post event_order_create_path(@event.slug, @event.id), params: { cart_data: {} }
end
assert_redirected_to event_path(@event.slug, @event)
@@ -150,11 +139,8 @@ class OrdersControllerTest < ActionDispatch::IntegrationTest
end
test "create should handle missing ticket names" do
@request.session[:pending_cart] = {
@ticket_type.id.to_s => { "quantity" => "1" }
}
post event_order_create_path(@event.slug, @event.id), params: {
cart_data: { @ticket_type.id.to_s => { "quantity" => "1" } },
tickets_attributes: {
"0" => {
ticket_type_id: @ticket_type.id,
@@ -281,16 +267,12 @@ class OrdersControllerTest < ActionDispatch::IntegrationTest
# === Payment Cancel Tests ===
test "payment_cancel should redirect to checkout if order can retry" do
@request.session[:draft_order_id] = @order.id
get order_payment_cancel_path
get order_payment_cancel_path, params: { order_id: @order.id }
assert_redirected_to checkout_order_path(@order)
assert_match /paiement a été annulé.*réessayer/, flash[:alert]
end
test "payment_cancel should redirect to root if no order in session" do
@request.session.delete(:draft_order_id)
get order_payment_cancel_path
assert_redirected_to root_path
assert_match /paiement a été annulé/, flash[:alert]