diff --git a/app/controllers/api/events_controller.rb b/app/controllers/api/events_controller.rb index 4d05f6b56..781e170ba 100644 --- a/app/controllers/api/events_controller.rb +++ b/app/controllers/api/events_controller.rb @@ -97,6 +97,7 @@ class API::EventsController < API::APIController event_preparams = params.required(:event).permit(:title, :description, :start_date, :start_time, :end_date, :end_time, :amount, :nb_total_places, :availability_id, :all_day, :recurrence, :recurrence_end_at, :category_id, :event_theme_ids, :age_range_id, :event_type, + :pre_registration, :pre_registration_end_date, event_theme_ids: [], event_image_attributes: %i[id attachment], event_files_attributes: %i[id attachment _destroy], diff --git a/app/frontend/src/javascript/components/events/event-form.tsx b/app/frontend/src/javascript/components/events/event-form.tsx index 5ed6a7036..0d8c0b81b 100644 --- a/app/frontend/src/javascript/components/events/event-form.tsx +++ b/app/frontend/src/javascript/components/events/event-form.tsx @@ -55,6 +55,7 @@ export const EventForm: React.FC = ({ action, event, onError, on const [updatingEvent, setUpdatingEvent] = useState(null); const [isActiveAccounting, setIsActiveAccounting] = useState(false); const [isActiveFamilyAccount, setIsActiveFamilyAccount] = useState(false); + const [isAcitvePreRegistration, setIsActivePreRegistration] = useState(event?.pre_registration); useEffect(() => { EventCategoryAPI.index() @@ -241,6 +242,19 @@ export const EventForm: React.FC = ({ action, event, onError, on formState={formState} options={ageRangeOptions} label={t('app.admin.event_form.age_range')} />} + + {isAcitvePreRegistration && + + } diff --git a/app/frontend/src/javascript/models/event.ts b/app/frontend/src/javascript/models/event.ts index 892ca95dc..7f72b1974 100644 --- a/app/frontend/src/javascript/models/event.ts +++ b/app/frontend/src/javascript/models/event.ts @@ -66,6 +66,8 @@ export interface Event { recurrence_end_at: Date, advanced_accounting_attributes?: AdvancedAccounting, event_type: EventType, + pre_registration?: boolean, + pre_registration_end_date?: TDateISODate | Date, } export interface EventDecoration { diff --git a/app/frontend/templates/events/show.html b/app/frontend/templates/events/show.html index 66f217f80..6a3c9652e 100644 --- a/app/frontend/templates/events/show.html +++ b/app/frontend/templates/events/show.html @@ -255,11 +255,11 @@ -
+
-
+
diff --git a/app/policies/local_payment_policy.rb b/app/policies/local_payment_policy.rb index e981fd8ac..8bfb2761a 100644 --- a/app/policies/local_payment_policy.rb +++ b/app/policies/local_payment_policy.rb @@ -5,7 +5,8 @@ class LocalPaymentPolicy < ApplicationPolicy def confirm_payment? # only admins and managers can offer free extensions of a subscription has_free_days = record.shopping_cart.items.any? { |item| item.is_a? CartItem::FreeExtension } + event = record.shopping_cart.items.find { |item| item.is_a? CartItem::EventReservation } - ((user.admin? || user.manager?) && record.shopping_cart.customer.id != user.id) || (record.price.zero? && !has_free_days) + ((user.admin? || user.manager?) && record.shopping_cart.customer.id != user.id) || (record.price.zero? && !has_free_days) || event&.reservable&.pre_registration end end diff --git a/app/views/api/events/_event.json.jbuilder b/app/views/api/events/_event.json.jbuilder index 885a29d28..1504914b1 100644 --- a/app/views/api/events/_event.json.jbuilder +++ b/app/views/api/events/_event.json.jbuilder @@ -1,6 +1,6 @@ # frozen_string_literal: true -json.extract! event, :id, :title, :description, :event_type +json.extract! event, :id, :title, :description, :event_type, :pre_registration, :pre_registration_end_date if event.event_image json.event_image_attributes do json.id event.event_image.id diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 27332ca33..35e56ca99 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -156,6 +156,9 @@ en: standard: "Event standard" nominative: "Event nominative" family: "Event family" + pre_registration: "Pre-registration" + pre_registration_help: "If this option is checked, administrators and managers must validate registrations before they become final." + pre_registration_end_date: "Pre-registration end date" plan_form: ACTION_title: "{ACTION, select, create{New} other{Update the}} plan" tab_settings: "Settings" diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index a8a08de1d..5d57f6ae1 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -156,6 +156,9 @@ fr: standard: "Evénement standard" nominative: "Evénement nominatif" family: "Evénement famille" + pre_registration: "Pré-inscription" + pre_registration_help: "Si cette option est cochée, les administrateurs et les gestionnaires devent valider les inscriptions avant qu'elles ne soient définitives." + pre_registration_end_date: "Date de fin de pré-inscription" plan_form: ACTION_title: "{ACTION, select, create{Nouvelle} other{Mettre à jour la}} formule d'abonnement" tab_settings: "Paramètres" diff --git a/db/migrate/20230612123250_add_pre_registration_to_event.rb b/db/migrate/20230612123250_add_pre_registration_to_event.rb new file mode 100644 index 000000000..d7c4b64ba --- /dev/null +++ b/db/migrate/20230612123250_add_pre_registration_to_event.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +# Add pre-registration and pre_registration_end_date to event +class AddPreRegistrationToEvent < ActiveRecord::Migration[7.0] + def change + add_column :events, :pre_registration, :boolean, default: false + add_column :events, :pre_registration_end_date, :datetime + end +end diff --git a/db/structure.sql b/db/structure.sql index 1e0fb0d6f..813d5448c 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1237,7 +1237,9 @@ CREATE TABLE public.events ( age_range_id integer, category_id integer, deleted_at timestamp without time zone, - event_type character varying DEFAULT 'standard'::character varying + event_type character varying DEFAULT 'standard'::character varying, + pre_registration boolean DEFAULT false, + pre_registration_end_date timestamp(6) without time zone ); @@ -9060,8 +9062,9 @@ INSERT INTO "schema_migrations" (version) VALUES ('20230524080448'), ('20230524083558'), ('20230524110215'); +('20230525101006'); ('20230626122844'), ('20230626122947'); -('20230525101006'); +('20230612123250');