refactor: migrate payment success views to orders system and add promoter seed data

Merge pull request 'feat/free-ticket' (#4 ) from feat/free-ticket into develop
Reviewed-on: #4
2025-09-16 21:32:42 +02:00 · 2025-09-16 15:27:51 +00:00 · 2025-09-16 17:25:14 +02:00 · 2025-09-16 17:22:00 +02:00 · 2025-09-16 17:15:09 +02:00 · 2025-09-16 17:00:04 +02:00
28 changed files with 236 additions and 371 deletions
--- a/app/controllers/orders_controller.rb
+++ b/app/controllers/orders_controller.rb
@@ -126,6 +126,15 @@ class OrdersController < ApplicationController
    @total_amount = @order.total_amount_cents
    @expiring_soon = @order.expiring_soon?

+    # For free orders, automatically mark as paid and redirect to success
+    if @order.free?
+      @order.mark_as_paid!
+      session.delete(:pending_cart)
+      session.delete(:ticket_names)
+      session.delete(:draft_order_id)
+      return redirect_to order_path(@order), notice: "Vos billets gratuits ont été confirmés !"
+    end
+
    # Create Stripe checkout session if Stripe is configured
    if Rails.application.config.stripe[:secret_key].present?
      begin
--- a/app/controllers/promoter/events_controller.rb
+++ b/app/controllers/promoter/events_controller.rb
@@ -5,7 +5,7 @@
 class Promoter::EventsController < ApplicationController
  before_action :authenticate_user!
  before_action :ensure_can_manage_events!
-  before_action :set_event, only: [ :show, :edit, :update, :destroy, :publish, :unpublish, :cancel, :mark_sold_out, :duplicate ]
+  before_action :set_event, only: [ :show, :edit, :update, :destroy, :publish, :unpublish, :cancel, :mark_sold_out, :mark_available, :duplicate ]

  # Display all events for the current promoter
  def index
@@ -93,6 +93,16 @@ class Promoter::EventsController < ApplicationController
    end
  end

+  # Mark event as available again
+  def mark_available
+    if @event.sold_out?
+      @event.update(state: :published)
+      redirect_to promoter_event_path(@event), notice: "Event marqué comme disponible!"
+    else
+      redirect_to promoter_event_path(@event), alert: "Cet event ne peut pas être marqué comme disponible."
+    end
+  end
+
  # Duplicate an event and all its ticket types
  def duplicate
    clone_ticket_types = params[:clone_ticket_types] == "true"
--- a/app/helpers/tickets_helper.rb
+++ b/app/helpers/tickets_helper.rb
@@ -1,2 +1,9 @@
 module TicketsHelper
+  def format_ticket_price(price_cents)
+    if price_cents == 0
+      "Gratuit"
+    else
+      number_to_currency(price_cents / 100.0, unit: "€")
+    end
+  end
 end
--- a/app/mailers/ticket_mailer.rb
+++ b/app/mailers/ticket_mailer.rb
@@ -1,4 +1,6 @@
 class TicketMailer < ApplicationMailer
+  helper :tickets
+
  def purchase_confirmation_order(order)
    @order = order
    @user = order.user
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -55,7 +55,6 @@ class Event < ApplicationRecord
  # Scope for published events ordered by start time
  scope :upcoming, -> { published.where("start_time >= ?", Time.current).order(start_time: :asc) }

-
  # === Instance Methods ===

  # Check if coordinates were successfully geocoded or are fallback coordinates
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -116,6 +116,11 @@ class Order < ApplicationRecord
    promoter_payout_cents / 100.0
  end

+  # Check if order contains only free tickets
+  def free?
+    total_amount_cents == 0
+  end
+
  # Create Stripe invoice for accounting records
  #
  # This method creates a post-payment invoice in Stripe for accounting purposes
--- a/app/models/ticket.rb
+++ b/app/models/ticket.rb
@@ -9,7 +9,7 @@ class Ticket < ApplicationRecord
  validates :qr_code, presence: true, uniqueness: true
  validates :order_id, presence: true
  validates :ticket_type_id, presence: true
-  validates :price_cents, presence: true, numericality: { greater_than: 0 }
+  validates :price_cents, presence: true, numericality: { greater_than_or_equal_to: 0 }
  validates :status, presence: true, inclusion: { in: %w[draft active used expired refunded] }
  validates :first_name, presence: true
  validates :last_name, presence: true
--- a/app/models/ticket_type.rb
+++ b/app/models/ticket_type.rb
@@ -6,7 +6,7 @@ class TicketType < ApplicationRecord
  # Validations
  validates :name, presence: true, length: { minimum: 3, maximum: 50 }
  validates :description, presence: true, length: { minimum: 10, maximum: 500 }
-  validates :price_cents, presence: true, numericality: { greater_than: 0 }
+  validates :price_cents, presence: true, numericality: { greater_than_or_equal_to: 0 }
  validates :quantity, presence: true, numericality: { only_integer: true, greater_than: 0 }
  validates :sale_start_at, presence: true
  validates :sale_end_at, presence: true
@@ -48,6 +48,10 @@ class TicketType < ApplicationRecord
    [ quantity - tickets.count, 0 ].max
  end

+  def free?
+    price_cents == 0
+  end
+
  def sales_status
    return :draft if sale_start_at.nil? || sale_end_at.nil?
    return :expired if sale_end_at < Time.current
--- a/app/views/components/_ticket_card.html.erb
+++ b/app/views/components/_ticket_card.html.erb
@@ -7,7 +7,7 @@
      </div>
      <div class="text-right">
        <p class="text-xl font-bold text-purple-700 <%= "text-gray-400" if sold_out %>">
-          <%= number_to_currency(price_cents / 100.0, unit: "€") %>
+          <%= format_ticket_price(price_cents) %>
        </p>
      </div>
    </div>
--- a/app/views/events/payment_success.html.erb
+++ b/app/views/events/payment_success.html.erb
@@ -1,150 +0,0 @@
-<div class="min-h-screen bg-gradient-to-br from-purple-50 to-indigo-50 py-12 px-4 sm:px-6">
-  <div class="max-w-3xl mx-auto">
-    <div class="bg-white rounded-2xl shadow-xl overflow-hidden">
-      <!-- Header -->
-      <div class="bg-gradient-to-r from-purple-600 to-indigo-700 px-6 py-8 text-center">
-        <div class="flex justify-center mb-4">
-          <div class="w-16 h-16 rounded-full bg-white/20 flex items-center justify-center">
-            <svg class="w-8 h-8 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path>
-            </svg>
-          </div>
-        </div>
-        <h1 class="text-3xl font-bold text-white mb-2">Paiement réussi !</h1>
-        <p class="text-purple-100">Félicitations pour votre achat</p>
-      </div>
-
-      <!-- Content -->
-      <div class="p-6 sm:p-8">
-        <div class="text-center mb-8">
-          <p class="text-xl text-gray-700">
-            Vos billets pour <span class="font-bold text-purple-700"><%= @event.name %></span> ont été achetés avec succès.
-          </p>
-          <p class="text-gray-500 mt-2">
-            Un email de confirmation avec vos billets a été envoyé à <span class="font-medium"><%= current_user.email %></span>
-          </p>
-        </div>
-
-        <!-- Event Details -->
-        <div class="bg-gray-50 rounded-xl p-6 mb-8">
-          <h2 class="text-xl font-bold text-gray-900 mb-4 flex items-center">
-            <svg class="w-5 h-5 mr-2 text-purple-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"></path>
-            </svg>
-            Détails de l'événement
-          </h2>
-          <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-            <div class="flex items-center p-3 bg-white rounded-lg">
-              <svg class="w-5 h-5 text-purple-500 mr-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z"></path>
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 11a3 3 0 11-6 0 3 3 0 016 0z"></path>
-              </svg>
-              <div>
-                <p class="text-xs text-gray-500">Lieu</p>
-                <p class="font-medium"><%= @event.venue_name %></p>
-              </div>
-            </div>
-            <div class="flex items-center p-3 bg-white rounded-lg">
-              <svg class="w-5 h-5 text-purple-500 mr-3" 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"></path>
-              </svg>
-              <div>
-                <p class="text-xs text-gray-500">Date & Heure</p>
-                <p class="font-medium"><%= @event.start_time.strftime("%d %B %Y à %H:%M") %></p>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!-- Tickets -->
-        <div class="mb-8">
-          <h2 class="text-xl font-bold text-gray-900 mb-4 flex items-center">
-            <svg class="w-5 h-5 mr-2 text-purple-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 5v2m0 4v2m0 4v2M5 5a2 2 0 00-2 2v3a2 2 0 110 4v3a2 2 0 002 2h14a2 2 0 002-2v-3a2 2 0 110-4V7a2 2 0 00-2-2H5z"></path>
-            </svg>
-            Vos billets
-          </h2>
-
-          <div class="space-y-4">
-            <% @tickets.each do |ticket| %>
-              <div class="bg-gradient-to-r from-purple-50 to-indigo-50 rounded-xl border border-purple-100 p-5">
-                <div class="flex flex-col sm:flex-row sm:items-center justify-between gap-4">
-                  <div class="flex-1">
-                    <div class="flex items-center">
-                      <div class="w-10 h-10 rounded-lg bg-purple-100 flex items-center justify-center mr-4">
-                        <svg class="w-5 h-5 text-purple-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 5v2m0 4v2m0 4v2M5 5a2 2 0 00-2 2v3a2 2 0 110 4v3a2 2 0 002 2h14a2 2 0 002-2v-3a2 2 0 110-4V7a2 2 0 00-2-2H5z"></path>
-                        </svg>
-                      </div>
-                      <div>
-                        <h3 class="font-bold text-gray-900"><%= ticket.ticket_type.name %></h3>
-                        <p class="text-sm text-gray-600">Prix: <span class="font-medium"><%= number_to_currency(ticket.price_cents / 100.0, unit: "€") %></span></p>
-                      </div>
-                    </div>
-                  </div>
-
-                  <div class="flex items-center space-x-2">
-                    <%= link_to ticket_download_path(ticket.qr_code, format: :pdf),
-                        class: "inline-flex items-center px-4 py-2 btn btn-primary rounded-lg transition-all duration-200 text-sm font-medium shadow-sm" do %>
-                      <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="M12 10v6m0 0l-3-3m3 3l3-3m2 8H7a2 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"></path>
-                      </svg>
-                      Télécharger PDF
-                    <% end %>
-                  </div>
-                </div>
-
-                <div class="mt-4 pt-4 border-t border-purple-100 flex items-center justify-between">
-                  <div class="flex items-center">
-                    <svg class="w-4 h-4 text-gray-500 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z"></path>
-                    </svg>
-                    <span class="text-xs text-gray-500">Code QR: <%= ticket.qr_code[0..7] %></span>
-                  </div>
-                  <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-green-100 text-green-800">
-                    Actif
-                  </span>
-                </div>
-              </div>
-            <% end %>
-          </div>
-        </div>
-
-        <!-- Important Notice -->
-        <div class="bg-blue-50 border border-blue-100 rounded-xl p-5 mb-8">
-          <div class="flex">
-            <svg class="w-5 h-5 text-blue-500 mr-3 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
-            </svg>
-            <div>
-              <h3 class="font-bold text-blue-800 mb-1">Important</h3>
-              <p class="text-sm text-blue-700">
-                Veuillez télécharger et sauvegarder vos billets. Présentez-les à l'entrée du lieu pour accéder à l'événement.
-                Un email de confirmation avec vos billets a été envoyé à votre adresse email.
-              </p>
-            </div>
-          </div>
-        </div>
-
-        <!-- Action Buttons -->
-        <div class="flex flex-col sm:flex-row gap-4 justify-center">
-          <%= link_to dashboard_path,
-              class: "inline-flex items-center justify-center px-6 py-3 btn btn-primary rounded-xl transition-all duration-200 font-medium shadow-sm" do %>
-            <svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"></path>
-            </svg>
-            Tableau de bord
-          <% end %>
-
-          <%= link_to events_path,
-              class: "inline-flex items-center justify-center px-6 py-3 bg-white text-gray-700 rounded-xl border border-gray-300 hover:bg-gray-50 transition-all duration-200 font-medium shadow-sm" do %>
-            <svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"></path>
-            </svg>
-            Voir plus d'événements
-          <% end %>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -137,8 +137,6 @@
              ticket_selection_event_slug_value: @event.slug,
              ticket_selection_event_id_value: @event.id,
              ticket_selection_order_new_url_value: event_order_new_path(@event.slug, @event.id),
-    ticket_selection_store_cart_url_value: api_v1_store_cart_path,
-    ticket_selection_order_new_url_value: event_order_new_path(@event.slug, @event.id),
              ticket_selection_store_cart_url_value: api_v1_store_cart_path
  } do |form| %>

