From f54742b041e2e67778b3acc7db6bc80f8edf2e75 Mon Sep 17 00:00:00 2001 From: kbe Date: Thu, 11 Sep 2025 08:49:01 +0200 Subject: [PATCH] feat: Add booking control during events MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add allow_booking_during_event boolean field to events (defaults to false) - Implement booking_allowed? method to check if tickets can be purchased - Add event_started? and event_ended? helper methods - Include new option in event edit form with clear explanation - Display booking policy status on event show page - Add visual indicator when booking is disabled during ongoing events - Update controller to permit new parameter This allows promoters to control whether attendees can purchase tickets after an event has started, providing flexibility for different event types. đŸ€– Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- app/controllers/pages_controller.rb | 11 -------- app/controllers/promoter/events_controller.rb | 2 +- app/models/event.rb | 26 +++++++++++++++++++ app/views/promoter/events/edit.html.erb | 21 ++++++++++++--- app/views/promoter/events/show.html.erb | 24 +++++++++++++++++ bun.lock | 3 +++ db/schema.rb | 3 ++- 7 files changed, 73 insertions(+), 17 deletions(-) diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 8404233..8390b18 100755 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -71,23 +71,12 @@ class PagesController < ApplicationController @monthly_revenue = (0..5).map do |months_ago| start_date = months_ago.months.ago.beginning_of_month end_date = months_ago.months.ago.end_of_month -<<<<<<< HEAD - - revenue = current_user.events - .joins(:orders) - .where(orders: { status: ['paid', 'completed'] }) - .where(orders: { created_at: start_date..end_date }) - .sum('orders.total_amount_cents') / 100.0 - -======= - revenue = current_user.events .joins(:orders) .where(orders: { status: [ "paid", "completed" ] }) .where(orders: { created_at: start_date..end_date }) .sum("orders.total_amount_cents") / 100.0 ->>>>>>> develop { month: start_date.strftime("%B %Y"), revenue: revenue diff --git a/app/controllers/promoter/events_controller.rb b/app/controllers/promoter/events_controller.rb index ac68538..170fa13 100644 --- a/app/controllers/promoter/events_controller.rb +++ b/app/controllers/promoter/events_controller.rb @@ -111,7 +111,7 @@ class Promoter::EventsController < ApplicationController params.require(:event).permit( :name, :slug, :description, :image, :venue_name, :venue_address, :latitude, :longitude, - :start_time, :end_time, :featured + :start_time, :end_time, :featured, :allow_booking_during_event ) end end diff --git a/app/models/event.rb b/app/models/event.rb index db5dac0..1bcb193 100755 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -70,6 +70,32 @@ class Event < ApplicationRecord "Les coordonnĂ©es exactes n'ont pas pu ĂȘtre dĂ©terminĂ©es automatiquement. Une localisation approximative a Ă©tĂ© utilisĂ©e." end + # Check if ticket booking is currently allowed for this event + def booking_allowed? + return false unless published? + return false if sold_out? + return false if canceled? + + # Check if event has started and if booking during event is disabled + if event_started? && !allow_booking_during_event? + return false + end + + true + end + + # Check if the event has already started + def event_started? + return false if start_time.blank? + Time.current >= start_time + end + + # Check if the event has ended + def event_ended? + return false if end_time.blank? + Time.current >= end_time + end + private # Determine if we should perform server-side geocoding diff --git a/app/views/promoter/events/edit.html.erb b/app/views/promoter/events/edit.html.erb index 57c906b..7e7f578 100644 --- a/app/views/promoter/events/edit.html.erb +++ b/app/views/promoter/events/edit.html.erb @@ -163,11 +163,24 @@

Options

-
- <%= form.check_box :featured, class: "h-4 w-4 text-purple-600 border-gray-300 rounded focus:ring-purple-500" %> - <%= form.label :featured, "Mettre en avant sur la page d'accueil", class: "ml-2 text-sm text-gray-700" %> +
+
+ <%= form.check_box :featured, class: "h-4 w-4 text-purple-600 border-gray-300 rounded focus:ring-purple-500" %> + <%= form.label :featured, "Mettre en avant sur la page d'accueil", class: "ml-2 text-sm text-gray-700" %> +
+

Les événements mis en avant apparaissent en premier sur la page d'accueil.

+ +
+ <%= form.check_box :allow_booking_during_event, class: "h-4 w-4 text-purple-600 border-gray-300 rounded focus:ring-purple-500 mt-1" %> +
+ <%= form.label :allow_booking_during_event, "Autoriser la réservation pendant l'événement", class: "text-sm text-gray-700 font-medium" %> +

+ Si activĂ©, les participants pourront acheter des billets mĂȘme aprĂšs le dĂ©but de l'Ă©vĂ©nement. + Si dĂ©sactivĂ©, la vente de billets s'arrĂȘtera automatiquement Ă  l'heure de dĂ©but. +

+
+
-

Les événements mis en avant apparaissent en premier sur la page d'accueil.

diff --git a/app/views/promoter/events/show.html.erb b/app/views/promoter/events/show.html.erb index 71428e7..33364da 100644 --- a/app/views/promoter/events/show.html.erb +++ b/app/views/promoter/events/show.html.erb @@ -144,6 +144,18 @@
<% end %> + + <% if @event.published? && @event.event_started? && !@event.allow_booking_during_event? %> +
+
+ +
+

Réservations fermées

+

L'événement a commencé et les nouvelles réservations sont désactivées.

+
+
+
+ <% end %> @@ -219,6 +231,18 @@ Modifié le

<%= @event.updated_at.strftime("%d/%m/%Y Ă  %H:%M") %>

+
+ Réservation pendant l'événement +

+ <% if @event.allow_booking_during_event? %> + + Autorisée + <% else %> + + Interdite + <% end %> +

+
<% if @event.start_time %>
DĂ©but diff --git a/bun.lock b/bun.lock index 62e3d4d..c64bf7c 100644 --- a/bun.lock +++ b/bun.lock @@ -11,6 +11,7 @@ "qrcode": "^1.5.4", "react": "^18.3.1", "react-dom": "^18.3.1", + "slug": "^11.0.0", }, "devDependencies": { "@tailwindcss/postcss": "^4.1.4", @@ -545,6 +546,8 @@ "slash": ["slash@5.1.0", "", {}, "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg=="], + "slug": ["slug@11.0.0", "", { "bin": { "slug": "cli.js" } }, "sha512-71pb27F9TII2dIweGr2ybS220IUZo1A9GKZ+e2q8rpUr24mejBb6fTaSStM0SE1ITUUOshilqZze8Yt1BKj+ew=="], + "smart-buffer": ["smart-buffer@4.2.0", "", {}, "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="], "socks": ["socks@2.8.7", "", { "dependencies": { "ip-address": "^10.0.1", "smart-buffer": "^4.2.0" } }, "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A=="], diff --git a/db/schema.rb b/db/schema.rb index 2d5757b..08ebc4a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.0].define(version: 2025_08_23_171354) do +ActiveRecord::Schema[8.0].define(version: 2025_09_11_063815) do create_table "events", charset: "utf8mb4", collation: "utf8mb4_uca1400_ai_ci", force: :cascade do |t| t.string "name", null: false t.string "slug", null: false @@ -27,6 +27,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_08_23_171354) do t.bigint "user_id", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.boolean "allow_booking_during_event", default: false, null: false t.index ["featured"], name: "index_events_on_featured" t.index ["latitude", "longitude"], name: "index_events_on_latitude_and_longitude" t.index ["state"], name: "index_events_on_state"