<%= render 'shared/breadcrumbs' %>
-
Listes de présence
+ Registre de présence
<%= link_to new_admin_attendance_list_path, class: "px-4 py-2 bg-[#1F5C55] hover:bg-[#194A45] text-white text-sm font-medium rounded-md shadow-sm focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-[#1F5C55] flex items-center" do %>
- Créer une nouvelle liste
+ Créer un registre
<% end %>
-
Gérez les listes de présence pour les formations, événements et réunions
+
Gérez les registres de présence du jour pour les formations, événements et réunions
-
+
@@ -117,7 +117,7 @@
<% if @attendance_list.present? %>
<% @attendance_list.each do |attendance_list| %>
-
+
@@ -188,7 +188,7 @@
<% end %>
<% else %>
-
+
Aucune liste de présence disponible
Créez une nouvelle liste pour commencer
@@ -196,4 +196,4 @@
<% end %>
-
\ No newline at end of file
+
diff --git a/app/views/admin/attendance_lists/new.html.erb b/app/views/admin/attendance_lists/new.html.erb
index c64bd22f..c44e3b31 100644
--- a/app/views/admin/attendance_lists/new.html.erb
+++ b/app/views/admin/attendance_lists/new.html.erb
@@ -1,25 +1,25 @@
-<% content_for :title, "Créer une nouvelle liste de présence" %>
+<% content_for :title, "Créer un registre de présence" %>
-
+
<%= render 'shared/breadcrumbs' %>
-
Nouvelle liste
-
Créez une liste pour gérer les présences
+
Nouveau registre de présence
+
Créez le registre de présence du jour
-
+
Informations
<%= form_with model: AttendanceList.new, url: admin_attendance_lists_path, method: :post, class: "space-y-4" do |form| %>
- <%= form.label :name, "Nom de la liste", class: "block text-sm font-medium text-gray-700" %>
+ <%= form.label :name, "Nom du registre", class: "block text-sm font-medium text-gray-700" %>
-
\ No newline at end of file
+
diff --git a/app/views/admin/attendance_lists/show.html.erb b/app/views/admin/attendance_lists/show.html.erb
index c1132519..36730ac9 100644
--- a/app/views/admin/attendance_lists/show.html.erb
+++ b/app/views/admin/attendance_lists/show.html.erb
@@ -1,7 +1,7 @@
-<% content_for :title, "Détails de la liste de présence" %>
+<% content_for :title, "Registre de présence" %>
-
+
<%= render 'shared/breadcrumbs' %>
@@ -11,18 +11,18 @@
<%= @attendance_list.name %>
<%= link_to edit_admin_attendance_list_path(@attendance_list), class: "px-4 py-2 bg-[#1F5C55] hover:bg-[#194A45] text-white text-sm font-medium rounded-md shadow-sm focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-[#1F5C55] flex items-center" do %>
-
-
Consultez les détails et les participants de cette liste de présence
+
Consultez les détails et les présences enregistrées pour ce jour
-
+
Informations
@@ -105,7 +105,7 @@
-
+
Participants
<%= link_to new_admin_attendance_list_attendance_path(@attendance_list), class: "text-[#1F5C55] hover:text-[#194A45] flex items-center text-sm" do %>
@@ -181,4 +181,4 @@
-
\ No newline at end of file
+
diff --git a/app/views/admin/attendances/index.html.erb b/app/views/admin/attendances/index.html.erb
index a8c53d94..a76dacd6 100644
--- a/app/views/admin/attendances/index.html.erb
+++ b/app/views/admin/attendances/index.html.erb
@@ -1,7 +1,7 @@
<% content_for :title, "Participants à la liste de présence" %>
-
+
<%= render 'shared/breadcrumbs' %>
@@ -24,7 +24,7 @@
-
+
<% if @users.present? %>
<% @users.each do |user| %>
@@ -65,4 +65,4 @@
<% end %>
-
\ No newline at end of file
+
diff --git a/app/views/admin/attendances/new.html.erb b/app/views/admin/attendances/new.html.erb
index 0e9809d4..4f83a24b 100644
--- a/app/views/admin/attendances/new.html.erb
+++ b/app/views/admin/attendances/new.html.erb
@@ -1,7 +1,7 @@
<% content_for :title, "Ajouter des participants" %>
-
+
<%= render 'shared/breadcrumbs' %>
@@ -31,7 +31,7 @@
-
+
Utilisateurs disponibles
<%= pluralize(@users_not_in_list.count, "utilisateur", "utilisateurs") %> disponible(s)
diff --git a/app/views/admin/subscription_plans/edit.html.erb b/app/views/admin/contribution_formulas/edit.html.erb
similarity index 86%
rename from app/views/admin/subscription_plans/edit.html.erb
rename to app/views/admin/contribution_formulas/edit.html.erb
index f2c36081..a7a7e8bd 100644
--- a/app/views/admin/subscription_plans/edit.html.erb
+++ b/app/views/admin/contribution_formulas/edit.html.erb
@@ -1,17 +1,17 @@
-
+
-
+
-
+
-
Informations du plan de cotisation
+ Informations de la formule
@@ -72,6 +72,15 @@
Seuls les adhérents Cirque peuvent acheter des cotisations
+
+ <%= form.label :rate_kind, "Type tarifaire", class: "block text-sm font-medium text-gray-700" %>
+ <%= form.select :rate_kind,
+ options_for_select(ContributionFormula.rate_kind_options, @contribution_formula.rate_kind),
+ {},
+ { class: "mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-[#1F5C55] focus:ring-[#1F5C55] sm:text-sm" } %>
+
Doit rester cohérent avec le type d'adhésion requis pour éviter les écarts de catalogue.
+
+
<%= form.label :price_cents, "Prix (en centimes)", class: "block text-sm font-medium text-gray-700" %>
<%= form.number_field :price_cents,
@@ -101,7 +110,7 @@
- <%= link_to "Annuler", admin_subscription_plan_path(@contribution_formula),
+ <%= link_to "Annuler", admin_contribution_formula_path(@contribution_formula),
class: "inline-flex items-center px-4 py-2 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-[#1F5C55]" %>
<%= form.submit "Mettre à jour",
class: "inline-flex items-center px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-[#1F5C55] hover:bg-[#194A45] focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-[#1F5C55]" %>
diff --git a/app/views/admin/subscription_plans/index.html.erb b/app/views/admin/contribution_formulas/index.html.erb
similarity index 90%
rename from app/views/admin/subscription_plans/index.html.erb
rename to app/views/admin/contribution_formulas/index.html.erb
index a53af1b9..9e4b81c1 100644
--- a/app/views/admin/subscription_plans/index.html.erb
+++ b/app/views/admin/contribution_formulas/index.html.erb
@@ -1,21 +1,21 @@
-
+
-
+
-
+
@@ -36,8 +36,11 @@
end %>">
<%= plan.duration.humanize %>
+
+ <%= plan.rate_kind_humanized %>
+
- <%= pluralize(plan.contributions.count, 'carnet') %>
+ <%= pluralize(plan.contributions.count, 'cotisation') %>
@@ -87,7 +90,7 @@
<% if Current.user&.system_role == 'super_admin' %>
- <%= link_to edit_admin_subscription_plan_path(plan),
+ <%= link_to edit_admin_contribution_formula_path(plan),
class: "inline-flex items-center px-3 py-2 text-sm font-medium text-blue-600 bg-blue-50 hover:bg-blue-100 rounded-lg transition-colors duration-200",
title: "Modifier" do %>
@@ -99,9 +102,9 @@
<% if plan.contributions.empty? %>
<% if Current.user&.system_role == 'super_admin' %>
- <%= button_to admin_subscription_plan_path(plan),
+ <%= button_to admin_contribution_formula_path(plan),
method: :delete,
- form: { data: { turbo_confirm: "Êtes-vous sûr de vouloir supprimer ce plan de cotisation ?" } },
+ form: { data: { turbo_confirm: "Êtes-vous sûr de vouloir supprimer cette formule de cotisation ?" } },
class: "inline-flex items-center px-3 py-2 text-sm font-medium text-red-600 bg-red-50 hover:bg-red-100 rounded-lg transition-colors duration-200",
title: "Supprimer" do %>
@@ -157,8 +160,11 @@
end %>">
<%= plan.duration.humanize %>
+
+ <%= plan.rate_kind_humanized %>
+
- <%= pluralize(plan.contributions.count, 'carnet') %>
+ <%= pluralize(plan.contributions.count, 'cotisation') %>
@@ -208,7 +214,7 @@
<% if Current.user&.system_role == 'super_admin' %>
- <%= link_to edit_admin_subscription_plan_path(plan),
+ <%= link_to edit_admin_contribution_formula_path(plan),
class: "inline-flex items-center px-3 py-2 text-sm font-medium text-blue-600 bg-blue-50 hover:bg-blue-100 rounded-lg transition-colors duration-200",
title: "Modifier" do %>
@@ -220,9 +226,9 @@
<% if plan.contributions.empty? %>
<% if Current.user&.system_role == 'super_admin' %>
- <%= button_to admin_subscription_plan_path(plan),
+ <%= button_to admin_contribution_formula_path(plan),
method: :delete,
- form: { data: { turbo_confirm: "Êtes-vous sûr de vouloir supprimer ce plan de cotisation ?" } },
+ form: { data: { turbo_confirm: "Êtes-vous sûr de vouloir supprimer cette formule de cotisation ?" } },
class: "inline-flex items-center px-3 py-2 text-sm font-medium text-red-600 bg-red-50 hover:bg-red-100 rounded-lg transition-colors duration-200",
title: "Supprimer" do %>
diff --git a/app/views/admin/contribution_formulas/new.html.erb b/app/views/admin/contribution_formulas/new.html.erb
new file mode 100644
index 00000000..acfaf706
--- /dev/null
+++ b/app/views/admin/contribution_formulas/new.html.erb
@@ -0,0 +1,248 @@
+<% content_for :title, "Nouvelle cotisation" %>
+
+
+
+ <%= render "shared/breadcrumbs" %>
+
+
+
+
Nouvelle cotisation
+
+ <% if @person %>
+ Pour <%= @person.full_name %>
+ <% else %>
+ Sélectionnez une formule de cotisation
+ <% end %>
+
+
+
+
+
+
+ <% if @person&.can_buy_contribution_formulas? %>
+ <% selected_formula = @contribution_formulas.first %>
+ <% current_membership = @person.current_membership %>
+ <% active_contributions = @person.contributions.active.includes(:contribution_formula).order(expires_at: :asc, created_at: :desc) %>
+ <% formula_label = lambda do |formula|
+ case formula.duration
+ when "day" then "Journée"
+ when "trimester" then "Trimestriel"
+ when "annual" then "Annuel"
+ when "pack10" then "Carnet 10"
+ else formula.name
+ end
+ end %>
+ <% formula_constraint = lambda do |formula|
+ if formula.duration == "day"
+ "Usage unique, valable jusqu'à la fin de la journée"
+ elsif formula.sessions_count.present? && formula.validity_days.present?
+ "#{formula.sessions_count} séances à utiliser sous #{formula.validity_days} jours"
+ elsif formula.duration == "trimester"
+ "Séances illimitées pendant 3 mois"
+ elsif formula.duration == "annual"
+ "Séances illimitées pendant 1 an"
+ else
+ formula.duration_humanized
+ end
+ end %>
+ <% formula_alert = lambda do |formula|
+ matching_active_contribution = active_contributions.find { |contribution| contribution.contribution_formula.duration == formula.duration }
+ next nil unless matching_active_contribution
+
+ case formula.duration
+ when "day"
+ "Déjà une journée active aujourd'hui"
+ when "pack10"
+ "Un carnet 10 est déjà disponible"
+ when "trimester"
+ "Un trimestriel est déjà actif"
+ when "annual"
+ "Un annuel est déjà actif"
+ end
+ end %>
+ <% contribution_alert = lambda do |contribution|
+ formula = contribution.contribution_formula
+
+ if formula.duration == "day"
+ "Journée active jusqu'au #{l(contribution.expires_at.to_date)}"
+ elsif contribution.is_pack10?
+ "Carnet 10 disponible : #{contribution.sessions_remaining} séances restantes"
+ elsif formula.duration == "trimester"
+ "Trimestriel actif jusqu'au #{l(contribution.expires_at.to_date)}"
+ elsif formula.duration == "annual"
+ "Annuel actif jusqu'au #{l(contribution.expires_at.to_date)}"
+ elsif contribution.expires_at.present?
+ "#{formula_label.call(formula)} actif jusqu'au #{l(contribution.expires_at.to_date)}"
+ else
+ "#{formula_label.call(formula)} actif"
+ end
+ end %>
+
+ <% if selected_formula.present? %>
+
+
+
+
+
Adhésion
+ <% if current_membership.present? %>
+
<%= current_membership.membership_type.name %>
+
Jusqu'au <%= l(current_membership.ended_at) %>
+ <% else %>
+
Aucune adhésion active
+ <% end %>
+
+
+ <% if @person.member_number.present? %>
+
+
N° membre
+
<%= @person.formatted_member_number %>
+
+ <% end %>
+
+
+
+
Cotisations en cours
+ <% if active_contributions.any? %>
+
+ <% active_contributions.each do |contribution| %>
+
+ <%= contribution_alert.call(contribution) %>
+
+ <% end %>
+
+ <% else %>
+
Aucune cotisation active
+ <% end %>
+
+
+
+ <%= form_with url: admin_contribution_formulas_path,
+ method: :post,
+ local: true,
+ scope: :contribution_formula,
+ class: "space-y-5",
+ data: { controller: "contribution-purchase offer-fields" } do |form| %>
+ <%= form.hidden_field :person_id, value: @person.id %>
+
+
+ Cotisation
+
+
+ <% @contribution_formulas.each_with_index do |contribution_formula, index| %>
+
+ <%= form.radio_button :contribution_formula_id,
+ contribution_formula.id,
+ checked: index.zero?,
+ class: "sr-only",
+ data: {
+ contribution_purchase_target: "formula",
+ action: "change->contribution-purchase#refresh",
+ formula_name: formula_label.call(contribution_formula),
+ formula_price: "#{contribution_formula.price_euros} €",
+ formula_constraint: formula_constraint.call(contribution_formula),
+ formula_alert: formula_alert.call(contribution_formula)
+ } %>
+
+
+
+
<%= formula_label.call(contribution_formula) %>
+
<%= formula_constraint.call(contribution_formula) %>
+ <% if formula_alert.call(contribution_formula).present? %>
+
<%= formula_alert.call(contribution_formula) %>
+ <% end %>
+
+
+
+
<%= contribution_formula.price_euros %> €
+
+
+ <% end %>
+
+
+
+
+
+
Paiement
+
+ <%= formula_label.call(selected_formula) %>
+ ·
+ <%= formula_constraint.call(selected_formula) %>
+
+
+
<%= selected_formula.price_euros %> €
+
+
+ <%= form.label :payment_method, "Mode de paiement", class: "mb-1 block text-sm font-medium text-gray-700" %>
+ <%= form.select :payment_method,
+ options_for_select(payment_method_options),
+ { selected: "cash" },
+ { class: "w-full rounded-md border-gray-300 text-sm focus:border-[#1F5C55] focus:ring-[#1F5C55]",
+ data: { offer_fields_target: "paymentMethod", action: "change->offer-fields#refresh" } } %>
+
+
+
+ <%= form.label :donation_amount, "Don additionnel (€)", class: "mb-1 block text-sm font-medium text-gray-700" %>
+ <%= form.number_field :donation_amount,
+ step: 0.01,
+ min: 0,
+ placeholder: "0.00",
+ class: "w-full rounded-md border-gray-300 text-sm focus:border-[#1F5C55] focus:ring-[#1F5C55]" %>
+
+
+ <%= form.label :custom_amount_cents, "Montant offert (€)", class: "mb-1 block text-sm font-medium text-gray-700" %>
+ <%= form.number_field :custom_amount_cents,
+ step: 0.01,
+ min: 0,
+ placeholder: "0.00",
+ class: "w-full rounded-md border-gray-300 text-sm focus:border-[#1F5C55] focus:ring-[#1F5C55]" %>
+
+
+
+ <%= form.label :offer_reason, "Raison de l'offre", class: "mb-1 block text-sm font-medium text-gray-700" %>
+ <%= form.text_area :offer_reason,
+ rows: 2,
+ placeholder: "Ex : bénévolat, geste commercial, partenariat...",
+ class: "w-full rounded-md border-gray-300 text-sm focus:border-[#1F5C55] focus:ring-[#1F5C55]",
+ data: { offer_fields_target: "offerReasonInput" } %>
+
+
+
+ <%= formula_alert.call(selected_formula) %>
+
+
+
+
Retour ensuite sur la fiche personne.
+ <%= form.submit "Acheter la cotisation",
+ class: "inline-flex items-center justify-center rounded-md border border-transparent bg-[#1F5C55] px-4 py-2 text-sm font-medium text-white hover:bg-[#194A45] focus:outline-none focus:ring-2 focus:ring-[#1F5C55] focus:ring-offset-2" %>
+
+ <% end %>
+ <% else %>
+
+
Aucune formule de cotisation active n'est disponible pour cette adhésion Cirque.
+
+ <% end %>
+ <% else %>
+
+
Cette personne doit avoir une adhésion Cirque pour acheter une formule de cotisation.
+
+ <% end %>
+
+ <% if @person.present? %>
+
+ <%= link_to "← Retour à la fiche",
+ admin_user_path(Admin::Users::PersonRouteKey.call(@person)),
+ class: "inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 shadow-sm hover:bg-gray-50" %>
+
+ <% end %>
+
+
+
+
-
+
<%= render 'shared/breadcrumbs' %>
-
+
-
-
-
Informations du plan
+
+
+
Informations de la formule
@@ -30,8 +30,8 @@
-
Type de plan
-
+ Durée / type
+
<%= @contribution_formula.duration.humanize %>
+
+ <%= @contribution_formula.rate_kind_humanized %>
+
@@ -89,7 +92,7 @@
-
+
Carnets d'entrées associés
@@ -111,7 +114,7 @@
<% @contributions.each do |book| %>
- <%= link_to book.person.full_name, admin_user_path("person_#{book.person.id}"),
+ <%= link_to book.person.full_name, admin_user_path(Admin::Users::PersonRouteKey.call(book.person)),
class: "text-[#1F5C55] hover:underline" %>
@@ -133,22 +136,21 @@
<% else %>
-
Aucun carnet d'entrée n'a été créé avec ce plan.
+
Aucune cotisation n'a été créée avec cette formule.
<% end %>
- <%= link_to "Retour à la liste", admin_subscription_plans_path,
+ <%= link_to "Retour à la liste", admin_contribution_formulas_path,
class: "inline-flex items-center px-4 py-2 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-[#1F5C55]" %>
<% if Current.user&.system_role == 'super_admin' && @contribution_formula.contributions.empty? %>
- <%= button_to "Supprimer ce plan", admin_subscription_plan_path(@contribution_formula),
+ <%= button_to "Supprimer cette formule", admin_contribution_formula_path(@contribution_formula),
method: :delete,
- form: { data: { turbo_confirm: "Êtes-vous sûr de vouloir supprimer ce plan de cotisation ?" } },
+ form: { data: { turbo_confirm: "Êtes-vous sûr de vouloir supprimer cette formule de cotisation ?" } },
class: "inline-flex items-center px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-red-600 hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500" %>
<% end %>
-
diff --git a/app/views/admin/dashboard/_admin_lateral_navbar.html.erb b/app/views/admin/dashboard/_admin_lateral_navbar.html.erb
index e7a1e900..9dae3a53 100644
--- a/app/views/admin/dashboard/_admin_lateral_navbar.html.erb
+++ b/app/views/admin/dashboard/_admin_lateral_navbar.html.erb
@@ -42,7 +42,7 @@
<% end %>
<% if current_user.can_manage_attendance_lists? %>
<%= link_to admin_attendance_lists_path, class: "sidebar-link flex items-center" do %>
-
+
<% end %>
<% end %>
@@ -57,8 +57,8 @@
<% end %>
-
<%= link_to admin_subscription_plans_path, class: "sidebar-link flex items-center" do %>
-
+ <%= link_to admin_contribution_formulas_path, class: "sidebar-link flex items-center" do %>
+
<% end %>
<% end %>
@@ -93,4 +93,4 @@