--- a/app/views/orders/checkout.html.erb
+++ b/app/views/orders/checkout.html.erb
@@ -102,7 +102,7 @@
        <!-- Order Total -->
        <div class=" pt-12">
          <div class="space-y-2">
-            <div class="flex items-center justify-between text-lg pt-2 border-t border-gray-200">
+            <div class="flex items-center justify-between text-lg pt-2">
              <span class="font-medium text-gray-900">Total</span>
              <span class="font-bold text-2xl text-purple-600"><%= @order.total_amount_euros %>€</span>
            </div>
--- a/app/views/orders/payment_success.html.erb
+++ b/app/views/orders/payment_success.html.erb
@@ -126,7 +126,7 @@
        <!-- Total -->
        <div class="mt-6">
          <div class="space-y-2">
-            <div class="flex items-center justify-between text-lg pt-2 border-t border-gray-200">
+            <div class="flex items-center justify-between text-lg pt-2">
              <span class="font-medium text-gray-900">Total payé</span>
              <span class="font-bold text-2xl text-green-600">
                <%= @order.total_amount_euros %>€
--- a/app/views/orders/show.html.erb
+++ b/app/views/orders/show.html.erb
@@ -96,7 +96,7 @@

        <!-- Total -->
        <div class="border-t border-gray-200 pt-6 mt-6">
