Merge branch 'develop' into feat/promoters

This commit is contained in:
kbe
2025-09-11 08:41:23 +02:00
19 changed files with 889 additions and 1279 deletions

View File

@@ -44,33 +44,34 @@ class PagesController < ApplicationController
@promoter_events = current_user.events.includes(:orders, :tickets)
.order(created_at: :desc)
.limit(5)
# Revenue metrics for promoter
@total_revenue = current_user.events
.joins(:orders)
.where(orders: { status: ['paid', 'completed'] })
.sum('orders.total_amount_cents') / 100.0
.where(orders: { status: [ "paid", "completed" ] })
.sum("orders.total_amount_cents") / 100.0
@total_tickets_sold = current_user.events
.joins(:tickets)
.where(tickets: { status: 'active' })
.where(tickets: { status: "active" })
.count
@active_events_count = current_user.events.where(state: 'published').count
@draft_events_count = current_user.events.where(state: 'draft').count
@active_events_count = current_user.events.where(state: "published").count
@draft_events_count = current_user.events.where(state: "draft").count
# Recent orders for promoter events
@recent_orders = Order.joins(:event)
.where(events: { user: current_user })
.where(status: ['paid', 'completed'])
.where(status: [ "paid", "completed" ])
.includes(:event, :user, tickets: :ticket_type)
.order(created_at: :desc)
.limit(10)
# Monthly revenue trend (last 6 months)
@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)
@@ -78,6 +79,15 @@ class PagesController < ApplicationController
.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