-            <div class="flex items-center justify-between text-lg pt-2 border-t border-gray-200">
+            <div class="flex items-center justify-between text-lg pt-2">
              <span class="font-medium text-gray-900">Total <%= @order.status == 'paid' || @order.status == 'completed' ? 'payé' : 'à payer' %></span>
              <span class="font-bold text-2xl <%= @order.status == 'paid' || @order.status == 'completed' ? 'text-green-600' : 'text-purple-600' %>">
                <%= @order.total_amount_euros %>€
--- a/app/views/promoter/events/show.html.erb
+++ b/app/views/promoter/events/show.html.erb
@@ -132,10 +132,14 @@
      <div class="bg-blue-50 border border-blue-200 rounded-2xl p-4">
        <div class="flex items-center">
          <i data-lucide="users" class="w-5 h-5 text-blue-400 mr-3"></i>
-          <div>
+          <div class="flex-1">
            <h3 class="text-sm font-medium text-blue-900">Événement complet</h3>
            <p class="text-sm text-blue-700">Tous les billets pour cet événement ont été vendus.</p>
          </div>
+          <%= button_to mark_available_promoter_event_path(@event), method: :patch, class: "ml-4 inline-flex items-center px-3 py-1 bg-white border border-blue-300 text-blue-700 text-sm font-medium rounded-lg hover:bg-blue-50 transition-colors duration-200" do %>
+            <i data-lucide="refresh-ccw" class="w-4 h-4 mr-1"></i>
+            Marquer comme disponible
+          <% end %>
        </div>
      </div>
    <% end %>
@@ -273,10 +277,19 @@
            <i data-lucide="ticket" class="w-4 h-4 mr-2"></i>
            Gérer les types de billets
          <% end %>
-          <%= button_to mark_sold_out_promoter_event_path(@event), method: :patch, class: "w-full inline-flex items-center justify-center px-4 py-3 bg-gray-50 text-gray-700 font-medium text-sm rounded-lg hover:bg-gray-100 transition-colors duration-200", disabled: !@event.published? do %>
+          
+          <% if @event.sold_out? %>
+            <%= button_to mark_available_promoter_event_path(@event), method: :patch, class: "w-full inline-flex items-center justify-center px-4 py-3 bg-blue-50 text-blue-700 font-medium text-sm rounded-lg hover:bg-blue-100 transition-colors duration-200" do %>
+              <i data-lucide="refresh-ccw" class="w-4 h-4 mr-2"></i>
+              Marquer comme disponible
+            <% end %>
+          <% elsif @event.published? %>
+            <%= button_to mark_sold_out_promoter_event_path(@event), method: :patch, class: "w-full inline-flex items-center justify-center px-4 py-3 bg-gray-50 text-gray-700 font-medium text-sm rounded-lg hover:bg-gray-100 transition-colors duration-200" do %>
              <i data-lucide="users" class="w-4 h-4 mr-2"></i>
              Marquer comme complet
            <% end %>
+          <% end %>
+          
          <hr class="border-gray-200">
          <%= button_to promoter_event_path(@event), method: :delete,
              data: { confirm: "Êtes-vous sûr de vouloir supprimer cet événement ? Cette action est irréversible." },
--- a/app/views/promoter/ticket_types/edit.html.erb
+++ b/app/views/promoter/ticket_types/edit.html.erb
@@ -81,7 +81,7 @@
            <div class="relative">
              <%= form.number_field :price_euros,
                  step: 0.01,
-                  min: 0.01,
+                  min: 0,
                  class: "w-full px-4 py-2 pl-8 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-transparent",
                  data: { "ticket-type-form-target": "price", action: "input->ticket-type-form#updateTotal" } %>
              <div class="absolute left-3 top-2.5 text-gray-500">€</div>
@@ -91,6 +91,8 @@
                <i data-lucide="alert-triangle" class="w-4 h-4 inline mr-1"></i>
                Modifier le prix n'affectera pas les billets déjà vendus
              </p>
+            <% else %>
+              <p class="mt-1 text-sm text-gray-500">Prix unitaire du billet (0€ pour un billet gratuit)</p>
            <% end %>
          </div>

@@ -163,8 +165,10 @@
            <div class="flex">
              <i data-lucide="info" class="w-5 h-5 text-blue-400 mt-0.5 mr-2"></i>
              <p class="text-sm text-blue-800">
-                <strong>Événement:</strong> <%= @event.start_time.strftime("%d/%m/%Y à %H:%M") %><br>
+                <strong>Début d'événement :</strong> <%= @event.start_time.strftime("%d/%m/%Y à %H:%M") %><br>
+                <% unless @event.allow_booking_during_event? %>
                  Les ventes doivent se terminer avant le début de l'événement.
+                <% end %>
              </p>
            </div>
          </div>
@@ -208,12 +212,6 @@
          <%= link_to promoter_event_ticket_type_path(@event, @ticket_type), class: "text-gray-500 hover:text-gray-700 transition-colors" do %>
            Annuler
          <% end %>
-          <% if @ticket_type.tickets.any? %>
-            <p class="text-sm text-yellow-600">
-              <i data-lucide="info" class="w-4 h-4 inline mr-1"></i>
-              <%= pluralize(@ticket_type.tickets.count, 'billet') %> déjà vendu(s)
-            </p>
-          <% end %>
        </div>

        <div class="flex items-center space-x-3">
--- a/app/views/promoter/ticket_types/new.html.erb
+++ b/app/views/promoter/ticket_types/new.html.erb
@@ -68,12 +68,12 @@
            <div class="relative">
              <%= form.number_field :price_euros,
                  step: 0.01,
-                  min: 0.01, 
+                  min: 0,
                  class: "w-full px-4 py-2 pl-8 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-transparent",
                  data: { "ticket-type-form-target": "price", action: "input->ticket-type-form#updateTotal" } %>
              <div class="absolute left-3 top-2.5 text-gray-500">€</div>
            </div>
-            <p class="mt-1 text-sm text-gray-500">Prix unitaire du billet</p>
+            <p class="mt-1 text-sm text-gray-500">Prix unitaire du billet (0€ pour un billet gratuit)</p>
          </div>

          <div>
@@ -123,8 +123,11 @@
            <div class="flex">
              <i data-lucide="info" class="w-5 h-5 text-blue-400 mt-0.5 mr-2"></i>
              <p class="text-sm text-blue-800">
-                <strong>Événement:</strong> <%= @event.start_time.strftime("%d/%m/%Y à %H:%M") %><br>
+                <strong>Début d'événement :</strong> <%= @event.start_time.strftime("%d/%m/%Y à %H:%M") %><br>
+
+                <% unless @event.allow_booking_during_event? %>
                  Les ventes doivent se terminer avant le début de l'événement.
+                <% end %>
              </p>
            </div>
          </div>
--- a/app/views/promoter/ticket_types/show.html.erb
+++ b/app/views/promoter/ticket_types/show.html.erb
@@ -138,7 +138,7 @@
                </div>
                <div class="text-right">
                  <p class="text-sm font-medium text-gray-900">
-                    <%= number_to_currency(ticket.price_cents / 100.0, unit: "€") %>
+                    <%= format_ticket_price(ticket.price_cents) %>
                  </p>
                  <p class="text-xs text-gray-500">
                    <%= ticket.created_at.strftime("%d/%m/%Y") %>
@@ -164,7 +164,7 @@
        <div class="space-y-4">
          <div class="text-center p-4 bg-purple-50 rounded-lg">
            <div class="text-3xl font-bold text-purple-600">
-              <%= number_to_currency(@ticket_type.price_euros, unit: "€") %>
+              <%= format_ticket_price(@ticket_type.price_cents) %>
            </div>
            <div class="text-sm text-gray-500">Prix unitaire</div>
          </div>
--- a/app/views/ticket_mailer/purchase_confirmation.html.erb
+++ b/app/views/ticket_mailer/purchase_confirmation.html.erb
@@ -57,7 +57,7 @@
                <p style="margin: 5px 0 0;"><a href="<%= ticket_url(ticket) %>" style="color: #4c1d95; text-decoration: none; font-size: 14px;">📱 Voir le détail et le code QR</a></p>
              </div>
              <div style="text-align: right;">
-                <p style="margin: 0; font-weight: bold; color: #212529;"><%= number_to_currency(ticket.price_cents / 100.0, unit: "€") %></p>
+                <p style="margin: 0; font-weight: bold; color: #212529;"><%= format_ticket_price(ticket.price_cents) %></p>
              </div>
            </div>
          </div>
@@ -83,7 +83,7 @@
          </div>
          <div style="text-align: right;">
            <p style="margin: 0; color: #6c757d; font-size: 14px;">Prix</p>
-            <p style="margin: 5px 0 0; font-weight: bold; color: #212529;"><%= number_to_currency(@ticket.price_cents / 100.0, unit: "€") %></p>
+            <p style="margin: 5px 0 0; font-weight: bold; color: #212529;"><%= format_ticket_price(@ticket.price_cents) %></p>
          </div>
        </div>

--- a/app/views/ticket_mailer/purchase_confirmation.text.erb
+++ b/app/views/ticket_mailer/purchase_confirmation.text.erb
@@ -13,11 +13,11 @@ DÉTAILS DE VOTRE COMMANDE
 Événement : <%= @event.name %>
 Date & heure : <%= @event.start_time.strftime("%d %B %Y à %H:%M") %>
 Nombre de billets : <%= @tickets.count %>
-Total : <%= number_to_currency(@order.total_amount_euros, unit: "€") %>
+Total : <%= @order.free? ? "Gratuit" : number_to_currency(@order.total_amount_euros, unit: "€") %>

 BILLETS INCLUS :
 <% @tickets.each_with_index do |ticket, index| %>
- Billet #<%= index + 1 %> : <%= ticket.ticket_type.name %> - <%= number_to_currency(ticket.price_cents / 100.0, unit: "€") %>
+- Billet #<%= index + 1 %> : <%= ticket.ticket_type.name %> - <%= format_ticket_price(ticket.price_cents) %>
 <% end %>

 Vos billets sont attachés à cet email en format PDF. Présentez-les à l'entrée de l'événement pour y accéder.
@@ -32,7 +32,7 @@ DÉTAILS DE VOTRE BILLET
 Événement : <%= @event.name %>
 Type de billet : <%= @ticket.ticket_type.name %>
 Date & heure : <%= @event.start_time.strftime("%d %B %Y à %H:%M") %>
-Prix : <%= number_to_currency(@ticket.price_cents / 100.0, unit: "€") %>
+Prix : <%= format_ticket_price(@ticket.price_cents) %>

 Votre billet est attaché à cet email en format PDF. Présentez-le à l'entrée de l'événement pour y accéder.

--- a/app/views/tickets/payment_success.html.erb
+++ b/app/views/tickets/payment_success.html.erb
@@ -1,150 +0,0 @@
-<div class="min-h-screen bg-gradient-to-br from-purple-50 to-indigo-50 py-12 px-4 sm:px-6">
-  <div class="max-w-3xl mx-auto">
-    <div class="bg-white rounded-2xl shadow-xl overflow-hidden">
-      <!-- Header -->
-      <div class="bg-gradient-to-r from-purple-600 to-indigo-700 px-6 py-8 text-center">
-        <div class="flex justify-center mb-4">
-          <div class="w-16 h-16 rounded-full bg-white/20 flex items-center justify-center">
-            <svg class="w-8 h-8 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path>
-            </svg>
-          </div>
-        </div>
-        <h1 class="text-3xl font-bold text-white mb-2">Paiement réussi !</h1>
-        <p class="text-purple-100">Félicitations pour votre achat</p>
-      </div>
-
-      <!-- Content -->
-      <div class="p-6 sm:p-8">
-        <div class="text-center mb-8">
-          <p class="text-xl text-gray-700">
-            Vos billets pour <span class="font-bold text-purple-700"><%= @event.name %></span> ont été achetés avec succès.
-          </p>
-          <p class="text-gray-500 mt-2">
-            Un email de confirmation avec vos billets a été envoyé à <span class="font-medium"><%= current_user.email %></span>
-          </p>
-        </div>
-
-        <!-- Event Details -->
-        <div class="bg-gray-50 rounded-xl p-6 mb-8">
-          <h2 class="text-xl font-bold text-gray-900 mb-4 flex items-center">
-            <svg class="w-5 h-5 mr-2 text-purple-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"></path>
-            </svg>
-            Détails de l'événement
-          </h2>
-          <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-            <div class="flex items-center p-3 bg-white rounded-lg">
-              <svg class="w-5 h-5 text-purple-500 mr-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z"></path>
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 11a3 3 0 11-6 0 3 3 0 016 0z"></path>
-              </svg>
-              <div>
-                <p class="text-xs text-gray-500">Lieu</p>
-                <p class="font-medium"><%= @event.venue_name %></p>
-              </div>
-            </div>
-            <div class="flex items-center p-3 bg-white rounded-lg">
-              <svg class="w-5 h-5 text-purple-500 mr-3" 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"></path>
-              </svg>
-              <div>
-                <p class="text-xs text-gray-500">Date & Heure</p>
-                <p class="font-medium"><%= @event.start_time.strftime("%d %B %Y à %H:%M") %></p>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!-- Tickets -->
-        <div class="mb-8">
-          <h2 class="text-xl font-bold text-gray-900 mb-4 flex items-center">
-            <svg class="w-5 h-5 mr-2 text-purple-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 5v2m0 4v2m0 4v2M5 5a2 2 0 00-2 2v3a2 2 0 110 4v3a2 2 0 002 2h14a2 2 0 002-2v-3a2 2 0 110-4V7a2 2 0 00-2-2H5z"></path>
-            </svg>
-            Vos billets
-          </h2>
-
-          <div class="space-y-4">
-            <% @tickets.each do |ticket| %>
-              <div class="bg-gradient-to-r from-purple-50 to-indigo-50 rounded-xl border border-purple-100 p-5">
-                <div class="flex flex-col sm:flex-row sm:items-center justify-between gap-4">
-                  <div class="flex-1">
-                    <div class="flex items-center">
-                      <div class="w-10 h-10 rounded-lg bg-purple-100 flex items-center justify-center mr-4">
-                        <svg class="w-5 h-5 text-purple-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 5v2m0 4v2m0 4v2M5 5a2 2 0 00-2 2v3a2 2 0 110 4v3a2 2 0 002 2h14a2 2 0 002-2v-3a2 2 0 110-4V7a2 2 0 00-2-2H5z"></path>
-                        </svg>
-                      </div>
-                      <div>
-                        <h3 class="font-bold text-gray-900"><%= ticket.ticket_type.name %></h3>
-                        <p class="text-sm text-gray-600">Prix: <span class="font-medium"><%= number_to_currency(ticket.price_cents / 100.0, unit: "€") %></span></p>
-                      </div>
-                    </div>
-                  </div>
-
-                  <div class="flex items-center space-x-2">
-                    <%= link_to ticket_download_path(ticket.qr_code, format: :pdf),
-                        class: "inline-flex items-center px-4 py-2 btn btn-primary rounded-lg transition-all duration-200 text-sm font-medium shadow-sm" do %>
-                      <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="M12 10v6m0 0l-3-3m3 3l3-3m2 8H7a2 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"></path>
-                      </svg>
-                      Télécharger PDF
-                    <% end %>
-                  </div>
-                </div>
-
-                <div class="mt-4 pt-4 border-t border-purple-100 flex items-center justify-between">
-                  <div class="flex items-center">
-                    <svg class="w-4 h-4 text-gray-500 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z"></path>
-                    </svg>
-                    <span class="text-xs text-gray-500">Code QR: <%= ticket.qr_code[0..7] %></span>
-                  </div>
-                  <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-green-100 text-green-800">
-                    Actif
-                  </span>
-                </div>
-              </div>
-            <% end %>
-          </div>
-        </div>
-
-        <!-- Important Notice -->
-        <div class="bg-blue-50 border border-blue-100 rounded-xl p-5 mb-8">
-          <div class="flex">
-            <svg class="w-5 h-5 text-blue-500 mr-3 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
-            </svg>
-            <div>
-              <h3 class="font-bold text-blue-800 mb-1">Important</h3>
-              <p class="text-sm text-blue-700">
-                Veuillez télécharger et sauvegarder vos billets. Présentez-les à l'entrée du lieu pour accéder à l'événement.
-                Un email de confirmation avec vos billets a été envoyé à votre adresse email.
-              </p>
-            </div>
-          </div>
-        </div>
-
-        <!-- Action Buttons -->
-        <div class="flex flex-col sm:flex-row gap-4 justify-center">
-          <%= link_to dashboard_path,
-              class: "inline-flex items-center justify-center px-6 py-3 btn btn-primary rounded-xl transition-all duration-200 font-medium shadow-sm" do %>
-            <svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"></path>
-            </svg>
-            Tableau de bord
-          <% end %>
-
-          <%= link_to events_path,
-              class: "inline-flex items-center justify-center px-6 py-3 bg-white text-gray-700 rounded-xl border border-gray-300 hover:bg-gray-50 transition-all duration-200 font-medium shadow-sm" do %>
-            <svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"></path>
-            </svg>
-            Voir plus d'événements
-          <% end %>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
--- a/app/views/tickets/show.html.erb
+++ b/app/views/tickets/show.html.erb
@@ -80,7 +80,7 @@
              <div>
                <label class="block text-sm font-medium text-gray-500 mb-1">Prix</label>
                <p class="text-xl font-bold text-gray-900">
-                  <%= number_to_currency(@ticket.price_euros, unit: "€", separator: ",", delimiter: " ", format: "%n %u") %>
+                  <%= format_ticket_price(@ticket.price_cents) %>
                </p>
              </div>
            </div>
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -81,6 +81,7 @@ Rails.application.routes.draw do
        patch :unpublish
        patch :cancel
        patch :mark_sold_out
+        patch :mark_available
        post :duplicate
      end

--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -112,3 +112,80 @@ events.each_with_index do |event, index|
 end

 puts "Created #{User.count} users, #{Event.count} events, and #{TicketType.count} ticket types"
+
+# Create regular user as promoter
+promoter = User.find_or_create_by!(email: "kbataille@vivaldi.net") do |u|
+  u.password = "lareunion974!"
+  u.password_confirmation = "lareunion974!"
+  u.last_name = nil
+  u.first_name = nil
+  u.is_professionnal = true
+end
+
+belle_epoque_event = Event.find_or_create_by!(name: "LA BELLE ÉPOQUE PAR SISLEY ÉVENTS") do |e|
+  e.slug = "la-belle-epoque-par-sisley-events"
+  e.state = :draft
+  e.description = "
+  Sisley évents Présente :
+  SAM 13 SEPT
+  LA BELLE ÉPOQUE de 18H à 2H
+  sur le Rooftop LE PATIO
+  ÉVÈNEMENT EN PLEIN AIR
+  Ambiance Rétro / old school : zouk , Ragga , kompa , Dancehall , hip hop , Groove , Rnb …
+  Restauration disponible sur place : Accras ,Allocos , specialités asiatique , japonaise et une large carte de choix de Pizzas pour vous régaler !
+  TARIF D'ENTRÉE : 10€ SUR PLACE UNIQUEMENT
+  Réservée aux + de 30 ans
+  Suivez nous sur Instagram : Sisley Évents
+  Le patio
+  38 avenue Leon Gaumont , Montreuil
+  Parking du Décathlon disponible , rue de la république, à 100m du Patio
+  "
+  e.venue_name = "Le Patio Rooftop"
+  e.venue_address = "38 Av. Léon Gaumont, 93100 Montreuil"
+  e.latitude = 48.862336
+  e.longitude = 2.441218
+  e.start_time = 3.days.from_now
+  e.end_time = 3.days.from_now + 8.hours
+  e.featured = false
+  e.image = "https://data.bizouk.com/cache1/events/images/10/78/87/b801a9a43266b4cc54bdda73bf34eec8_700_800_auto_97.jpg"
+  e.user = promoter
+  e.allow_booking_during_event = true
+end
+
+belle_epoque_event.update!(start_time: 3.days.from_now, end_time: 3.days.from_now + 8.hours)
+
+
+# Create ticket types for "La belle époque" event
+belle_epoque_event = Event.find_by!(slug: "la-belle-epoque-par-sisley-events")
+
+TicketType.find_or_create_by!(event: belle_epoque_event, name: "Free invitation valid before 7 p.m.") do |tt|
+  tt.description = "Free invitation ticket valid before 7 p.m. for La Belle Époque"
+  tt.price_cents = 0
+  tt.quantity = 50
+  tt.sale_start_at = Time.current
+  tt.sale_end_at = belle_epoque_event.start_time
+  tt.minimum_age = 30
+  tt.requires_id = true
+end
+
+TicketType.find_or_create_by!(event: belle_epoque_event, name: "ENTRY 10€ TO BE PAYED ON SITE ONLY") do |tt|
+  tt.description = "Entry ticket to be paid on site only (free in system)"
+  tt.price_cents = 0
+  tt.quantity = 100
+  tt.sale_start_at = Time.current
+  tt.sale_end_at = belle_epoque_event.start_time
+  tt.minimum_age = 30
+  tt.requires_id = true
+end
+
+TicketType.find_or_create_by!(event: belle_epoque_event, name: "Paid Entry 10€") do |tt|
+  tt.description = "Paid entry ticket for La Belle Époque at 10€"
+  tt.price_cents = 1000  # 10€
+  tt.quantity = 200
+  tt.sale_start_at = Time.current
+  tt.sale_end_at = belle_epoque_event.start_time
+  tt.minimum_age = 30
+  tt.requires_id = true
+end
+
+puts "Created 1 promoter, 1 draft event with ticket types"
--- a/test/controllers/orders_controller_test.rb
+++ b/test/controllers/orders_controller_test.rb
@@ -125,7 +125,7 @@ class OrdersControllerTest < ActionDispatch::IntegrationTest
    assert_equal "draft", new_order.status
    assert_equal @user, new_order.user
    assert_equal @event, new_order.event
-    assert_equal @ticket_type.price_cents + 100, new_order.total_amount_cents # includes 1€ service fee
+    assert_equal @ticket_type.price_cents, new_order.total_amount_cents # Service fee deducted from promoter payout, not added to customer

    assert_redirected_to checkout_order_path(new_order)
    assert_equal new_order.id, session[:draft_order_id]
--- a/test/models/order_test.rb
+++ b/test/models/order_test.rb
@@ -603,4 +603,22 @@ class OrderTest < ActiveSupport::TestCase
    result = order.stripe_invoice_pdf_url
    assert_nil result
  end
+
+  test "free? should return true for zero amount orders" do
+    free_order = Order.create!(
+      user: @user, event: @event, total_amount_cents: 0,
+      status: "draft", payment_attempts: 0
+    )
+
+    assert free_order.free?
+  end
+
+  test "free? should return false for non-zero amount orders" do
+    paid_order = Order.create!(
+      user: @user, event: @event, total_amount_cents: 1000,
+      status: "draft", payment_attempts: 0
+    )
+
+    assert_not paid_order.free?
+  end
 end
--- a/test/models/ticket_type_test.rb
+++ b/test/models/ticket_type_test.rb
@@ -244,4 +244,38 @@ class TicketTypeTest < ActiveSupport::TestCase
    )
    assert_not ticket_type.save
  end
+
+  test "should allow free tickets with zero price" do
+    user = User.create!(
+      email: "test@example.com",
+      password: "password123",
+      password_confirmation: "password123"
+    )
+
+    event = Event.create!(
+      name: "Test Event",
+      slug: "test-event",
+      description: "Valid description for the event that is long enough",
+      latitude: 48.8566,
+      longitude: 2.3522,
+      venue_name: "Test Venue",
+      venue_address: "123 Test Street",
+      user: user
+    )
+
+    ticket_type = TicketType.new(
+      name: "Free Ticket",
+      description: "Valid description for the free ticket type",
+      price_cents: 0,
+      quantity: 50,
+      sale_start_at: Time.current,
+      sale_end_at: Time.current + 1.day,
+      event: event
+    )
+
+    assert ticket_type.save
+    assert ticket_type.free?
+    assert_equal 0, ticket_type.price_cents
+    assert_equal 0.0, ticket_type.price_euros
+  end
 end
--- a/test/services/stripe_invoice_service_test.rb
+++ b/test/services/stripe_invoice_service_test.rb
@@ -210,25 +210,12 @@ class StripeInvoiceServiceTest < ActiveSupport::TestCase
      }
    }

-    expected_service_fee_line_item = {
-      customer: "cus_test123",
-      invoice: "in_test123",
-      amount: 100,
-      currency: "eur",
-      description: "Frais de service - Frais de traitement de la commande",
-      metadata: {
-        item_type: "service_fee",
-        amount_cents: 100
-      }
-    }
-
    mock_invoice = mock("invoice")
    mock_invoice.stubs(:id).returns("in_test123")
    mock_invoice.stubs(:finalize_invoice).returns(mock_invoice)
    mock_invoice.expects(:pay)
    Stripe::Invoice.expects(:create).returns(mock_invoice)
-    Stripe::InvoiceItem.expects(:create).with(expected_ticket_line_item)
-    Stripe::InvoiceItem.expects(:create).with(expected_service_fee_line_item)
+    Stripe::InvoiceItem.expects(:create).with(expected_ticket_line_item) # Only for tickets, no service fee

    result = @service.create_post_payment_invoice
    assert_not_nil result
Author	SHA1	Message	Date
kbe	e5ed1a34dd	refactor: migrate payment success views to orders system and add promoter seed data All checks were successful Ruby on Rails Test / rails-test (push) Successful in 1m48s	2025-09-16 21:32:42 +02:00
Kevin BATAILLE	3e0a354a58	Merge pull request 'feat/free-ticket' (#4 ) from feat/free-ticket into develop All checks were successful Ruby on Rails Test / rails-test (push) Successful in 1m31s Reviewed-on: #4	2025-09-16 15:27:51 +00:00
kbe	b5c1846f2c	fix(mailers): Include TicketsHelper in TicketMailer to make format_ticket_price available - Add helper :tickets to TicketMailer to make format_ticket_price method available in mailer templates - Fixes undefined method 'format_ticket_price' error in purchase confirmation emails - Required after recent changes to support free tickets	2025-09-16 17:25:14 +02:00
kbe	04393add14	fix(tests): Remove service fee expectation from Stripe invoice test and fix duplicated keys in event view - Update StripeInvoiceServiceTest to match the implementation that no longer adds service fees to customer invoices - Remove duplicated Stimulus data attributes in events/show.html.erb that were causing warnings - Align tests with the hybrid fee model where fees are deducted from promoter payouts	2025-09-16 17:22:00 +02:00
kbe	5279ebe1a4	feat(event available/sold out): Promoter can mark event as sold out or available On the event page, promoter can choose to mark the event as "sold out" using the status field or as "published". Only published event can be marked as sold out if promoter thinks he cannot handle all the people available.	2025-09-16 17:15:09 +02:00
kbe	329ba89eaa	chore: Better description details for ticket types	2025-09-16 17:00:04 +02:00
kbe	9c56b2e1e5	refactor: prepare for free ticket	2025-09-16 16:36:39 +02:00