diff --git a/app/controllers/api/children_controller.rb b/app/controllers/api/children_controller.rb new file mode 100644 index 000000000..3725695ba --- /dev/null +++ b/app/controllers/api/children_controller.rb @@ -0,0 +1,69 @@ +# frozen_string_literal: true + +# API Controller for resources of type Child +# Children are used to provide a way to manage multiple users in the family account +class API::ChildrenController < API::APIController + before_action :authenticate_user! + before_action :set_child, only: %i[show update destroy validate] + + def index + authorize Child + user_id = current_user.id + user_id = params[:user_id] if current_user.privileged? && params[:user_id] + @children = Child.where(user_id: user_id).where('birthday >= ?', 18.years.ago).includes(:supporting_document_files).order(:created_at) + end + + def show + authorize @child + end + + def create + @child = Child.new(child_params) + authorize @child + if ChildService.create(@child) + render status: :created + else + render json: @child.errors.full_messages, status: :unprocessable_entity + end + end + + def update + authorize @child + + if ChildService.update(@child, child_params) + render status: :ok + else + render json: @child.errors.full_messages, status: :unprocessable_entity + end + end + + def destroy + authorize @child + @child.destroy + head :no_content + end + + def validate + authorize @child + + cparams = params.require(:child).permit(:validated_at) + if ChildService.validate(@child, cparams[:validated_at].present?) + render :show, status: :ok, location: child_path(@child) + else + render json: @child.errors, status: :unprocessable_entity + end + end + + private + + def set_child + @child = Child.find(params[:id]) + end + + def child_params + params.require(:child).permit(:first_name, :last_name, :email, :phone, :birthday, :user_id, + supporting_document_files_attributes: %i[id supportable_id supportable_type + supporting_document_type_id + attachment _destroy]) + end +end diff --git a/app/controllers/api/events_controller.rb b/app/controllers/api/events_controller.rb index ce4b42bd9..781e170ba 100644 --- a/app/controllers/api/events_controller.rb +++ b/app/controllers/api/events_controller.rb @@ -96,7 +96,8 @@ class API::EventsController < API::APIController # handle general properties 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, + :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/controllers/api/reservations_controller.rb b/app/controllers/api/reservations_controller.rb index 3bfe28d08..260fec568 100644 --- a/app/controllers/api/reservations_controller.rb +++ b/app/controllers/api/reservations_controller.rb @@ -4,7 +4,7 @@ # Reservations are used for Training, Machine, Space and Event class API::ReservationsController < API::APIController before_action :authenticate_user! - before_action :set_reservation, only: %i[show update] + before_action :set_reservation, only: %i[show update confirm_payment] respond_to :json def index @@ -34,6 +34,16 @@ class API::ReservationsController < API::APIController end end + def confirm_payment + authorize @reservation + invoice = ReservationConfirmPaymentService.new(@reservation, current_user, params[:coupon_code], params[:offered]).call + if invoice + render :show, status: :ok, location: @reservation + else + render json: @reservation.errors, status: :unprocessable_entity + end + end + private def set_reservation diff --git a/app/controllers/api/slots_reservations_controller.rb b/app/controllers/api/slots_reservations_controller.rb index 2fcda5e83..00a355735 100644 --- a/app/controllers/api/slots_reservations_controller.rb +++ b/app/controllers/api/slots_reservations_controller.rb @@ -5,7 +5,7 @@ # availability by Availability.slot_duration, or otherwise globally by Setting.get('slot_duration') class API::SlotsReservationsController < API::APIController before_action :authenticate_user! - before_action :set_slots_reservation, only: %i[update cancel] + before_action :set_slots_reservation, only: %i[update cancel validate invalidate] respond_to :json def update @@ -23,6 +23,16 @@ class API::SlotsReservationsController < API::APIController SlotsReservationsService.cancel(@slot_reservation) end + def validate + authorize @slot_reservation + SlotsReservationsService.validate(@slot_reservation) + end + + def invalidate + authorize @slot_reservation + SlotsReservationsService.invalidate(@slot_reservation) + end + private def set_slots_reservation diff --git a/app/controllers/api/supporting_document_files_controller.rb b/app/controllers/api/supporting_document_files_controller.rb index 34868aacb..93d7b86b5 100644 --- a/app/controllers/api/supporting_document_files_controller.rb +++ b/app/controllers/api/supporting_document_files_controller.rb @@ -48,6 +48,6 @@ class API::SupportingDocumentFilesController < API::APIController # Never trust parameters from the scary internet, only allow the white list through. def supporting_document_file_params - params.required(:supporting_document_file).permit(:supporting_document_type_id, :attachment, :user_id) + params.required(:supporting_document_file).permit(:supporting_document_type_id, :attachment, :supportable_id, :supportable_type) end end diff --git a/app/controllers/api/supporting_document_refusals_controller.rb b/app/controllers/api/supporting_document_refusals_controller.rb index 1da9cabe4..8cf619e8e 100644 --- a/app/controllers/api/supporting_document_refusals_controller.rb +++ b/app/controllers/api/supporting_document_refusals_controller.rb @@ -27,6 +27,7 @@ class API::SupportingDocumentRefusalsController < API::APIController # Never trust parameters from the scary internet, only allow the white list through. def supporting_document_refusal_params - params.required(:supporting_document_refusal).permit(:message, :operator_id, :user_id, supporting_document_type_ids: []) + params.required(:supporting_document_refusal).permit(:message, :operator_id, :supportable_id, :supportable_type, + supporting_document_type_ids: []) end end diff --git a/app/controllers/api/supporting_document_types_controller.rb b/app/controllers/api/supporting_document_types_controller.rb index 68a57569a..dc2223ab2 100644 --- a/app/controllers/api/supporting_document_types_controller.rb +++ b/app/controllers/api/supporting_document_types_controller.rb @@ -45,6 +45,6 @@ class API::SupportingDocumentTypesController < API::APIController end def supporting_document_type_params - params.require(:supporting_document_type).permit(:name, group_ids: []) + params.require(:supporting_document_type).permit(:name, :document_type, group_ids: []) end end diff --git a/app/frontend/src/javascript/api/child.ts b/app/frontend/src/javascript/api/child.ts new file mode 100644 index 000000000..04a5d373a --- /dev/null +++ b/app/frontend/src/javascript/api/child.ts @@ -0,0 +1,46 @@ +import apiClient from './clients/api-client'; +import { AxiosResponse } from 'axios'; +import { Child, ChildIndexFilter } from '../models/child'; +import ApiLib from '../lib/api'; + +export default class ChildAPI { + static async index (filters: ChildIndexFilter): Promise> { + const res: AxiosResponse> = await apiClient.get(`/api/children${ApiLib.filtersToQuery(filters)}`); + return res?.data; + } + + static async get (id: number): Promise { + const res: AxiosResponse = await apiClient.get(`/api/children/${id}`); + return res?.data; + } + + static async create (child: Child): Promise { + const data = ApiLib.serializeAttachments(child, 'child', ['supporting_document_files_attributes']); + const res: AxiosResponse = await apiClient.post('/api/children', data, { + headers: { + 'Content-Type': 'multipart/form-data' + } + }); + return res?.data; + } + + static async update (child: Child): Promise { + const data = ApiLib.serializeAttachments(child, 'child', ['supporting_document_files_attributes']); + const res: AxiosResponse = await apiClient.put(`/api/children/${child.id}`, data, { + headers: { + 'Content-Type': 'multipart/form-data' + } + }); + return res?.data; + } + + static async destroy (childId: number): Promise { + const res: AxiosResponse = await apiClient.delete(`/api/children/${childId}`); + return res?.data; + } + + static async validate (child: Child): Promise { + const res: AxiosResponse = await apiClient.patch(`/api/children/${child.id}/validate`, { child }); + return res?.data; + } +} diff --git a/app/frontend/src/javascript/components/events/event-form.tsx b/app/frontend/src/javascript/components/events/event-form.tsx index e8a89c29f..8102db622 100644 --- a/app/frontend/src/javascript/components/events/event-form.tsx +++ b/app/frontend/src/javascript/components/events/event-form.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from 'react'; import * as React from 'react'; import { SubmitHandler, useFieldArray, useForm, useWatch } from 'react-hook-form'; -import { Event, EventDecoration, EventPriceCategoryAttributes, RecurrenceOption } from '../../models/event'; +import { Event, EventDecoration, EventPriceCategoryAttributes, RecurrenceOption, EventType } from '../../models/event'; import EventAPI from '../../api/event'; import { useTranslation } from 'react-i18next'; import { FormInput } from '../form/form-input'; @@ -40,7 +40,7 @@ interface EventFormProps { * Form to edit or create events */ export const EventForm: React.FC = ({ action, event, onError, onSuccess }) => { - const { handleSubmit, register, control, setValue, formState } = useForm({ defaultValues: { ...event } }); + const { handleSubmit, register, control, setValue, formState } = useForm({ defaultValues: Object.assign({ event_type: 'standard' }, event) }); const output = useWatch({ control }); const { fields, append, remove } = useFieldArray({ control, name: 'event_price_categories_attributes' }); @@ -54,6 +54,9 @@ export const EventForm: React.FC = ({ action, event, onError, on const [isOpenRecurrentModal, setIsOpenRecurrentModal] = useState(false); const [updatingEvent, setUpdatingEvent] = useState(null); const [isActiveAccounting, setIsActiveAccounting] = useState(false); + const [isActiveFamilyAccount, setIsActiveFamilyAccount] = useState(false); + const [isAcitvePreRegistration, setIsActivePreRegistration] = useState(event?.pre_registration); + const [submitting, setSubmitting] = useState(false); useEffect(() => { EventCategoryAPI.index() @@ -69,6 +72,7 @@ export const EventForm: React.FC = ({ action, event, onError, on .then(data => setPriceCategoriesOptions(data.map(c => decorationToOption(c)))) .catch(onError); SettingAPI.get('advanced_accounting').then(res => setIsActiveAccounting(res.value === 'true')).catch(onError); + SettingAPI.get('family_account').then(res => setIsActiveFamilyAccount(res.value === 'true')).catch(onError); }, []); useEffect(() => { @@ -97,6 +101,11 @@ export const EventForm: React.FC = ({ action, event, onError, on * Callback triggered when the user validates the machine form: handle create or update */ const onSubmit: SubmitHandler = (data: Event) => { + setSubmitting(true); + if (submitting) return; + if (data.pre_registration_end_date?.toString() === 'Invalid Date') { + data.pre_registration_end_date = null; + } if (action === 'update') { if (event?.recurrence_events?.length > 0) { setUpdatingEvent(data); @@ -108,7 +117,7 @@ export const EventForm: React.FC = ({ action, event, onError, on EventAPI.create(data).then(res => { onSuccess(t(`app.admin.event_form.${action}_success`)); window.location.href = `/#!/events/${res.id}`; - }).catch(onError); + }).catch(onError).finally(() => setSubmitting(false)); } }; @@ -168,11 +177,25 @@ export const EventForm: React.FC = ({ action, event, onError, on ]; }; + /** + * This method provides event type options + */ + const buildEventTypeOptions = (): Array> => { + const options = [ + { label: t('app.admin.event_form.event_types.standard'), value: 'standard' as EventType }, + { label: t('app.admin.event_form.event_types.nominative'), value: 'nominative' as EventType } + ]; + if (isActiveFamilyAccount) { + options.push({ label: t('app.admin.event_form.event_types.family'), value: 'family' as EventType }); + } + return options; + }; + return (

{t('app.admin.event_form.ACTION_title', { ACTION: action })}

- + {t('app.admin.event_form.save')}
@@ -203,6 +226,12 @@ export const EventForm: React.FC = ({ action, event, onError, on label={t('app.admin.event_form.description')} limit={null} heading bulletList blockquote link video image /> + = ({ action, event, onError, on formState={formState} options={ageRangeOptions} label={t('app.admin.event_form.age_range')} />} + + {isAcitvePreRegistration && + + }
diff --git a/app/frontend/src/javascript/components/events/event-reservation-item.tsx b/app/frontend/src/javascript/components/events/event-reservation-item.tsx new file mode 100644 index 000000000..7075c367d --- /dev/null +++ b/app/frontend/src/javascript/components/events/event-reservation-item.tsx @@ -0,0 +1,109 @@ +import React from 'react'; +import { useTranslation } from 'react-i18next'; +import { react2angular } from 'react2angular'; +import _ from 'lodash'; +import { Reservation } from '../../models/reservation'; +import FormatLib from '../../lib/format'; +import { IApplication } from '../../models/application'; + +declare const Application: IApplication; + +interface EventReservationItemProps { + reservation: Reservation; +} + +/** + * event reservation item component + */ +export const EventReservationItem: React.FC = ({ reservation }) => { + const { t } = useTranslation('logged'); + + /** + * Return the formatted localized date of the event + */ + const formatDate = (): string => { + return `${FormatLib.date(reservation.start_at)} ${FormatLib.time(reservation.start_at)} - ${FormatLib.time(reservation.end_at)}`; + }; + + /** + * Build the ticket for event price category user reservation + */ + const buildTicket = (ticket) => { + return ( + <> + + {reservation.booking_users_attributes.filter(u => u.event_price_category_id === ticket.event_price_category_id).map(u => { + return ( +

{u.name}

+ ); + })} + + ); + }; + + /** + * Return the pre-registration status + */ + const preRegistrationStatus = () => { + if (!_.isBoolean(reservation.is_valid) && !reservation.canceled_at && !reservation.is_paid) { + return t('app.logged.event_reservation_item.in_the_process_of_validation'); + } else if (reservation.is_valid && !reservation.canceled_at && !reservation.is_paid && reservation.amount !== 0) { + return t('app.logged.event_reservation_item.settle_your_payment'); + } else if (reservation.is_valid && !reservation.canceled_at && !reservation.is_paid && reservation.amount === 0) { + return t('app.logged.event_reservation_item.registered'); + } else if (!reservation.is_valid && !reservation.canceled_at) { + return t('app.logged.event_reservation_item.not_validated'); + } else if (reservation.is_paid && !reservation.canceled_at && reservation.amount !== 0) { + return t('app.logged.event_reservation_item.paid'); + } else if (reservation.is_paid && !reservation.canceled_at && reservation.amount === 0) { + return t('app.logged.event_reservation_item.present'); + } else if (reservation.canceled_at) { + return t('app.logged.event_reservation_item.canceled'); + } + }; + + return ( +
+
+
+ +

{reservation.event_title}

+ {formatDate()} +
+
+ {/* {reservation.event_type === 'family' && + {t('app.logged.event_reservation_item.family')} + } + {reservation.event_type === 'nominative' && + {t('app.logged.event_reservation_item.nominative')} + } */} + {reservation.event_pre_registration && + // eslint-disable-next-line fabmanager/no-bootstrap, fabmanager/no-utilities + {t('app.logged.event_reservation_item.pre_registration')} + } +
+
+
+
+ + {reservation.booking_users_attributes.filter(u => !u.event_price_category_id).map(u => { + return ( +

{u.name}

+ ); + })} + {reservation.tickets.map(ticket => { + return buildTicket(ticket); + })} +
+ {reservation.event_pre_registration && +
+ +

{preRegistrationStatus()}

+
+ } +
+
+ ); +}; + +Application.Components.component('eventReservationItem', react2angular(EventReservationItem, ['reservation'])); diff --git a/app/frontend/src/javascript/components/family-account/child-form.tsx b/app/frontend/src/javascript/components/family-account/child-form.tsx new file mode 100644 index 000000000..00887017f --- /dev/null +++ b/app/frontend/src/javascript/components/family-account/child-form.tsx @@ -0,0 +1,181 @@ +import React, { useState } from 'react'; +import { useForm, useWatch } from 'react-hook-form'; +import { useTranslation } from 'react-i18next'; +import moment from 'moment'; +import { Child } from '../../models/child'; +import { FormInput } from '../form/form-input'; +import { FabButton } from '../base/fab-button'; +import { FormFileUpload } from '../form/form-file-upload'; +import { FileType } from '../../models/file'; +import { SupportingDocumentType } from '../../models/supporting-document-type'; +import { User } from '../../models/user'; +import { SupportingDocumentsRefusalModal } from '../supporting-documents/supporting-documents-refusal-modal'; +import { FabAlert } from '../base/fab-alert'; + +interface ChildFormProps { + child: Child; + operator: User; + onSubmit: (data: Child) => void; + supportingDocumentsTypes: Array; + onSuccess: (message: string) => void, + onError: (message: string) => void, +} + +/** + * A form for creating or editing a child. + */ +export const ChildForm: React.FC = ({ child, onSubmit, supportingDocumentsTypes, operator, onSuccess, onError }) => { + const { t } = useTranslation('public'); + + const { register, formState, handleSubmit, setValue, control } = useForm({ + defaultValues: child + }); + const output = useWatch({ control }); // eslint-disable-line + const [refuseModalIsOpen, setRefuseModalIsOpen] = useState(false); + + /** + * get the name of the supporting document type by id + */ + const getSupportingDocumentsTypeName = (id: number): string => { + const supportingDocumentType = supportingDocumentsTypes.find((supportingDocumentType) => supportingDocumentType.id === id); + return supportingDocumentType ? supportingDocumentType.name : ''; + }; + + /** + * Check if the current operator has administrative rights or is a normal member + */ + const isPrivileged = (): boolean => { + return (operator?.role === 'admin' || operator?.role === 'manager'); + }; + + /** + * Open/closes the modal dialog to refuse the documents + */ + const toggleRefuseModal = (): void => { + setRefuseModalIsOpen(!refuseModalIsOpen); + }; + + /** + * Callback triggered when the refusal was successfully saved + */ + const onSaveRefusalSuccess = (message: string): void => { + setRefuseModalIsOpen(false); + onSuccess(message); + }; + + return ( +
+ {!isPrivileged() && + +

{t('app.public.child_form.child_form_info')}

+ + } +
+
+ + +
+
+ moment(value).isAfter(moment().subtract(18, 'year')) }} + formState={formState} + label={t('app.public.child_form.birthday')} + type="date" + max={moment().format('YYYY-MM-DD')} + min={moment().subtract(18, 'year').format('YYYY-MM-DD')} + /> + +
+ + + {!isPrivileged() && supportingDocumentsTypes?.length > 0 && <> +

{t('app.public.child_form.supporting_documents')}

+ {output.supporting_document_files_attributes.map((sf, index) => { + return ( + + ); + })} + } + +
+ + {t('app.public.child_form.save')} + +
+ + {isPrivileged() && supportingDocumentsTypes?.length > 0 && <> +

{t('app.public.child_form.supporting_documents')}

+
+ {output.supporting_document_files_attributes.map((sf, index) => { + return ( +
+ {getSupportingDocumentsTypeName(sf.supporting_document_type_id)} + {sf.attachment_url && ( +
+

{sf.attachment}

+ + + +
+ )} + {!sf.attachment_url && ( +
+

{t('app.public.child_form.to_complete')}

+
+ )} +
+ ); + })} +
+ } + + {isPrivileged() && supportingDocumentsTypes?.length > 0 && <> + +

{t('app.public.child_form.refuse_documents_info')}

+ +
+ {t('app.public.child_form.refuse_documents')} + +
+ } + +
+ ); +}; diff --git a/app/frontend/src/javascript/components/family-account/child-item.tsx b/app/frontend/src/javascript/components/family-account/child-item.tsx new file mode 100644 index 000000000..4192d2c04 --- /dev/null +++ b/app/frontend/src/javascript/components/family-account/child-item.tsx @@ -0,0 +1,71 @@ +import React from 'react'; +import { Child } from '../../models/child'; +import { useTranslation } from 'react-i18next'; +import { FabButton } from '../base/fab-button'; +import FormatLib from '../../lib/format'; +import { DeleteChildModal } from './delete-child-modal'; +import ChildAPI from '../../api/child'; +import { PencilSimple, Trash, UserSquare } from 'phosphor-react'; + +interface ChildItemProps { + child: Child; + size: 'sm' | 'lg'; + onEdit: (child: Child) => void; + onDelete: (child: Child, error: string) => void; + onError: (error: string) => void; +} + +/** + * A child item. + */ +export const ChildItem: React.FC = ({ child, size, onEdit, onDelete, onError }) => { + const { t } = useTranslation('public'); + const [isOpenDeleteChildModal, setIsOpenDeleteChildModal] = React.useState(false); + + /** + * Toggle the delete child modal + */ + const toggleDeleteChildModal = () => setIsOpenDeleteChildModal(!isOpenDeleteChildModal); + + /** + * Delete a child + */ + const deleteChild = () => { + ChildAPI.destroy(child.id).then(() => { + toggleDeleteChildModal(); + onDelete(child, t('app.public.child_item.deleted')); + }).catch((e) => { + console.error(e); + onError(t('app.public.child_item.unable_to_delete')); + }); + }; + + return ( +
+
+ +
+
+ {t('app.public.child_item.last_name')} +

{child.last_name}

+
+
+ {t('app.public.child_item.first_name')} +

{child.first_name}

+
+
+ {t('app.public.child_item.birthday')} +

{FormatLib.date(child.birthday)}

+
+
+ onEdit(child)} className="edit-btn"> + + + + + + +
+
+ ); +}; diff --git a/app/frontend/src/javascript/components/family-account/child-modal.tsx b/app/frontend/src/javascript/components/family-account/child-modal.tsx new file mode 100644 index 000000000..942dc60a2 --- /dev/null +++ b/app/frontend/src/javascript/components/family-account/child-modal.tsx @@ -0,0 +1,65 @@ +import * as React from 'react'; +import { useTranslation } from 'react-i18next'; +import { FabModal, ModalSize } from '../base/fab-modal'; +import { Child } from '../../models/child'; +import ChildAPI from '../../api/child'; +import { ChildForm } from './child-form'; +import { SupportingDocumentType } from '../../models/supporting-document-type'; +import { ChildValidation } from './child-validation'; +import { User } from '../../models/user'; + +interface ChildModalProps { + child?: Child; + operator: User; + isOpen: boolean; + toggleModal: () => void; + onSuccess: (child: Child, msg: string) => void; + onError: (error: string) => void; + supportingDocumentsTypes: Array; +} + +/** + * A modal for creating or editing a child. + */ +export const ChildModal: React.FC = ({ child, isOpen, toggleModal, onSuccess, onError, supportingDocumentsTypes, operator }) => { + const { t } = useTranslation('public'); + + /** + * Save the child to the API + */ + const handleSaveChild = async (data: Child): Promise => { + let c: Child = data; + try { + if (child?.id) { + c = await ChildAPI.update(data); + } else { + c = await ChildAPI.create(data); + } + toggleModal(); + onSuccess(c, ''); + } catch (error) { + onError(error); + } + }; + + return ( + + {(operator?.role === 'admin' || operator?.role === 'manager') && + + } + onSuccess(child, msg)} + onError={onError} + /> + + ); +}; diff --git a/app/frontend/src/javascript/components/family-account/child-validation.tsx b/app/frontend/src/javascript/components/family-account/child-validation.tsx new file mode 100644 index 000000000..92f6db8db --- /dev/null +++ b/app/frontend/src/javascript/components/family-account/child-validation.tsx @@ -0,0 +1,54 @@ +import { useState, useEffect } from 'react'; +import * as React from 'react'; +import Switch from 'react-switch'; +import _ from 'lodash'; +import { useTranslation } from 'react-i18next'; +import { Child } from '../../models/child'; +import ChildAPI from '../../api/child'; +import { TDateISO } from '../../typings/date-iso'; + +interface ChildValidationProps { + child: Child + onSuccess: (child: Child, msg: string) => void; + onError: (message: string) => void, +} + +/** + * This component allows to configure boolean value for a setting. + */ +export const ChildValidation: React.FC = ({ child, onSuccess, onError }) => { + const { t } = useTranslation('admin'); + + const [value, setValue] = useState(!!(child?.validated_at)); + + useEffect(() => { + setValue(!!(child?.validated_at)); + }, [child]); + + /** + * Callback triggered when the 'switch' is changed. + */ + const handleChanged = (_value: boolean) => { + setValue(_value); + const _child = _.clone(child); + if (_value) { + _child.validated_at = new Date().toISOString() as TDateISO; + } else { + _child.validated_at = null; + } + ChildAPI.validate(_child) + .then((c) => { + onSuccess(c, t(`app.admin.child_validation.${_value ? 'validate' : 'invalidate'}_child_success`)); + }).catch(err => { + setValue(!_value); + onError(t(`app.admin.child_validation.${_value ? 'validate' : 'invalidate'}_child_error`) + err); + }); + }; + + return ( +
+ + +
+ ); +}; diff --git a/app/frontend/src/javascript/components/family-account/children-dashboard.tsx b/app/frontend/src/javascript/components/family-account/children-dashboard.tsx new file mode 100644 index 000000000..c9f856d58 --- /dev/null +++ b/app/frontend/src/javascript/components/family-account/children-dashboard.tsx @@ -0,0 +1,129 @@ +import React, { useState, useEffect } from 'react'; +import { react2angular } from 'react2angular'; +import { Child } from '../../models/child'; +import ChildAPI from '../../api/child'; +import { User } from '../../models/user'; +import { useTranslation } from 'react-i18next'; +import { Loader } from '../base/loader'; +import { IApplication } from '../../models/application'; +import { ChildModal } from './child-modal'; +import { ChildItem } from './child-item'; +import { FabButton } from '../base/fab-button'; +import { SupportingDocumentType } from '../../models/supporting-document-type'; +import SupportingDocumentTypeAPI from '../../api/supporting-document-type'; + +declare const Application: IApplication; + +interface ChildrenDashboardProps { + user: User; + operator: User; + adminPanel?: boolean; + onSuccess: (error: string) => void; + onError: (error: string) => void; +} + +/** + * A list of children belonging to the current user. + */ +export const ChildrenDashboard: React.FC = ({ user, operator, adminPanel, onError, onSuccess }) => { + const { t } = useTranslation('public'); + + const [children, setChildren] = useState>([]); + const [isOpenChildModal, setIsOpenChildModal] = useState(false); + const [child, setChild] = useState(); + const [supportingDocumentsTypes, setSupportingDocumentsTypes] = useState>([]); + + useEffect(() => { + ChildAPI.index({ user_id: user.id }).then(setChildren); + SupportingDocumentTypeAPI.index({ document_type: 'Child' }).then(tData => { + setSupportingDocumentsTypes(tData); + }); + }, [user]); + + /** + * Open the add child modal + */ + const addChild = () => { + setIsOpenChildModal(true); + setChild({ + user_id: user.id, + supporting_document_files_attributes: supportingDocumentsTypes.map(t => { + return { supporting_document_type_id: t.id }; + }) + } as Child); + }; + + /** + * Open the edit child modal + */ + const editChild = (child: Child) => { + setIsOpenChildModal(true); + setChild({ + ...child, + supporting_document_files_attributes: supportingDocumentsTypes.map(t => { + const file = child.supporting_document_files_attributes.find(f => f.supporting_document_type_id === t.id); + return file || { supporting_document_type_id: t.id }; + }) + } as Child); + }; + + /** + * Delete a child + */ + const handleDeleteChildSuccess = (_child: Child, msg: string) => { + ChildAPI.index({ user_id: user.id }).then(setChildren); + onSuccess(msg); + }; + + /** + * Handle save child success from the API + */ + const handleSaveChildSuccess = (_data: Child, msg: string) => { + ChildAPI.index({ user_id: user.id }).then(setChildren); + if (msg) { + onSuccess(msg); + } + }; + + /** + * Check if the current operator has administrative rights or is a normal member + */ + const isPrivileged = (): boolean => { + return (operator?.role === 'admin' || operator?.role === 'manager'); + }; + + return ( +
+
+ {adminPanel + ?

{t('app.public.children_dashboard.heading')}

+ :

{t('app.public.children_dashboard.member_heading')}

+ } + {!isPrivileged() && ( +
+ + {t('app.public.children_dashboard.add_child')} + +
+ )} +
+ +
+ {children.map(child => ( + + ))} +
+ setIsOpenChildModal(false)} onSuccess={handleSaveChildSuccess} onError={onError} supportingDocumentsTypes={supportingDocumentsTypes} operator={operator} /> +
+ ); +}; + +const ChildrenDashboardWrapper: React.FC = (props) => { + return ( + + + + ); +}; + +Application.Components.component('childrenDashboard', react2angular(ChildrenDashboardWrapper, ['user', 'operator', 'adminPanel', 'onSuccess', 'onError'])); diff --git a/app/frontend/src/javascript/components/family-account/delete-child-modal.tsx b/app/frontend/src/javascript/components/family-account/delete-child-modal.tsx new file mode 100644 index 000000000..ba844d796 --- /dev/null +++ b/app/frontend/src/javascript/components/family-account/delete-child-modal.tsx @@ -0,0 +1,37 @@ +import * as React from 'react'; +import { useTranslation } from 'react-i18next'; +import { FabModal } from '../base/fab-modal'; +import { Child } from '../../models/child'; + +interface DeleteChildModalProps { + isOpen: boolean, + toggleModal: () => void, + child: Child, + onDelete: (child: Child) => void, +} + +/** + * Modal dialog to remove a requested child + */ +export const DeleteChildModal: React.FC = ({ isOpen, toggleModal, onDelete, child }) => { + const { t } = useTranslation('public'); + + /** + * Callback triggered when the child confirms the deletion + */ + const handleDeleteChild = () => { + onDelete(child); + }; + + return ( + +

{t('app.public.delete_child_modal.confirm_delete_child')}

+ + ); +}; diff --git a/app/frontend/src/javascript/components/form/form-file-upload.tsx b/app/frontend/src/javascript/components/form/form-file-upload.tsx index 253974e96..22b58a252 100644 --- a/app/frontend/src/javascript/components/form/form-file-upload.tsx +++ b/app/frontend/src/javascript/components/form/form-file-upload.tsx @@ -19,12 +19,13 @@ type FormFileUploadProps = FormComponent & AbstractF accept?: string, onFileChange?: (value: FileType) => void, onFileRemove?: () => void, + showRemoveButton?: boolean, } /** * This component allows to upload file, in forms managed by react-hook-form. */ -export const FormFileUpload = ({ id, label, register, defaultFile, className, rules, disabled, error, warning, formState, onFileChange, onFileRemove, accept, setValue }: FormFileUploadProps) => { +export const FormFileUpload = ({ id, label, register, defaultFile, className, rules, disabled, error, warning, formState, onFileChange, onFileRemove, accept, setValue, showRemoveButton = true }: FormFileUploadProps) => { const { t } = useTranslation('shared'); const [file, setFile] = useState(defaultFile); @@ -74,9 +75,10 @@ export const FormFileUpload = ({ id, label, re return (
- {hasFile() && ( - {file.attachment_name} - )} + {hasFile() + ? {file.attachment_name} + : {t('app.shared.form_file_upload.placeholder')} + } diff --git a/app/frontend/src/javascript/components/form/form-input.tsx b/app/frontend/src/javascript/components/form/form-input.tsx index d4a4331e9..5a1aed014 100644 --- a/app/frontend/src/javascript/components/form/form-input.tsx +++ b/app/frontend/src/javascript/components/form/form-input.tsx @@ -22,13 +22,15 @@ type FormInputProps = FormComponent & Ab onChange?: (event: React.ChangeEvent) => void, nullable?: boolean, ariaLabel?: string, - maxLength?: number + maxLength?: number, + max?: number | string, + min?: number | string, } /** * This component is a template for an input component to use within React Hook Form */ -export const FormInput = ({ id, register, label, tooltip, defaultValue, icon, className, rules, disabled, type, addOn, addOnAction, addOnClassName, addOnAriaLabel, placeholder, error, warning, formState, step, onChange, debounce, accept, nullable = false, ariaLabel, maxLength }: FormInputProps) => { +export const FormInput = ({ id, register, label, tooltip, defaultValue, icon, className, rules, disabled, type, addOn, addOnAction, addOnClassName, addOnAriaLabel, placeholder, error, warning, formState, step, onChange, debounce, accept, nullable = false, ariaLabel, maxLength, max, min }: FormInputProps) => { const [characterCount, setCharacterCount] = useState(0); /** @@ -100,7 +102,9 @@ export const FormInput = ({ id, re disabled={typeof disabled === 'function' ? disabled(id) : disabled} placeholder={placeholder} accept={accept} - maxLength={maxLength} /> + maxLength={maxLength} + max={max} + min={min}/> {(type === 'file' && placeholder) && {placeholder}} {maxLength && {characterCount} / {maxLength}} {addOn && addOnAction && } diff --git a/app/frontend/src/javascript/components/supporting-documents/supporting-documents-files.tsx b/app/frontend/src/javascript/components/supporting-documents/supporting-documents-files.tsx index 8c5ecf5f0..a1b5b4f6b 100644 --- a/app/frontend/src/javascript/components/supporting-documents/supporting-documents-files.tsx +++ b/app/frontend/src/javascript/components/supporting-documents/supporting-documents-files.tsx @@ -49,7 +49,7 @@ export const SupportingDocumentsFiles: React.FC = SupportingDocumentTypeAPI.index({ group_id: currentUser.group_id }).then(tData => { setSupportingDocumentsTypes(tData); }); - SupportingDocumentFileAPI.index({ user_id: currentUser.id }).then(fData => { + SupportingDocumentFileAPI.index({ supportable_id: currentUser.id, supportable_type: 'User' }).then(fData => { setSupportingDocumentsFiles(fData); }); }, []); @@ -106,7 +106,8 @@ export const SupportingDocumentsFiles: React.FC = for (const proofOfIdentityTypeId of Object.keys(files)) { const formData = new FormData(); - formData.append('supporting_document_file[user_id]', currentUser.id.toString()); + formData.append('supporting_document_file[supportable_id]', currentUser.id.toString()); + formData.append('supporting_document_file[supportable_type]', 'User'); formData.append('supporting_document_file[supporting_document_type_id]', proofOfIdentityTypeId); formData.append('supporting_document_file[attachment]', files[proofOfIdentityTypeId]); const proofOfIdentityFile = getSupportingDocumentsFileByType(parseInt(proofOfIdentityTypeId, 10)); @@ -117,7 +118,7 @@ export const SupportingDocumentsFiles: React.FC = } } if (Object.keys(files).length > 0) { - SupportingDocumentFileAPI.index({ user_id: currentUser.id }).then(fData => { + SupportingDocumentFileAPI.index({ supportable_id: currentUser.id, supportable_type: 'User' }).then(fData => { setSupportingDocumentsFiles(fData); setFiles({}); onSuccess(t('app.logged.dashboard.supporting_documents_files.file_successfully_uploaded')); diff --git a/app/frontend/src/javascript/components/supporting-documents/supporting-documents-refusal-modal.tsx b/app/frontend/src/javascript/components/supporting-documents/supporting-documents-refusal-modal.tsx index 1e2336024..6a436af10 100644 --- a/app/frontend/src/javascript/components/supporting-documents/supporting-documents-refusal-modal.tsx +++ b/app/frontend/src/javascript/components/supporting-documents/supporting-documents-refusal-modal.tsx @@ -5,6 +5,7 @@ import { FabModal } from '../base/fab-modal'; import { SupportingDocumentType } from '../../models/supporting-document-type'; import { SupportingDocumentRefusal } from '../../models/supporting-document-refusal'; import { User } from '../../models/user'; +import { Child } from '../../models/child'; import SupportingDocumentRefusalAPI from '../../api/supporting-document-refusal'; import { SupportingDocumentsRefusalForm } from './supporting-documents-refusal-form'; @@ -15,19 +16,21 @@ interface SupportingDocumentsRefusalModalProps { onError: (message: string) => void, proofOfIdentityTypes: Array, operator: User, - member: User + supportable: User | Child, + documentType: 'User' | 'Child', } /** * Modal dialog to notify the member that his documents are refused */ -export const SupportingDocumentsRefusalModal: React.FC = ({ isOpen, toggleModal, onSuccess, proofOfIdentityTypes, operator, member, onError }) => { +export const SupportingDocumentsRefusalModal: React.FC = ({ isOpen, toggleModal, onSuccess, proofOfIdentityTypes, operator, supportable, onError, documentType }) => { const { t } = useTranslation('admin'); const [data, setData] = useState({ id: null, operator_id: operator.id, - user_id: member.id, + supportable_id: supportable.id, + supportable_type: documentType, supporting_document_type_ids: [], message: '' }); diff --git a/app/frontend/src/javascript/components/supporting-documents/supporting-documents-type-form.tsx b/app/frontend/src/javascript/components/supporting-documents/supporting-documents-type-form.tsx index 3e26b2963..5005f4d4b 100644 --- a/app/frontend/src/javascript/components/supporting-documents/supporting-documents-type-form.tsx +++ b/app/frontend/src/javascript/components/supporting-documents/supporting-documents-type-form.tsx @@ -63,13 +63,15 @@ export const SupportingDocumentsTypeForm: React.FC
-
- +
+ }
} diff --git a/app/frontend/src/javascript/components/supporting-documents/supporting-documents-type-modal.tsx b/app/frontend/src/javascript/components/supporting-documents/supporting-documents-type-modal.tsx index be457f531..c42c490cd 100644 --- a/app/frontend/src/javascript/components/supporting-documents/supporting-documents-type-modal.tsx +++ b/app/frontend/src/javascript/components/supporting-documents/supporting-documents-type-modal.tsx @@ -14,18 +14,19 @@ interface SupportingDocumentsTypeModalProps { onError: (message: string) => void, groups: Array, proofOfIdentityType?: SupportingDocumentType, + documentType: 'User' | 'Child', } /** * Modal dialog to create/edit a supporting documents type */ -export const SupportingDocumentsTypeModal: React.FC = ({ isOpen, toggleModal, onSuccess, onError, proofOfIdentityType, groups }) => { +export const SupportingDocumentsTypeModal: React.FC = ({ isOpen, toggleModal, onSuccess, onError, proofOfIdentityType, groups, documentType }) => { const { t } = useTranslation('admin'); - const [data, setData] = useState({ id: proofOfIdentityType?.id, group_ids: proofOfIdentityType?.group_ids || [], name: proofOfIdentityType?.name || '' }); + const [data, setData] = useState({ id: proofOfIdentityType?.id, group_ids: proofOfIdentityType?.group_ids || [], name: proofOfIdentityType?.name || '', document_type: documentType }); useEffect(() => { - setData({ id: proofOfIdentityType?.id, group_ids: proofOfIdentityType?.group_ids || [], name: proofOfIdentityType?.name || '' }); + setData({ id: proofOfIdentityType?.id, group_ids: proofOfIdentityType?.group_ids || [], name: proofOfIdentityType?.name || '', document_type: documentType }); }, [proofOfIdentityType]); /** @@ -63,7 +64,7 @@ export const SupportingDocumentsTypeModal: React.FC { - return !data.name || data.group_ids.length === 0; + return !data.name || (documentType === 'User' && data.group_ids.length === 0); }; return ( diff --git a/app/frontend/src/javascript/components/supporting-documents/supporting-documents-types-list.tsx b/app/frontend/src/javascript/components/supporting-documents/supporting-documents-types-list.tsx index 8fb888908..52a388983 100644 --- a/app/frontend/src/javascript/components/supporting-documents/supporting-documents-types-list.tsx +++ b/app/frontend/src/javascript/components/supporting-documents/supporting-documents-types-list.tsx @@ -15,18 +15,20 @@ import SupportingDocumentTypeAPI from '../../api/supporting-document-type'; import { FabPanel } from '../base/fab-panel'; import { FabAlert } from '../base/fab-alert'; import { FabButton } from '../base/fab-button'; +import { PencilSimple, Trash } from 'phosphor-react'; declare const Application: IApplication; interface SupportingDocumentsTypesListProps { onSuccess: (message: string) => void, onError: (message: string) => void, + documentType: 'User' | 'Child', } /** * This component shows a list of all types of supporting documents (e.g. student ID, Kbis extract, etc.) */ -const SupportingDocumentsTypesList: React.FC = ({ onSuccess, onError }) => { +const SupportingDocumentsTypesList: React.FC = ({ onSuccess, onError, documentType }) => { const { t } = useTranslation('admin'); // list of displayed supporting documents type @@ -48,7 +50,7 @@ const SupportingDocumentsTypesList: React.FC useEffect(() => { GroupAPI.index({ disabled: false }).then(data => { setGroups(data); - SupportingDocumentTypeAPI.index().then(pData => { + SupportingDocumentTypeAPI.index({ document_type: documentType }).then(pData => { setSupportingDocumentsTypes(pData); }); }); @@ -91,7 +93,7 @@ const SupportingDocumentsTypesList: React.FC */ const onSaveTypeSuccess = (message: string): void => { setModalIsOpen(false); - SupportingDocumentTypeAPI.index().then(pData => { + SupportingDocumentTypeAPI.index({ document_type: documentType }).then(pData => { setSupportingDocumentsTypes(orderTypes(pData, supportingDocumentsTypeOrder)); onSuccess(message); }).catch((error) => { @@ -121,7 +123,7 @@ const SupportingDocumentsTypesList: React.FC */ const onDestroySuccess = (message: string): void => { setDestroyModalIsOpen(false); - SupportingDocumentTypeAPI.index().then(pData => { + SupportingDocumentTypeAPI.index({ document_type: documentType }).then(pData => { setSupportingDocumentsTypes(pData); setSupportingDocumentsTypes(orderTypes(pData, supportingDocumentsTypeOrder)); onSuccess(message); @@ -190,83 +192,138 @@ const SupportingDocumentsTypesList: React.FC window.location.href = '/#!/admin/members?tabs=1'; }; - return ( - - {t('app.admin.settings.account.supporting_documents_types_list.add_supporting_documents_types')} -
}> -
-
-

{t('app.admin.settings.account.supporting_documents_types_list.supporting_documents_type_info')}

- - - {t('app.admin.settings.account.supporting_documents_types_list.create_groups')} - + if (documentType === 'User') { + return ( + + {t('app.admin.settings.account.supporting_documents_types_list.add_supporting_documents_types')} +
}> +
+
+

{t('app.admin.settings.account.supporting_documents_types_list.supporting_documents_type_info')}

+ + + {t('app.admin.settings.account.supporting_documents_types_list.create_groups')} + +
+ +
+

{t('app.admin.settings.account.supporting_documents_types_list.supporting_documents_type_title')}

+ {t('app.admin.settings.account.supporting_documents_types_list.add_type')} +
+ + + + + + + + + + + + + + {supportingDocumentsTypes.map(poit => { + return ( + + + + + + ); + })} + +
+ + {t('app.admin.settings.account.supporting_documents_types_list.group_name')} + + + + + {t('app.admin.settings.account.supporting_documents_types_list.name')} + + +
{getGroupsNames(poit.group_ids)}{poit.name} +
+ + + + + + +
+
+ {!hasTypes() && ( +

+ +

+ )}
+ + ); + } else if (documentType === 'Child') { + return ( +
+
+
+

{t('app.admin.settings.account.supporting_documents_types_list.supporting_documents_type_title')}

+ {t('app.admin.settings.account.supporting_documents_types_list.add_type')} +
-
-

{t('app.admin.settings.account.supporting_documents_types_list.supporting_documents_type_title')}

- {t('app.admin.settings.account.supporting_documents_types_list.add_type')} + + + +
+ {supportingDocumentsTypes.map(poit => { + return ( +
+
+

{poit.name}

+
+ + + + + + +
+
+
+ ); + })} +
+ + {!hasTypes() && ( +

+ +

+ )}
- - - - - - - - - - - - - - {supportingDocumentsTypes.map(poit => { - return ( - - - - - - ); - })} - -
- - {t('app.admin.settings.account.supporting_documents_types_list.group_name')} - - - - - {t('app.admin.settings.account.supporting_documents_types_list.name')} - - -
{getGroupsNames(poit.group_ids)}{poit.name} -
- - - - - - -
-
- {!hasTypes() && ( -

- -

- )}
- - ); + ); + } else { + return null; + } }; const SupportingDocumentsTypesListWrapper: React.FC = (props) => { @@ -277,4 +334,4 @@ const SupportingDocumentsTypesListWrapper: React.FC void, onError: (message: string) => void, } @@ -26,7 +27,7 @@ interface SupportingDocumentsValidationProps { /** * This component shows a list of supporting documents file of member, admin can download and valid **/ -const SupportingDocumentsValidation: React.FC = ({ operator, member, onSuccess, onError }) => { +const SupportingDocumentsValidation: React.FC = ({ operator, member, onSuccess, onError, documentType }) => { const { t } = useTranslation('admin'); // list of supporting documents type @@ -39,7 +40,7 @@ const SupportingDocumentsValidation: React.FC { setDocumentsTypes(tData); }); - SupportingDocumentFileAPI.index({ user_id: member.id }).then(fData => { + SupportingDocumentFileAPI.index({ supportable_id: member.id, supportable_type: 'User' }).then(fData => { setDocumentsFiles(fData); }); }, []); @@ -112,7 +113,8 @@ const SupportingDocumentsValidation: React.FC @@ -131,4 +133,4 @@ const SupportingDocumentsValidationWrapper: React.FC void, + onSuccess: (message: string) => void + onEditChild: (child: Child) => void; + onDeleteChild: (child: Child, error: string) => void; + onDeleteMember: (memberId: number) => void; +} + +/** + * Members list + */ +export const MembersListItem: React.FC = ({ member, onError, onEditChild, onDeleteChild, onDeleteMember }) => { + const { t } = useTranslation('admin'); + + const [childrenList, setChildrenList] = useState(false); + + /** + * Redirect to the given user edition page + */ + const toMemberEdit = (memberId: number): void => { + window.location.href = `/#!/admin/members/${memberId}/edit`; + }; + + /** + * member and all his children are validated + */ + const memberIsValidated = (): boolean => { + return member.validated_at && member.children.every((child) => child.validated_at); + }; + + return ( +
+
+
+ {(member.children.length > 0) + ? + : + } +
+ {(member.children.length > 0) && + setChildrenList(!childrenList)} className={`toggle ${childrenList ? 'open' : ''}`}> + + + } +
+ +
+
+
+ {t('app.admin.members_list_item.surname')} +

{member.profile.last_name}

+
+
+ {t('app.admin.members_list_item.first_name')} +

{member.profile.first_name}

+
+
+ {t('app.admin.members_list_item.phone')} +

{member.profile.phone || '---'}

+
+
+ {t('app.admin.members_list_item.email')} +

{member.email}

+
+
+ {t('app.admin.members_list_item.group')} +

{member.group.name}

+
+
+ {t('app.admin.members_list_item.subscription')} +

{member.subscribed_plan?.name || '---'}

+
+
+ +
+ toMemberEdit(member.id)} className="edit-btn"> + + + onDeleteMember(member.id)} className="delete-btn"> + + +
+
+ + { (member.children.length > 0) && +
+
+ {member.children.map((child: Child) => ( + + ))} +
+ } +
+ ); +}; diff --git a/app/frontend/src/javascript/components/user/members-list.tsx b/app/frontend/src/javascript/components/user/members-list.tsx new file mode 100644 index 000000000..ad911c0a0 --- /dev/null +++ b/app/frontend/src/javascript/components/user/members-list.tsx @@ -0,0 +1,89 @@ +import React, { useState, useEffect } from 'react'; +import { IApplication } from '../../models/application'; +import { Loader } from '../base/loader'; +import { react2angular } from 'react2angular'; +import { Member } from '../../models/member'; +import { MembersListItem } from './members-list-item'; +import { SupportingDocumentType } from '../../models/supporting-document-type'; +import SupportingDocumentTypeAPI from '../../api/supporting-document-type'; +import { Child } from '../../models/child'; +import { ChildModal } from '../family-account/child-modal'; +import { User } from '../../models/user'; + +declare const Application: IApplication; + +interface MembersListProps { + members: Member[], + operator: User, + onError: (message: string) => void, + onSuccess: (message: string) => void + onDeleteMember: (memberId: number) => void; + onDeletedChild: (memberId: number, childId: number) => void; + onUpdatedChild: (memberId: number, child: Child) => void; +} + +/** + * Members list + */ +export const MembersList: React.FC = ({ members, onError, onSuccess, operator, onDeleteMember, onDeletedChild, onUpdatedChild }) => { + const [supportingDocumentsTypes, setSupportingDocumentsTypes] = useState>([]); + const [child, setChild] = useState(); + const [isOpenChildModal, setIsOpenChildModal] = useState(false); + + useEffect(() => { + SupportingDocumentTypeAPI.index({ document_type: 'Child' }).then(tData => { + setSupportingDocumentsTypes(tData); + }); + }, []); + + /** + * Open the edit child modal + */ + const editChild = (child: Child) => { + setIsOpenChildModal(true); + setChild({ + ...child, + supporting_document_files_attributes: supportingDocumentsTypes.map(t => { + const file = child.supporting_document_files_attributes.find(f => f.supporting_document_type_id === t.id); + return file || { supporting_document_type_id: t.id }; + }) + } as Child); + }; + + /** + * Delete a child + */ + const handleDeleteChildSuccess = (c: Child, msg: string) => { + onDeletedChild(c.user_id, c.id); + onSuccess(msg); + }; + + /** + * Handle save child success from the API + */ + const handleSaveChildSuccess = (c: Child, msg: string) => { + onUpdatedChild(c.user_id, c); + if (msg) { + onSuccess(msg); + } + }; + + return ( +
+ {members.map(member => ( + + ))} + setIsOpenChildModal(false)} onSuccess={handleSaveChildSuccess} onError={onError} supportingDocumentsTypes={supportingDocumentsTypes} operator={operator} /> +
+ ); +}; + +const MembersListWrapper: React.FC = (props) => { + return ( + + + + ); +}; + +Application.Components.component('membersList', react2angular(MembersListWrapper, ['members', 'onError', 'onSuccess', 'operator', 'onDeleteMember', 'onDeletedChild', 'onUpdatedChild'])); diff --git a/app/frontend/src/javascript/controllers/admin/events.js b/app/frontend/src/javascript/controllers/admin/events.js index 6ce0cadee..420097e01 100644 --- a/app/frontend/src/javascript/controllers/admin/events.js +++ b/app/frontend/src/javascript/controllers/admin/events.js @@ -436,7 +436,7 @@ Application.Controllers.controller('AdminEventsController', ['$scope', '$state', /** * Controller used in the reservations listing page for a specific event */ -Application.Controllers.controller('ShowEventReservationsController', ['$scope', 'eventPromise', 'reservationsPromise', function ($scope, eventPromise, reservationsPromise) { +Application.Controllers.controller('ShowEventReservationsController', ['$scope', 'eventPromise', 'reservationsPromise', 'dialogs', 'SlotsReservation', 'growl', '_t', 'Price', 'Wallet', '$uibModal', 'Event', function ($scope, eventPromise, reservationsPromise, dialogs, SlotsReservation, growl, _t, Price, Wallet, $uibModal, Event) { // retrieve the event from the ID provided in the current URL $scope.event = eventPromise; @@ -451,6 +451,219 @@ Application.Controllers.controller('ShowEventReservationsController', ['$scope', $scope.isCancelled = function (reservation) { return !!(reservation.slots_reservations_attributes[0].canceled_at); }; + + /** + * Test if the provided reservation has been validated + * @param reservation {Reservation} + * @returns {boolean} + */ + $scope.isValidated = function (reservation) { + return reservation.slots_reservations_attributes[0].is_valid === true || reservation.slots_reservations_attributes[0].is_valid === 'true'; + }; + + /** + * Test if the provided reservation has been invalidated + * @param reservation {Reservation} + * @returns {boolean} + */ + $scope.isInvalidated = function (reservation) { + return reservation.slots_reservations_attributes[0].is_valid === false || reservation.slots_reservations_attributes[0].is_valid === 'false'; + }; + + /** + * Get the price of a reservation + * @param reservation {Reservation} + */ + $scope.reservationAmount = function (reservation) { + let amount = 0; + for (const user of reservation.booking_users_attributes) { + if (user.event_price_category_id) { + const price_category = _.find($scope.event.event_price_categories_attributes, { id: user.event_price_category_id }); + if (price_category) { + amount += price_category.amount; + } + } else { + amount += $scope.event.amount; + } + } + return amount; + }; + + /** + * Callback to validate a reservation + * @param reservation {Reservation} + */ + $scope.validateReservation = function (reservation) { + SlotsReservation.validate({ + id: reservation.slots_reservations_attributes[0].id + }, () => { // successfully validated + growl.success(_t('app.admin.event_reservations.reservation_was_successfully_validated')); + const index = $scope.reservations.indexOf(reservation); + $scope.reservations[index].slots_reservations_attributes[0].is_valid = true; + Event.get({ id: $scope.event.id }).$promise.then(function (event) { + $scope.event = event; + }); + }, () => { + growl.warning(_t('app.admin.event_reservations.validation_failed')); + }); + }; + + /** + * Callback to invalidate a reservation + * @param reservation {Reservation} + */ + $scope.invalidateReservation = function (reservation) { + SlotsReservation.invalidate({ + id: reservation.slots_reservations_attributes[0].id + }, () => { // successfully validated + growl.success(_t('app.admin.event_reservations.reservation_was_successfully_invalidated')); + const index = $scope.reservations.indexOf(reservation); + $scope.reservations[index].slots_reservations_attributes[0].is_valid = false; + Event.get({ id: $scope.event.id }).$promise.then(function (event) { + $scope.event = event; + }); + }, () => { + growl.warning(_t('app.admin.event_reservations.invalidation_failed')); + }); + }; + + const mkCartItems = function (reservation, coupon) { + return { + customer_id: reservation.user_id, + items: [{ + reservation: { + ...reservation, + slots_reservations_attributes: reservation.slots_reservations_attributes.map(sr => ({ slot_id: sr.slot_id })), + tickets_attributes: reservation.tickets_attributes.map(t => ({ booked: t.booked, event_price_category_id: t.event_price_category.id })), + booking_users_attributes: reservation.booking_users_attributes.map(bu => ( + { name: bu.name, event_price_category_id: bu.event_price_category_id, booked_id: bu.booked_id, booked_type: bu.booked_type } + )) + } + }], + coupon_code: ((coupon ? coupon.code : undefined)), + payment_method: '' + }; + }; + + $scope.payReservation = function (reservation) { + const modalInstance = $uibModal.open({ + templateUrl: '/admin/events/pay_reservation_modal.html', + size: 'sm', + resolve: { + event () { + return $scope.event; + }, + reservation () { + return reservation; + }, + price () { + return Price.compute(mkCartItems(reservation)).$promise; + }, + wallet () { + return Wallet.getWalletByUser({ user_id: reservation.user_id }).$promise; + }, + cartItems () { + return mkCartItems(reservation); + } + }, + controller: ['$scope', '$uibModalInstance', 'reservation', 'price', 'wallet', 'cartItems', 'helpers', '$filter', '_t', 'Reservation', 'event', + function ($scope, $uibModalInstance, reservation, price, wallet, cartItems, helpers, $filter, _t, Reservation, event) { + $scope.event = event; + + // User's wallet amount + $scope.wallet = wallet; + + // Price + $scope.price = price; + + // Cart items + $scope.cartItems = cartItems; + + // price to pay + $scope.amount = helpers.getAmountToPay(price.price, wallet.amount); + + // Reservation + $scope.reservation = reservation; + + $scope.coupon = { applied: null }; + + $scope.offered = false; + + $scope.payment = false; + + // Button label + $scope.setValidButtonName = function () { + if ($scope.amount > 0 && !$scope.offered) { + $scope.validButtonName = _t('app.admin.event_reservations.confirm_payment_of_html', { ROLE: $scope.currentUser.role, AMOUNT: $filter('currency')($scope.amount) }); + } else { + $scope.validButtonName = _t('app.shared.buttons.confirm'); + } + }; + + /** + * Compute the total amount for the current reservation according to the previously set parameters + */ + $scope.computeEventAmount = function () { + Price.compute(mkCartItems(reservation, $scope.coupon.applied), function (res) { + $scope.price = res; + $scope.amount = helpers.getAmountToPay($scope.price.price, wallet.amount); + $scope.setValidButtonName(); + }); + }; + + // Callback to validate the payment + $scope.ok = function () { + $scope.attempting = true; + return Reservation.confirm_payment({ + id: reservation.id, + coupon_code: $scope.coupon.applied ? $scope.coupon.applied.code : null, + offered: $scope.offered + }, function (res) { + $uibModalInstance.close(res); + return $scope.attempting = true; + } + , function (response) { + $scope.alerts = []; + angular.forEach(response, function (v, k) { + angular.forEach(v, function (err) { + $scope.alerts.push({ + msg: k + ': ' + err, + type: 'danger' + }); + }); + }); + return $scope.attempting = false; + }); + }; + + // Callback to cancel the payment + $scope.cancel = function () { $uibModalInstance.dismiss('cancel'); }; + + $scope.$watch('coupon.applied', function (newValue, oldValue) { + if ((newValue !== null) || (oldValue !== null)) { + return $scope.computeEventAmount(); + } + }); + + $scope.setValidButtonName(); + }] + }); + modalInstance.result.then(function (reservation) { + $scope.reservations = $scope.reservations.map((r) => { + if (r.id === reservation.id) { + return reservation; + } + if ($scope.reservationAmount(reservation) === 0) { + growl.success(_t('app.admin.event_reservations.reservation_was_successfully_present')); + } else { + growl.success(_t('app.admin.event_reservations.reservation_was_successfully_paid')); + } + return r; + }); + }, function () { + console.log('Pay reservation modal dismissed at: ' + new Date()); + }); + }; }]); /** diff --git a/app/frontend/src/javascript/controllers/admin/members.js b/app/frontend/src/javascript/controllers/admin/members.js index 3957098d2..1f9acabd4 100644 --- a/app/frontend/src/javascript/controllers/admin/members.js +++ b/app/frontend/src/javascript/controllers/admin/members.js @@ -293,7 +293,7 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce', Member.delete( { id: memberId }, function () { - $scope.members.splice(findItemIdxById($scope.members, memberId), 1); + $scope.members = _.filter($scope.members, function (m) { return m.id !== memberId; }); return growl.success(_t('app.admin.members.member_successfully_deleted')); }, function (error) { @@ -305,6 +305,31 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce', ); }; + $scope.onDeletedChild = function (memberId, childId) { + $scope.members = $scope.members.map(function (member) { + if (member.id === memberId) { + member.children = _.filter(member.children, function (c) { return c.id !== childId; }); + return member; + } + return member; + }); + }; + + $scope.onUpdatedChild = function (memberId, child) { + $scope.members = $scope.members.map(function (member) { + if (member.id === memberId) { + member.children = member.children.map(function (c) { + if (c.id === child.id) { + return child; + } + return c; + }); + return member; + } + return member; + }); + }; + /** * Ask for confirmation then delete the specified administrator * @param admins {Array} full list of administrators @@ -590,6 +615,20 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce', } }; + /** + * Callback triggered in case of error + */ + $scope.onError = (message) => { + growl.error(message); + }; + + /** + * Callback triggered in case of success + */ + $scope.onSuccess = (message) => { + growl.success(message); + }; + /* PRIVATE SCOPE */ /** diff --git a/app/frontend/src/javascript/controllers/children.js b/app/frontend/src/javascript/controllers/children.js new file mode 100644 index 000000000..1fc180294 --- /dev/null +++ b/app/frontend/src/javascript/controllers/children.js @@ -0,0 +1,23 @@ +'use strict'; + +Application.Controllers.controller('ChildrenController', ['$scope', 'memberPromise', 'growl', + function ($scope, memberPromise, growl) { + // Current user's profile + $scope.user = memberPromise; + + /** + * Callback used to display a error message + */ + $scope.onError = function (message) { + console.error(message); + growl.error(message); + }; + + /** + * Callback used to display a success message + */ + $scope.onSuccess = function (message) { + growl.success(message); + }; + } +]); diff --git a/app/frontend/src/javascript/controllers/events.js.erb b/app/frontend/src/javascript/controllers/events.js.erb index 09b5ab08c..f4e92afe9 100644 --- a/app/frontend/src/javascript/controllers/events.js.erb +++ b/app/frontend/src/javascript/controllers/events.js.erb @@ -136,8 +136,8 @@ Application.Controllers.controller('EventsController', ['$scope', '$state', 'Eve } ]); -Application.Controllers.controller('ShowEventController', ['$scope', '$state', '$rootScope', 'Event', '$uibModal', 'Member', 'Reservation', 'Price', 'CustomAsset', 'SlotsReservation', 'eventPromise', 'growl', '_t', 'Wallet', 'AuthService', 'helpers', 'dialogs', 'priceCategoriesPromise', 'settingsPromise', 'LocalPayment', - function ($scope, $state,$rootScope, Event, $uibModal, Member, Reservation, Price, CustomAsset, SlotsReservation, eventPromise, growl, _t, Wallet, AuthService, helpers, dialogs, priceCategoriesPromise, settingsPromise, LocalPayment) { +Application.Controllers.controller('ShowEventController', ['$scope', '$state', '$rootScope', 'Event', '$uibModal', 'Member', 'Reservation', 'Price', 'CustomAsset', 'SlotsReservation', 'eventPromise', 'growl', '_t', 'Wallet', 'AuthService', 'helpers', 'dialogs', 'priceCategoriesPromise', 'settingsPromise', 'LocalPayment', 'Child', + function ($scope, $state,$rootScope, Event, $uibModal, Member, Reservation, Price, CustomAsset, SlotsReservation, eventPromise, growl, _t, Wallet, AuthService, helpers, dialogs, priceCategoriesPromise, settingsPromise, LocalPayment, Child) { /* PUBLIC SCOPE */ // reservations for the currently shown event @@ -150,6 +150,9 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' $scope.ctrl = { member: {} }; + // children for the member + $scope.children = []; + // parameters for a new reservation $scope.reserve = { nbPlaces: { @@ -160,7 +163,10 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' toReserve: false, amountTotal: 0, totalNoCoupon: 0, - totalSeats: 0 + totalSeats: 0, + bookingUsers: { + normal: [] + }, }; // Discount coupon to apply to the basket, if any @@ -195,6 +201,9 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' // Global config: is the user validation required ? $scope.enableUserValidationRequired = settingsPromise.user_validation_required === 'true'; + // Global config: is the child validation required ? + $scope.enableChildValidationRequired = settingsPromise.child_validation_required === 'true'; + // online payments (by card) $scope.onlinePayment = { showModal: false, @@ -226,9 +235,23 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' /** * Callback to call when the number of tickets to book changes in the current booking */ - $scope.changeNbPlaces = function () { + $scope.changeNbPlaces = function (priceType) { + let reservedPlaces = 0; + if ($scope.event.event_type === 'family') { + const reservations = $scope.reservations.filter((reservation) => { + return !reservation.slots_reservations_attributes[0].canceled_at; + }); + reservedPlaces = reservations.reduce((sum, reservation) => { + return sum + reservation.booking_users_attributes.length; + }, 0); + } + let nb_free_places = $scope.event.nb_free_places; + if ($scope.event.event_type === 'family') { + const maxPlaces = $scope.children.length + 1 - reservedPlaces; + nb_free_places = Math.min(maxPlaces, $scope.event.nb_free_places); + } // compute the total remaining places - let remain = $scope.event.nb_free_places - $scope.reserve.nbReservePlaces; + let remain = nb_free_places - $scope.reserve.nbReservePlaces; for (let ticket in $scope.reserve.tickets) { remain -= $scope.reserve.tickets[ticket]; } @@ -247,17 +270,41 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' } } + if ($scope.event.event_type === 'nominative' || $scope.event.event_type === 'family') { + const nbBookingUsers = $scope.reserve.bookingUsers[priceType].length; + const nbReservePlaces = priceType === 'normal' ? $scope.reserve.nbReservePlaces : $scope.reserve.tickets[priceType]; + if (nbReservePlaces > nbBookingUsers) { + _.times(nbReservePlaces - nbBookingUsers, () => { + $scope.reserve.bookingUsers[priceType].push({ event_price_category_id: priceType === 'normal' ? null : priceType, bookedUsers: buildBookedUsersOptions() }); + }); + } else { + _.times(nbBookingUsers - nbReservePlaces, () => { + $scope.reserve.bookingUsers[priceType].pop(); + }); + } + } + // recompute the total price return $scope.computeEventAmount(); }; + $scope.changeBookedUser = function () { + for (const key of Object.keys($scope.reserve.bookingUsers)) { + for (const user of $scope.reserve.bookingUsers[key]) { + user.bookedUsers = buildBookedUsersOptions(user.booked); + } + } + } + /** * Callback to reset the current reservation parameters * @param e {Object} see https://docs.angularjs.org/guide/expression#-event- */ $scope.cancelReserve = function (e) { e.preventDefault(); - return resetEventReserve(); + resetEventReserve(); + updateNbReservePlaces(); + return; }; $scope.isUserValidatedByType = () => { @@ -265,10 +312,16 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' }; $scope.isShowReserveEventButton = () => { - return $scope.event.nb_free_places > 0 && + const bookable = $scope.event.nb_free_places > 0 && !$scope.reserve.toReserve && $scope.now.isBefore($scope.eventEndDateTime) && helpers.isUserValidatedByType($scope.ctrl.member, $scope.settings, 'event'); + if ($scope.event.pre_registration) { + const endDate = $scope.event.pre_registration_end_date || $scope.event.end_date + return bookable && $scope.now.isSameOrBefore(endDate, 'day'); + } else { + return bookable; + } }; /** @@ -321,7 +374,11 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' if ($scope.ctrl.member) { Member.get({ id: $scope.ctrl.member.id }, function (member) { $scope.ctrl.member = member; - getReservations($scope.event.id, 'Event', $scope.ctrl.member.id); + getReservations($scope.event.id, 'Event', $scope.ctrl.member.id).then(function () { + getChildren($scope.ctrl.member.id).then(function (children) { + updateNbReservePlaces(); + }); + }); }); } }; @@ -399,8 +456,10 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' let index; growl.success(_t('app.public.events_show.reservation_was_successfully_cancelled')); index = $scope.reservations.indexOf(reservation); - $scope.event.nb_free_places = $scope.event.nb_free_places + reservation.total_booked_seats; $scope.reservations[index].slots_reservations_attributes[0].canceled_at = new Date(); + Event.get({ id: $scope.event.id }).$promise.then(function (event) { + $scope.event = event; + }); }, function(error) { growl.warning(_t('app.public.events_show.cancellation_failed')); }); @@ -583,6 +642,38 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' growl.error(message); }; + /** + * Checks if the reservation of current event is valid + */ + $scope.reservationIsValid = () => { + if ($scope.event.event_type === 'nominative') { + for (const key of Object.keys($scope.reserve.bookingUsers)) { + for (const user of $scope.reserve.bookingUsers[key]) { + if (!_.trim(user.name)) { + return false; + } + } + } + } + if ($scope.event.event_type === 'family') { + for (const key of Object.keys($scope.reserve.bookingUsers)) { + for (const user of $scope.reserve.bookingUsers[key]) { + if (!user.booked) { + return false; + } + if ($scope.enableChildValidationRequired && user.booked.type === 'Child' && !user.booked.validated_at) { + return false; + } + } + } + } + return true; + } + + $scope.isUnder18YearsAgo = (date) => { + return moment(date).isAfter(moment().subtract(18, 'year')); + } + /* PRIVATE SCOPE */ /** @@ -601,7 +692,11 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' // get the current user's reservations into $scope.reservations if ($scope.currentUser) { - getReservations($scope.event.id, 'Event', $scope.currentUser.id); + getReservations($scope.event.id, 'Event', $scope.currentUser.id).then(function () { + getChildren($scope.currentUser.id).then(function (children) { + updateNbReservePlaces(); + }); + }); } // watch when a coupon is applied to re-compute the total price @@ -619,13 +714,98 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' * @param user_id {number} the user's id (current or managed) */ const getReservations = function (reservable_id, reservable_type, user_id) { - Reservation.query({ + return Reservation.query({ reservable_id, reservable_type, user_id }).$promise.then(function (reservations) { $scope.reservations = reservations; }); }; + /** + * Retrieve the children for the user + * @param user_id {number} the user's id (current or managed) + */ + const getChildren = function (user_id) { + return Child.query({ + user_id + }).$promise.then(function (children) { + $scope.children = children; + return $scope.children; + }); + }; + + /** + * Update the number of places reserved by the current user + */ + const hasBookedUser = function (userKey) { + for (const key of Object.keys($scope.reserve.bookingUsers)) { + for (const user of $scope.reserve.bookingUsers[key]) { + if (user.booked && user.booked.key === userKey) { + return true; + } + } + } + const reservations = $scope.reservations.filter((reservation) => { + return !reservation.slots_reservations_attributes[0].canceled_at; + }); + for (const r of reservations) { + for (const user of r.booking_users_attributes) { + const key = user.booked_type === 'User' ? `user_${user.booked_id}` : `child_${user.booked_id}`; + if (key === userKey) { + return true; + } + } + } + return false; + }; + + /** + * Build the list of options for the select box of the booked users + * @param booked {object} the booked user + */ + const buildBookedUsersOptions = function (booked) { + const options = []; + const userKey = `user_${$scope.ctrl.member.id}`; + if ((booked && booked.key === userKey) || !hasBookedUser(userKey)) { + options.push({ key: userKey, name: $scope.ctrl.member.name, type: 'User', id: $scope.ctrl.member.id }); + } + for (const child of $scope.children) { + const key = `child_${child.id}`; + if ((booked && booked.key === key) || !hasBookedUser(key)) { + options.push({ + key, + name: child.first_name + ' ' + child.last_name, + id: child.id, + type: 'Child', + validated_at: child.validated_at, + birthday: child.birthday + }); + } + } + return options; + }; + + /** + * update number of places available for each price category for the family event + */ + const updateNbReservePlaces = function () { + if ($scope.event.event_type === 'family' && $scope.ctrl.member.id) { + const reservations = $scope.reservations.filter((reservation) => { + return !reservation.slots_reservations_attributes[0].canceled_at; + }); + const reservedPlaces = reservations.reduce((sum, reservation) => { + return sum + reservation.booking_users_attributes.length; + }, 0); + const maxPlaces = $scope.children.length + 1 - reservedPlaces; + if ($scope.event.nb_free_places > maxPlaces) { + $scope.reserve.nbPlaces.normal = __range__(0, maxPlaces, true); + for (let evt_px_cat of Array.from($scope.event.event_price_categories_attributes)) { + $scope.reserve.nbPlaces[evt_px_cat.id] = __range__(0, maxPlaces, true); + } + } + } + }; + /** * Create a hash map implementing the Reservation specs * @param reserve {Object} Reservation parameters (places...) @@ -638,7 +818,8 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' reservable_type: 'Event', slots_reservations_attributes: [], nb_reserve_places: reserve.nbReservePlaces, - tickets_attributes: [] + tickets_attributes: [], + booking_users_attributes: [] }; reservation.slots_reservations_attributes.push({ @@ -656,6 +837,19 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' } } + if (event.event_type === 'nominative' || event.event_type === 'family') { + for (const key of Object.keys($scope.reserve.bookingUsers)) { + for (const user of $scope.reserve.bookingUsers[key]) { + reservation.booking_users_attributes.push({ + event_price_category_id: user.event_price_category_id, + name: user.booked ? user.booked.name : _.trim(user.name), + booked_id: user.booked ? user.booked.id : undefined, + booked_type: user.booked ? user.booked.type : undefined, + }); + } + } + } + return { reservation }; }; @@ -688,11 +882,15 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' tickets: {}, toReserve: false, amountTotal: 0, - totalSeats: 0 + totalSeats: 0, + bookingUsers: { + normal: [], + }, }; for (let evt_px_cat of Array.from($scope.event.event_price_categories_attributes)) { $scope.reserve.nbPlaces[evt_px_cat.id] = __range__(0, $scope.event.nb_free_places, true); + $scope.reserve.bookingUsers[evt_px_cat.id] = []; $scope.reserve.tickets[evt_px_cat.id] = 0; } @@ -810,13 +1008,15 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' * @param invoice {Object} the invoice for the booked reservation */ const afterPayment = function (invoice) { - Reservation.get({ id: invoice.main_object.id }, function (reservation) { - $scope.event.nb_free_places = $scope.event.nb_free_places - reservation.total_booked_seats; - $scope.reservations.push(reservation); + Event.get({ id: $scope.event.id }).$promise.then(function (event) { + $scope.event = event; + getReservations($scope.event.id, 'Event', $scope.ctrl.member.id).then(function () { + updateNbReservePlaces(); + $scope.reserveSuccess = true; + $scope.coupon.applied = null; + }); + resetEventReserve(); }); - resetEventReserve(); - $scope.reserveSuccess = true; - $scope.coupon.applied = null; if ($scope.currentUser.role === 'admin') { return $scope.ctrl.member = null; } diff --git a/app/frontend/src/javascript/lib/api.ts b/app/frontend/src/javascript/lib/api.ts index 1ef3b9b82..76e99d6fc 100644 --- a/app/frontend/src/javascript/lib/api.ts +++ b/app/frontend/src/javascript/lib/api.ts @@ -35,6 +35,9 @@ export default class ApiLib { if (file?.is_main) { data.set(`${name}[${attr}][${i}][is_main]`, file.is_main.toString()); } + if (file?.supporting_document_type_id) { + data.set(`${name}[${attr}][${i}][supporting_document_type_id]`, file.supporting_document_type_id.toString()); + } }); } else { if (object[attr]?.attachment_files && object[attr]?.attachment_files[0]) { diff --git a/app/frontend/src/javascript/models/child.ts b/app/frontend/src/javascript/models/child.ts new file mode 100644 index 000000000..b9fcaca9a --- /dev/null +++ b/app/frontend/src/javascript/models/child.ts @@ -0,0 +1,27 @@ +import { TDateISODate, TDateISO } from '../typings/date-iso'; +import { ApiFilter } from './api'; + +export interface ChildIndexFilter extends ApiFilter { + user_id: number, +} + +export interface Child { + id?: number, + last_name: string, + first_name: string, + email?: string, + phone?: string, + birthday: TDateISODate, + user_id: number, + validated_at?: TDateISO, + supporting_document_files_attributes?: Array<{ + id?: number, + supportable_id?: number, + supportable_type?: 'User' | 'Child', + supporting_document_type_id: number, + attachment?: File, + attachment_name?: string, + attachment_url?: string, + _destroy?: boolean + }>, +} diff --git a/app/frontend/src/javascript/models/event.ts b/app/frontend/src/javascript/models/event.ts index 5cca1d9e8..7f72b1974 100644 --- a/app/frontend/src/javascript/models/event.ts +++ b/app/frontend/src/javascript/models/event.ts @@ -11,6 +11,7 @@ export interface EventPriceCategoryAttributes { } export type RecurrenceOption = 'none' | 'day' | 'week' | 'month' | 'year'; +export type EventType = 'standard' | 'nominative' | 'family'; export interface Event { id?: number, @@ -63,7 +64,10 @@ export interface Event { }>, recurrence: RecurrenceOption, recurrence_end_at: Date, - advanced_accounting_attributes?: AdvancedAccounting + advanced_accounting_attributes?: AdvancedAccounting, + event_type: EventType, + pre_registration?: boolean, + pre_registration_end_date?: TDateISODate | Date, } export interface EventDecoration { diff --git a/app/frontend/src/javascript/models/member.ts b/app/frontend/src/javascript/models/member.ts new file mode 100644 index 000000000..3c9e8cad2 --- /dev/null +++ b/app/frontend/src/javascript/models/member.ts @@ -0,0 +1,49 @@ +import { TDateISO } from '../typings/date-iso'; +import { Child } from './child'; + +export interface Member { + maxMembers: number + id: number + username: string + email: string + profile: { + first_name: string + last_name: string + phone: string + } + need_completion?: boolean + group: { + name: string + } + subscribed_plan?: Plan + validated_at: TDateISO + children: Child[] +} + +interface Plan { + id: number + base_name: string + name: string + amount: number + interval: string + interval_count: number + training_credit_nb: number + training_credits: [ + { + training_id: number + }, + { + training_id: number + } + ] + machine_credits: [ + { + machine_id: number + hours: number + }, + { + machine_id: number + hours: number + } + ] +} diff --git a/app/frontend/src/javascript/models/reservation.ts b/app/frontend/src/javascript/models/reservation.ts index 56d3aef5e..14529b2cb 100644 --- a/app/frontend/src/javascript/models/reservation.ts +++ b/app/frontend/src/javascript/models/reservation.ts @@ -27,10 +27,11 @@ export interface Reservation { slots_reservations_attributes: Array, reservable?: { id: number, - name: string + name: string, + amount?: number }, nb_reserve_places?: number, - tickets_attributes?: { + tickets_attributes?: Array<{ event_price_category_id: number, event_price_category?: { id: number, @@ -40,11 +41,40 @@ export interface Reservation { name: string } }, - booked: boolean, + booked: number, created_at?: TDateISO - }, + }>, + tickets?: Array<{ + event_price_category_id: number, + event_price_category?: { + id: number, + price_category_id: number, + price_category: { + id: number, + name: string + } + }, + booked: number, + created_at?: TDateISO + }>, total_booked_seats?: number, created_at?: TDateISO, + booking_users_attributes?: Array<{ + id: number, + name: string, + event_price_category_id: number, + booked_id: number, + booked_type: string, + }>, + start_at: TDateISO, + end_at: TDateISO, + event_type?: string, + event_title?: string, + event_pre_registration?: boolean, + canceled_at?: TDateISO, + is_valid?: boolean, + is_paid?: boolean, + amount?: number } export interface ReservationIndexFilter extends ApiFilter { diff --git a/app/frontend/src/javascript/models/setting.ts b/app/frontend/src/javascript/models/setting.ts index 12e9ef207..ae114d96c 100644 --- a/app/frontend/src/javascript/models/setting.ts +++ b/app/frontend/src/javascript/models/setting.ts @@ -179,7 +179,8 @@ export const accountSettings = [ 'external_id', 'user_change_group', 'user_validation_required', - 'user_validation_required_list' + 'user_validation_required_list', + 'family_account' ] as const; export const analyticsSettings = [ diff --git a/app/frontend/src/javascript/models/supporting-document-file.ts b/app/frontend/src/javascript/models/supporting-document-file.ts index 581c75fb0..c762b4664 100644 --- a/app/frontend/src/javascript/models/supporting-document-file.ts +++ b/app/frontend/src/javascript/models/supporting-document-file.ts @@ -1,12 +1,14 @@ import { ApiFilter } from './api'; export interface SupportingDocumentFileIndexFilter extends ApiFilter { - user_id: number, + supportable_id: number, + supportable_type?: 'User' | 'Child', } export interface SupportingDocumentFile { id?: number, attachment?: string, - user_id?: number, + supportable_id?: number, + supportable_type?: 'User' | 'Child', supporting_document_type_id: number, } diff --git a/app/frontend/src/javascript/models/supporting-document-refusal.ts b/app/frontend/src/javascript/models/supporting-document-refusal.ts index 29f045bbe..f220baf4e 100644 --- a/app/frontend/src/javascript/models/supporting-document-refusal.ts +++ b/app/frontend/src/javascript/models/supporting-document-refusal.ts @@ -1,13 +1,15 @@ import { ApiFilter } from './api'; export interface SupportingDocumentRefusalIndexFilter extends ApiFilter { - user_id: number, + supportable_id: number, + supportable_type: 'User' | 'Child', } export interface SupportingDocumentRefusal { id: number, message: string, - user_id: number, + supportable_id: number, + supportable_type: 'User' | 'Child', operator_id: number, supporting_document_type_ids: Array, } diff --git a/app/frontend/src/javascript/models/supporting-document-type.ts b/app/frontend/src/javascript/models/supporting-document-type.ts index a2dcf3c78..2c590e1f1 100644 --- a/app/frontend/src/javascript/models/supporting-document-type.ts +++ b/app/frontend/src/javascript/models/supporting-document-type.ts @@ -2,10 +2,12 @@ import { ApiFilter } from './api'; export interface SupportingDocumentTypeIndexfilter extends ApiFilter { group_id?: number, + document_type?: 'User' | 'Child' } export interface SupportingDocumentType { id: number, name: string, - group_ids: Array + group_ids: Array, + document_type: 'User' | 'Child' } diff --git a/app/frontend/src/javascript/router.js b/app/frontend/src/javascript/router.js index e95029e91..2005f7bb2 100644 --- a/app/frontend/src/javascript/router.js +++ b/app/frontend/src/javascript/router.js @@ -28,9 +28,9 @@ angular.module('application.router', ['ui.router']) logoBlackFile: ['CustomAsset', function (CustomAsset) { return CustomAsset.get({ name: 'logo-black-file' }).$promise; }], sharedTranslations: ['Translations', function (Translations) { return Translations.query(['app.shared', 'app.public.common']).$promise; }], modulesPromise: ['Setting', function (Setting) { return Setting.query({ names: "['machines_module', 'spaces_module', 'plans_module', 'invoicing_module', 'wallet_module', 'statistics_module', 'trainings_module', 'public_agenda_module', 'store_module']" }).$promise; }], - settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['public_registrations', 'store_hidden']" }).$promise; }] + settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['public_registrations', 'store_hidden', 'family_account']" }).$promise; }] }, - onEnter: ['$rootScope', 'logoFile', 'logoBlackFile', 'modulesPromise', 'CSRF', function ($rootScope, logoFile, logoBlackFile, modulesPromise, CSRF) { + onEnter: ['$rootScope', 'logoFile', 'logoBlackFile', 'modulesPromise', 'settingsPromise', 'CSRF', function ($rootScope, logoFile, logoBlackFile, modulesPromise, settingsPromise, CSRF) { // Retrieve Anti-CSRF tokens from cookies CSRF.setMetaTags(); // Application logo @@ -47,6 +47,9 @@ angular.module('application.router', ['ui.router']) publicAgenda: (modulesPromise.public_agenda_module === 'true'), statistics: (modulesPromise.statistics_module === 'true') }; + $rootScope.settings = { + familyAccount: (settingsPromise.family_account === 'true') + }; }] }) .state('app.public', { @@ -151,6 +154,15 @@ angular.module('application.router', ['ui.router']) } } }) + .state('app.logged.dashboard.children', { + url: '/children', + views: { + 'main@': { + templateUrl: '/dashboard/children.html', + controller: 'ChildrenController' + } + } + }) .state('app.logged.dashboard.settings', { url: '/settings', views: { @@ -624,7 +636,7 @@ angular.module('application.router', ['ui.router']) resolve: { eventPromise: ['Event', '$transition$', function (Event, $transition$) { return Event.get({ id: $transition$.params().id }).$promise; }], priceCategoriesPromise: ['PriceCategory', function (PriceCategory) { return PriceCategory.query().$promise; }], - settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['booking_move_enable', 'booking_move_delay', 'booking_cancel_enable', 'booking_cancel_delay', 'event_explications_alert', 'online_payment_module', 'user_validation_required', 'user_validation_required_list']" }).$promise; }] + settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['booking_move_enable', 'booking_move_delay', 'booking_cancel_enable', 'booking_cancel_delay', 'event_explications_alert', 'online_payment_module', 'user_validation_required', 'user_validation_required_list', 'child_validation_required']" }).$promise; }] } }) diff --git a/app/frontend/src/javascript/services/child.js b/app/frontend/src/javascript/services/child.js new file mode 100644 index 000000000..07d0d916c --- /dev/null +++ b/app/frontend/src/javascript/services/child.js @@ -0,0 +1,11 @@ +'use strict'; + +Application.Services.factory('Child', ['$resource', function ($resource) { + return $resource('/api/children/:id', + { id: '@id' }, { + update: { + method: 'PUT' + } + } + ); +}]); diff --git a/app/frontend/src/javascript/services/reservation.js b/app/frontend/src/javascript/services/reservation.js index 95273fbb4..d83e7003a 100644 --- a/app/frontend/src/javascript/services/reservation.js +++ b/app/frontend/src/javascript/services/reservation.js @@ -5,6 +5,11 @@ Application.Services.factory('Reservation', ['$resource', function ($resource) { { id: '@id' }, { update: { method: 'PUT' + }, + confirm_payment: { + method: 'POST', + url: '/api/reservations/confirm_payment', + isArray: false } } ); diff --git a/app/frontend/src/javascript/services/slots_reservation.js b/app/frontend/src/javascript/services/slots_reservation.js index 4476d6371..c6d59c9cf 100644 --- a/app/frontend/src/javascript/services/slots_reservation.js +++ b/app/frontend/src/javascript/services/slots_reservation.js @@ -9,6 +9,14 @@ Application.Services.factory('SlotsReservation', ['$resource', function ($resour cancel: { method: 'PUT', url: '/api/slots_reservations/:id/cancel' + }, + validate: { + method: 'PUT', + url: '/api/slots_reservations/:id/validate' + }, + invalidate: { + method: 'PUT', + url: '/api/slots_reservations/:id/invalidate' } } ); diff --git a/app/frontend/src/stylesheets/application.scss b/app/frontend/src/stylesheets/application.scss index 759d95f9f..9d763ef92 100644 --- a/app/frontend/src/stylesheets/application.scss +++ b/app/frontend/src/stylesheets/application.scss @@ -48,11 +48,16 @@ @import "modules/dashboard/reservations/prepaid-packs-panel"; @import "modules/dashboard/reservations/reservations-dashboard"; @import "modules/dashboard/reservations/reservations-panel"; -@import "modules/events/event"; -@import "modules/events/events"; @import "modules/events/event-form"; +@import "modules/events/event-reservation"; +@import "modules/events/event"; +@import "modules/events/events-dashboard"; +@import "modules/events/events-settings"; +@import "modules/events/events"; @import "modules/events/update-recurrent-modal"; -@import "modules/events/events-settings.scss"; +@import "modules/family-account/child-form"; +@import "modules/family-account/child-item"; +@import "modules/family-account/children-dashboard"; @import "modules/form/abstract-form-item"; @import "modules/form/form-input"; @import "modules/form/form-multi-file-upload"; diff --git a/app/frontend/src/stylesheets/modules/base/edit-destroy-buttons.scss b/app/frontend/src/stylesheets/modules/base/edit-destroy-buttons.scss index 6adaece60..949b4b028 100644 --- a/app/frontend/src/stylesheets/modules/base/edit-destroy-buttons.scss +++ b/app/frontend/src/stylesheets/modules/base/edit-destroy-buttons.scss @@ -1,6 +1,9 @@ .edit-destroy-buttons { + width: max-content; + flex-shrink: 0; border-radius: var(--border-radius-sm); overflow: hidden; + button { @include btn; border-radius: 0; diff --git a/app/frontend/src/stylesheets/modules/base/fab-modal.scss b/app/frontend/src/stylesheets/modules/base/fab-modal.scss index fb34b42c8..777b29999 100644 --- a/app/frontend/src/stylesheets/modules/base/fab-modal.scss +++ b/app/frontend/src/stylesheets/modules/base/fab-modal.scss @@ -30,6 +30,7 @@ animation: 0.3s ease-out slideInFromTop; position: relative; top: 90px; + max-width: 100vw; margin: auto; opacity: 1; box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); diff --git a/app/frontend/src/stylesheets/modules/events/event-reservation.scss b/app/frontend/src/stylesheets/modules/events/event-reservation.scss new file mode 100644 index 000000000..eacfb1ec2 --- /dev/null +++ b/app/frontend/src/stylesheets/modules/events/event-reservation.scss @@ -0,0 +1,60 @@ +.event-reservation { + display: flex; + flex-direction: column; + gap: 1.6rem; + + &-item { + padding: 1.6rem 1.6rem 0; + display: flex; + flex-direction: column; + background-color: var(--gray-soft-lightest); + border-radius: var(--border-radius); + + label { + margin: 0; + @include text-xs; + color: var(--gray-hard-light); + } + p { + margin: 0; + @include text-base(600); + } + .date { @include text-sm; } + + &__event { + padding-bottom: 1.2rem; + display: flex; + justify-content: space-between; + align-items: center; + gap: 1.6rem; + border-bottom: 1px solid var(--gray-soft-dark); + } + + &__reservation { + display: flex; + + & > div { + padding: 1.2rem 1.6rem 1.2rem 0; + flex: 1; + } + .list { + display: flex; + flex-direction: column; + row-gap: 0.5rem; + label:not(:first-of-type) { + margin-top: 1rem; + } + } + .name { @include text-sm(500); } + + .status { + padding-left: 1.6rem; + display: flex; + flex-direction: column; + justify-content: center; + border-left: 1px solid var(--gray-soft-dark); + } + } + + } +} \ No newline at end of file diff --git a/app/frontend/src/stylesheets/modules/events/events-dashboard.scss b/app/frontend/src/stylesheets/modules/events/events-dashboard.scss new file mode 100644 index 000000000..7c6c70bc9 --- /dev/null +++ b/app/frontend/src/stylesheets/modules/events/events-dashboard.scss @@ -0,0 +1,5 @@ +.events-dashboard { + max-width: 1600px; + margin: 0 auto; + padding-bottom: 6rem; +} \ No newline at end of file diff --git a/app/frontend/src/stylesheets/modules/family-account/child-form.scss b/app/frontend/src/stylesheets/modules/family-account/child-form.scss new file mode 100644 index 000000000..b1ed219d4 --- /dev/null +++ b/app/frontend/src/stylesheets/modules/family-account/child-form.scss @@ -0,0 +1,43 @@ +.child-form { + .grp { + display: flex; + flex-direction: column; + @media (min-width: 640px) {flex-direction: row; } + + .form-item:first-child { margin-right: 2.4rem; } + } + + hr { width: 100%; } + .actions { + align-self: flex-end; + } + + .document-list { + margin-bottom: 1.6rem; + display: flex; + flex-direction: column; + gap: 1.6rem; + + &-item { + display: flex; + flex-direction: column; + gap: 0.8rem; + .type { + @include text-sm; + } + .file, + .missing { + padding: 0.8rem 0.8rem 0.8rem 1.6rem; + display: flex; + justify-content: space-between; + align-items: center; + border: 1px solid var(--gray-soft-dark); + border-radius: var(--border-radius); + p { margin: 0; } + } + .missing { + background-color: var(--gray-soft-light); + } + } + } +} \ No newline at end of file diff --git a/app/frontend/src/stylesheets/modules/family-account/child-item.scss b/app/frontend/src/stylesheets/modules/family-account/child-item.scss new file mode 100644 index 000000000..f505a73bd --- /dev/null +++ b/app/frontend/src/stylesheets/modules/family-account/child-item.scss @@ -0,0 +1,62 @@ +.child-item { + width: 100%; + display: grid; + grid-template-columns: min-content 1fr; + align-items: flex-start; + gap: 1.6rem 2.4rem; + background-color: var(--gray-soft-lightest); + &.lg { + padding: 1.6rem; + border: 1px solid var(--gray-soft-dark); + border-radius: var(--border-radius); + } + &.sm { + .actions button { + height: 3rem !important; + min-height: auto; + } + } + + & > div:not(.actions) { + display: flex; + flex-direction: column; + span { + @include text-xs; + color: var(--gray-hard-light); + } + } + p { + margin: 0; + @include text-base(600); + } + &.sm p { + @include text-sm(500); + } + + .status { + grid-row: 1/5; + align-self: stretch; + display: flex; + align-items: center; + } + &.is-validated .status svg { + color: var(--success-dark); + } + + .actions { + align-self: center; + justify-self: flex-end; + } + + @media (min-width: 768px) { + grid-template-columns: min-content repeat(3, 1fr); + .status { grid-row: auto; } + .actions { + grid-column-end: -1; + display: flex; + } + } + @media (min-width: 1024px) { + grid-template-columns: min-content repeat(3, 1fr) max-content; + } +} diff --git a/app/frontend/src/stylesheets/modules/family-account/children-dashboard.scss b/app/frontend/src/stylesheets/modules/family-account/children-dashboard.scss new file mode 100644 index 000000000..bed5aae61 --- /dev/null +++ b/app/frontend/src/stylesheets/modules/family-account/children-dashboard.scss @@ -0,0 +1,20 @@ +.children-dashboard { + max-width: 1600px; + margin: 0 auto; + padding-bottom: 6rem; + @include grid-col(12); + gap: 3.2rem; + align-items: flex-start; + + header { + @include header(); + padding-bottom: 0; + grid-column: 2 / -2; + } + .children-list { + grid-column: 2 / -2; + display: flex; + flex-direction: column; + gap: 1.6rem; + } +} \ No newline at end of file diff --git a/app/frontend/src/stylesheets/modules/form/form-file-upload.scss b/app/frontend/src/stylesheets/modules/form/form-file-upload.scss index 5707bbc45..b1bad6758 100644 --- a/app/frontend/src/stylesheets/modules/form/form-file-upload.scss +++ b/app/frontend/src/stylesheets/modules/form/form-file-upload.scss @@ -13,6 +13,8 @@ margin-bottom: 1.6rem; } + .placeholder { color: var(--gray-soft-darkest); } + .actions { margin-left: auto; display: flex; diff --git a/app/frontend/src/stylesheets/modules/members.scss b/app/frontend/src/stylesheets/modules/members.scss index 34a9209f9..b54e92a35 100644 --- a/app/frontend/src/stylesheets/modules/members.scss +++ b/app/frontend/src/stylesheets/modules/members.scss @@ -1,4 +1,109 @@ .promote-member img { width: 16px; height: 21px; +} + +.members-list { + width: 100%; + margin: 2.4rem 0; + display: flex; + flex-direction: column; + gap: 2.4rem; + + &-item { + width: 100%; + padding: 1.6rem; + display: grid; + grid-template-columns: 48px 1fr; + gap: 0 2.4rem; + border: 1px solid var(--gray-soft-dark); + border-radius: var(--border-radius); + background-color: var(--gray-soft-lightest); + &.is-validated .left-col .status svg { color: var(--success-dark); } + &.is-incomplet .left-col .status svg { color: var(--alert); } + + .left-col { + grid-row: span 2; + display: flex; + flex-direction: column; + align-items: center; + justify-content: space-between; + .status { + display: flex; + align-items: center; + } + + .toggle { + height: fit-content; + background-color: var(--gray-soft); + border: none; + svg { transition: transform 0.5s ease-in-out; } + &.open svg { transform: rotate(-180deg); } + } + } + + .member { + display: flex; + flex-direction: column; + gap: 2.4rem; + &-infos { + flex: 1; + display: grid; + gap: 1.6rem; + + & > div:not(.actions) { + display: flex; + flex-direction: column; + span { + @include text-xs; + color: var(--gray-hard-light); + } + } + p { + margin: 0; + @include text-base(600); + line-height: 1.5; + } + + } + &-actions { + align-self: flex-end; + } + } + + .member-children { + max-height: 0; + display: flex; + flex-direction: column; + gap: 1.6rem; + overflow-y: hidden; + transition: max-height 0.5s ease-in-out; + &.open { + max-height: 17rem; + overflow-y: auto; + } + + hr { margin: 1.6rem 0 0; } + .child-item:last-of-type { padding-bottom: 0; } + } + + @media (min-width: 768px) { + .member-infos { + grid-template-columns: repeat(2, 1fr); + } + } + @media (min-width: 1024px) { + .member { + flex-direction: row; + &-actions { + align-self: center; + } + } + } + @media (min-width: 1220px) { + .member-infos { + grid-template-columns: repeat(3, 1fr); + } + } + } } \ No newline at end of file diff --git a/app/frontend/src/stylesheets/modules/supporting-documents/supporting-documents-types-list.scss b/app/frontend/src/stylesheets/modules/supporting-documents/supporting-documents-types-list.scss index b9fca3534..30837f400 100644 --- a/app/frontend/src/stylesheets/modules/supporting-documents/supporting-documents-types-list.scss +++ b/app/frontend/src/stylesheets/modules/supporting-documents/supporting-documents-types-list.scss @@ -37,6 +37,7 @@ } .title { + margin-bottom: 1.6rem; display: flex; flex-direction: row; justify-content: space-between; @@ -64,12 +65,28 @@ width: 20%; } } + } - tbody { - .buttons { - .edit-btn { - margin-right: 5px; - } + .document-list { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(min-content, 50rem)); + gap: 1.6rem; + + &-item { + display: flex; + flex-direction: column; + gap: 0.8rem; + .type { + @include text-sm; + } + .file { + padding: 0.8rem 0.8rem 0.8rem 1.6rem; + display: flex; + justify-content: space-between; + align-items: center; + border: 1px solid var(--gray-soft-dark); + border-radius: var(--border-radius); + p { margin: 0; } } } } @@ -78,4 +95,4 @@ text-align: center; } } -} +} \ No newline at end of file diff --git a/app/frontend/src/stylesheets/modules/user/user-validation.scss b/app/frontend/src/stylesheets/modules/user/user-validation.scss index 81a741931..3c9e1b2b6 100644 --- a/app/frontend/src/stylesheets/modules/user/user-validation.scss +++ b/app/frontend/src/stylesheets/modules/user/user-validation.scss @@ -1,4 +1,4 @@ -.user-validation { +.user-validation, .child-validation { label { margin-bottom: 0; vertical-align: middle; @@ -9,3 +9,7 @@ vertical-align: middle; } } +.child-validation { + margin: 0 0 2rem; + text-align: center; +} \ No newline at end of file diff --git a/app/frontend/templates/admin/events/monitoring.html b/app/frontend/templates/admin/events/monitoring.html index 91b2a73b7..ed4aa9d61 100644 --- a/app/frontend/templates/admin/events/monitoring.html +++ b/app/frontend/templates/admin/events/monitoring.html @@ -12,8 +12,9 @@ {{ 'app.admin.events.title' }} {{ 'app.admin.events.dates' }} - {{ 'app.admin.events.booking' }} - + {{ 'app.admin.events.types' }} + {{ 'app.admin.events.booking' }} + @@ -48,8 +49,16 @@ + + {{ 'app.admin.events.event_type.standard' }} + {{ 'app.admin.events.event_type.nominative' }} + {{ 'app.admin.events.event_type.family' }} + {{ 'app.admin.events.pre_registration' }} + + {{ event.nb_total_places - event.nb_free_places }} / {{ event.nb_total_places }} +
{{'app.admin.events.NUMBER_pre_registered' | translate:{NUMBER:event.nb_places_for_pre_registration} }}
{{ 'app.admin.events.cancelled' }} {{ 'app.admin.events.without_reservation' }} @@ -57,10 +66,10 @@
- {{ 'app.admin.events.view_reservations' | translate }} + - {{ 'app.shared.buttons.edit' | translate }} +
diff --git a/app/frontend/templates/admin/events/pay_reservation_modal.html b/app/frontend/templates/admin/events/pay_reservation_modal.html new file mode 100644 index 000000000..b4059d18f --- /dev/null +++ b/app/frontend/templates/admin/events/pay_reservation_modal.html @@ -0,0 +1,52 @@ +
+ +

{{ 'app.admin.event_reservations.confirm_payment' }}

+

{{ 'app.admin.event_reservations.confirm_present' }}

+
+
+
+
+ +
+
+
+ + +
+
+ + + +
+
+
+ + +
+
+
+
+ +
+

{{ 'app.admin.event_reservations.confirm_present_info' }}

+
+
+
+ + + +
diff --git a/app/frontend/templates/admin/events/reservations.html b/app/frontend/templates/admin/events/reservations.html index 81d87e088..69590232c 100644 --- a/app/frontend/templates/admin/events/reservations.html +++ b/app/frontend/templates/admin/events/reservations.html @@ -20,10 +20,13 @@ - - - - + + + + + + + @@ -31,16 +34,49 @@ + + + diff --git a/app/frontend/templates/admin/members/edit.html b/app/frontend/templates/admin/members/edit.html index c3479225e..287a61911 100644 --- a/app/frontend/templates/admin/members/edit.html +++ b/app/frontend/templates/admin/members/edit.html @@ -62,10 +62,15 @@ + + + + @@ -202,19 +207,11 @@

{{ 'app.admin.members_edit.next_events' | translate }}

-
    -
  • - {{r.reservable.title}} - {{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }} - -
    - {{ 'app.admin.members_edit.NUMBER_full_price_tickets_reserved' }} -     - -
    - {{ 'app.admin.members_edit.NUMBER_NAME_tickets_reserved' }} -     -
    • -
+
+
+ +
+
{{ 'app.admin.members_edit.no_upcoming_events' }}
@@ -225,11 +222,11 @@

{{ 'app.admin.members_edit.passed_events' | translate }}

-
    -
  • - {{r.reservable.title}} - {{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }} -
    • -
+
+
+ +
+
{{ 'app.admin.members_edit.no_passed_events' }}
diff --git a/app/frontend/templates/admin/members/members.html b/app/frontend/templates/admin/members/members.html index b0be69229..22fe77590 100644 --- a/app/frontend/templates/admin/members/members.html +++ b/app/frontend/templates/admin/members/members.html @@ -17,11 +17,12 @@ +
- -
+
{{ 'app.admin.members.members' | translate }} @@ -34,46 +35,10 @@
-
{{ 'app.admin.event_reservations.user' }}{{ 'app.admin.event_reservations.payment_date' }}{{ 'app.admin.event_reservations.reserved_tickets' }}{{ 'app.admin.event_reservations.booked_by' }}{{ 'app.admin.event_reservations.reservations' }}{{ 'app.admin.event_reservations.date' }}{{ 'app.admin.event_reservations.reserved_tickets' }}{{ 'app.admin.event_reservations.status' }}{{ 'app.admin.event_reservations.validation' }}
{{ reservation.user_full_name }} + {{ reservation.user_full_name }} +
+ {{bu.name}} + ({{ 'app.admin.event_reservations.age' | translate:{NUMBER: bu.age} }}) +
+ 		{{ reservation.created_at | amDateFormat:'LL LTS' }} {{ 'app.admin.event_reservations.full_price_' | translate }} {{reservation.nb_reserve_places}}
 {{ticket.event_price_category.price_category.name}} : {{ticket.booked}} -
{{ 'app.admin.event_reservations.canceled' }}
+ 		+ {{ 'app.admin.event_reservations.event_status.pre_registered' }} + {{ 'app.admin.event_reservations.event_status.to_pay' }} + {{ 'app.admin.event_reservations.event_status.registered' }} + {{ 'app.admin.event_reservations.event_status.not_validated' }} + {{ 'app.admin.event_reservations.event_status.paid' }} + {{ 'app.admin.event_reservations.event_status.present' }} + {{ 'app.admin.event_reservations.event_status.canceled' }} + +
+
+ + +
+ +
- - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ 'app.admin.members.username' | translate }} {{ 'app.admin.members.surname' | translate }} {{ 'app.admin.members.first_name' | translate }}
- - {{ m.username }}{{ m.profile.last_name }}{{ m.profile.first_name }} -
- - - {{ 'app.shared.user_admin.incomplete_profile' }} -
-
+
+ +
+
diff --git a/app/frontend/templates/admin/settings/compte.html b/app/frontend/templates/admin/settings/compte.html index 0ed115706..241196c69 100644 --- a/app/frontend/templates/admin/settings/compte.html +++ b/app/frontend/templates/admin/settings/compte.html @@ -51,6 +51,7 @@
+

{{ 'app.admin.settings.captcha' }}

@@ -73,6 +74,37 @@
+ +
+
+ {{ 'app.admin.settings.family_account' }} +
+
+
+

+
+ +
+
+ +
+
+
+
+ +
+
+
+
+
{{ 'app.admin.settings.accounts_management' }} @@ -156,4 +188,4 @@
- + diff --git a/app/frontend/templates/dashboard/children.html b/app/frontend/templates/dashboard/children.html new file mode 100644 index 000000000..022cfa3a0 --- /dev/null +++ b/app/frontend/templates/dashboard/children.html @@ -0,0 +1,11 @@ +
+
+
+ +
+ +
+ + + +
diff --git a/app/frontend/templates/dashboard/events.html b/app/frontend/templates/dashboard/events.html index 1783502d7..f9333495d 100644 --- a/app/frontend/templates/dashboard/events.html +++ b/app/frontend/templates/dashboard/events.html @@ -8,7 +8,7 @@ -
+
@@ -16,25 +16,11 @@

{{ 'app.logged.dashboard.events.your_next_events' | translate }}

-
    -
  • - {{r.reservable.title}} - - - {{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }} -
    - - {{ 'app.logged.dashboard.events.NUMBER_normal_places_reserved' }} - - -
    - - {{ 'app.logged.dashboard.events.NUMBER_of_NAME_places_reserved' }} - -     -
    • -
+
+
+ +
+
{{ 'app.logged.dashboard.events.no_events_to_come' }}
@@ -45,11 +31,11 @@

{{ 'app.logged.dashboard.events.your_previous_events' | translate }}

-
    -
  • - {{r.reservable.title}} - {{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }} -
    • -
+
+
+ +
+
{{ 'app.logged.dashboard.events.no_passed_events' }}
diff --git a/app/frontend/templates/dashboard/nav.html b/app/frontend/templates/dashboard/nav.html index 8da97d01a..f0dc4bd10 100644 --- a/app/frontend/templates/dashboard/nav.html +++ b/app/frontend/templates/dashboard/nav.html @@ -11,6 +11,7 @@

{{ 'app.public.common.dashboard' }}

  • {{ 'app.public.common.my_profile' }}
    • +
  • {{ 'app.public.common.my_children' }}
  • {{ 'app.public.common.my_settings' }}
  • {{ 'app.public.common.my_supporting_documents_files' }}
  • {{ 'app.public.common.my_projects' }}
    • diff --git a/app/frontend/templates/events/show.html b/app/frontend/templates/events/show.html index 3d81d5213..b25834565 100644 --- a/app/frontend/templates/events/show.html +++ b/app/frontend/templates/events/show.html @@ -49,7 +49,7 @@
    -
    +
    {{event.event_files_attributes.length}}

    {{ 'app.public.events_show.downloadable_documents' }}

    @@ -72,8 +72,12 @@
    +
    + {{ 'app.public.events_show.event_type.nominative' }} + {{ 'app.public.events_show.event_type.family' }} + {{ 'app.public.events_show.pre_registration' }} +
    -
    {{event.category.name}}
    {{theme.name}} @@ -86,6 +90,8 @@
    {{ 'app.public.events_show.opening_hours' | translate }}
    {{ 'app.public.events_show.all_day' }}
    {{ 'app.public.events_show.from_time' | translate }} {{event.start_time}} {{ 'app.public.events_show.to_time' | translate }} {{event.end_time}}
    +
    {{ 'app.public.events_show.pre_registration_end_date' | translate }}
    +
    {{event.pre_registration_end_date | amDateFormat:'L'}}
    @@ -116,19 +122,81 @@
    - {{ 'app.public.events_show.ticket' | translate:{NUMBER:reserve.nbReservePlaces} }}
    +
    +
    + + +
    +
    +
    +
    + + + + + + {{ 'app.shared.cart.child_validation_required_alert' }} + + + + + + {{ 'app.shared.cart.child_birthday_must_be_under_18_years_ago_alert' }} + + +
    +
    - {{ 'app.public.events_show.ticket' | translate:{NUMBER:reserve.tickets[price.id]} }}
    +
    +
    + + +
    +
    +
    +
    + + + +

    + + {{ 'app.shared.cart.child_validation_required_alert' }} +

    +     + +

    + + {{ 'app.shared.cart.child_birthday_must_be_under_18_years_ago_alert' }} +

    +     +
    +
    -
    +
    {{ 'app.shared.buttons.cancel' }}
    -
    {{ 'app.public.events_show.thank_you_your_payment_has_been_successfully_registered' | translate }}
    - {{ 'app.public.events_show.you_can_find_your_reservation_s_details_on_your_' | translate }} {{ 'app.public.events_show.dashboard' }} +
    {{ 'app.public.events_show.thank_you_your_payment_has_been_successfully_registered' | translate }}
    + {{ 'app.public.events_show.you_can_find_your_reservation_s_details_on_your_' | translate }} {{ 'app.public.events_show.dashboard' }} +
    +
    {{ 'app.public.events_show.thank_you_your_pre_registration_has_been_successfully_saved' | translate }}
    + {{ 'app.public.events_show.informed_by_email_your_pre_registration' | translate }}
    -
    {{ 'app.public.events_show.you_booked_DATE' | translate:{DATE:(reservation.created_at | amDateFormat:'L LT')} }}
    +
    {{ 'app.public.events_show.you_booked_DATE' | translate:{DATE:(reservation.created_at | amDateFormat:'L LT')} }}
    +
    {{ 'app.public.events_show.you_pre_booked_DATE' | translate:{DATE:(reservation.created_at | amDateFormat:'L LT')} }}
    {{ 'app.public.events_show.full_price_' | translate }} {{reservation.nb_reserve_places}} {{ 'app.public.events_show.ticket' | translate:{NUMBER:reservation.nb_reserve_places} }}
    -
    +
    {{ticket.event_price_category.price_category.name}} : {{ticket.booked}} {{ 'app.public.events_show.ticket' | translate:{NUMBER:ticket.booked} }}
    @@ -178,7 +250,10 @@ {{ 'app.public.events_show.thanks_for_coming' }} {{ 'app.public.events_show.view_event_list' }}
    - +

    @@ -186,15 +261,15 @@

    - +
    -
    +
    -
    +
    diff --git a/app/frontend/templates/shared/_member_select.html b/app/frontend/templates/shared/_member_select.html index b508c96fe..730f5de4a 100644 --- a/app/frontend/templates/shared/_member_select.html +++ b/app/frontend/templates/shared/_member_select.html @@ -12,8 +12,11 @@ {{member}} -
    - {{ 'app.shared.member_select.member_not_validated' }} -
    + + + + {{ 'app.shared.member_select.member_not_validated' }} + +
    diff --git a/app/frontend/templates/shared/header.html.erb b/app/frontend/templates/shared/header.html.erb index f644d1654..f2c5edcea 100644 --- a/app/frontend/templates/shared/header.html.erb +++ b/app/frontend/templates/shared/header.html.erb @@ -40,6 +40,7 @@
    • {{ 'app.public.common.my_profile' }}
      • +
    • {{ 'app.public.common.my_children' }}
    • {{ 'app.public.common.my_settings' }}
    • {{ 'app.public.common.my_supporting_documents_files' }}
    • {{ 'app.public.common.my_projects' }}
      • diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 20adb574f..c82f0f62c 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -167,6 +167,8 @@ module SettingsHelper user_validation_required user_validation_required_list show_username_in_admin_list + family_account + child_validation_required store_module store_withdrawal_instructions store_hidden diff --git a/app/models/booking_user.rb b/app/models/booking_user.rb new file mode 100644 index 000000000..78c6fe6b5 --- /dev/null +++ b/app/models/booking_user.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +# BookingUser is a class for save the booking info of reservation +# booked can be a User or a Child (polymorphic) +class BookingUser < ApplicationRecord + belongs_to :reservation + belongs_to :booked, polymorphic: true + belongs_to :event_price_category +end diff --git a/app/models/cart_item.rb b/app/models/cart_item.rb new file mode 100644 index 000000000..4397e866e --- /dev/null +++ b/app/models/cart_item.rb @@ -0,0 +1,5 @@ +module CartItem + def self.table_name_prefix + "cart_item_" + end +end diff --git a/app/models/cart_item/event_reservation.rb b/app/models/cart_item/event_reservation.rb index 9ae7be11a..cbb90a934 100644 --- a/app/models/cart_item/event_reservation.rb +++ b/app/models/cart_item/event_reservation.rb @@ -13,6 +13,11 @@ class CartItem::EventReservation < CartItem::Reservation foreign_type: 'cart_item_type', as: :cart_item accepts_nested_attributes_for :cart_item_reservation_slots + has_many :cart_item_event_reservation_booking_users, class_name: 'CartItem::EventReservationBookingUser', dependent: :destroy, + inverse_of: :cart_item_event_reservation, + foreign_key: 'cart_item_event_reservation_id' + accepts_nested_attributes_for :cart_item_event_reservation_booking_users + belongs_to :operator_profile, class_name: 'InvoicingProfile' belongs_to :customer_profile, class_name: 'InvoicingProfile' @@ -63,6 +68,14 @@ class CartItem::EventReservation < CartItem::Reservation booked: t.booked } end, + booking_users_attributes: cart_item_event_reservation_booking_users.map do |b| + { + event_price_category_id: b.event_price_category_id, + booked_type: b.booked_type, + booked_id: b.booked_id, + name: b.name + } + end, nb_reserve_places: normal_tickets, statistic_profile_id: StatisticProfile.find_by(user: customer).id ) diff --git a/app/models/cart_item/event_reservation_booking_user.rb b/app/models/cart_item/event_reservation_booking_user.rb new file mode 100644 index 000000000..82df9ac9c --- /dev/null +++ b/app/models/cart_item/event_reservation_booking_user.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +# A relation table between a pending event reservation and reservation users for this event +class CartItem::EventReservationBookingUser < ApplicationRecord + self.table_name = 'cart_item_event_reservation_booking_users' + + belongs_to :cart_item_event_reservation, class_name: 'CartItem::EventReservation', inverse_of: :cart_item_event_reservation_booking_users + belongs_to :event_price_category, inverse_of: :cart_item_event_reservation_tickets + belongs_to :booked, polymorphic: true +end diff --git a/app/models/child.rb b/app/models/child.rb new file mode 100644 index 000000000..3d752ac54 --- /dev/null +++ b/app/models/child.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +# Child is a modal for a child of a user +class Child < ApplicationRecord + belongs_to :user + + has_many :supporting_document_files, as: :supportable, dependent: :destroy + accepts_nested_attributes_for :supporting_document_files, allow_destroy: true, reject_if: :all_blank + has_many :supporting_document_refusals, as: :supportable, dependent: :destroy + + validates :first_name, presence: true + validates :last_name, presence: true + # validates :email, presence: true, format: { with: Devise.email_regexp } + validate :validate_age + + # birthday should less than 18 years ago + def validate_age + errors.add(:birthday, I18n.t('.errors.messages.birthday_less_than_18_years_ago')) if birthday.blank? || birthday < 18.years.ago + end + + def full_name + "#{(first_name || '').humanize.titleize} #{(last_name || '').humanize.titleize}" + end +end diff --git a/app/models/event.rb b/app/models/event.rb index 60bb3f70b..0cfd546cb 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -33,6 +33,8 @@ class Event < ApplicationRecord has_many :cart_item_event_reservations, class_name: 'CartItem::EventReservation', dependent: :destroy + validates :event_type, inclusion: { in: %w[standard nominative family] }, presence: true + attr_accessor :recurrence, :recurrence_end_at before_save :update_nb_free_places @@ -85,14 +87,21 @@ class Event < ApplicationRecord if nb_total_places.nil? self.nb_free_places = nil else - reserved_places = reservations.joins(:slots_reservations) - .where('slots_reservations.canceled_at': nil) - .map(&:total_booked_seats) - .inject(0) { |sum, t| sum + t } + reserved = reservations.joins(:slots_reservations).where('slots_reservations.canceled_at': nil) + reserved = reserved.where('slots_reservations.is_valid': true) if pre_registration? + reserved_places = reserved.map(&:total_booked_seats).inject(0) { |sum, t| sum + t } self.nb_free_places = (nb_total_places - reserved_places) end end + def nb_places_for_pre_registration + reservations.joins(:slots_reservations) + .where('slots_reservations.canceled_at': nil) + .where('slots_reservations.is_valid': nil) + .map(&:total_booked_seats) + .inject(0) { |sum, t| sum + t } + end + def all_day? availability.start_at.hour.zero? end diff --git a/app/models/reservation.rb b/app/models/reservation.rb index fbccce2bb..c6677a0d3 100644 --- a/app/models/reservation.rb +++ b/app/models/reservation.rb @@ -24,6 +24,8 @@ class Reservation < ApplicationRecord has_many :prepaid_pack_reservations, dependent: :destroy belongs_to :reservation_context + has_many :booking_users, dependent: :destroy + accepts_nested_attributes_for :booking_users, allow_destroy: true validates :reservable_id, :reservable_type, presence: true validate :machine_not_already_reserved, if: -> { reservable.is_a?(Machine) } @@ -130,15 +132,27 @@ class Reservation < ApplicationRecord end def notify_member_create_reservation - NotificationCenter.call type: 'notify_member_create_reservation', - receiver: user, - attached_object: self + if reservable_type == 'Event' && reservable.pre_registration? + NotificationCenter.call type: 'notify_member_pre_booked_reservation', + receiver: user, + attached_object: self + else + NotificationCenter.call type: 'notify_member_create_reservation', + receiver: user, + attached_object: self + end end def notify_admin_member_create_reservation - NotificationCenter.call type: 'notify_admin_member_create_reservation', - receiver: User.admins_and_managers, - attached_object: self + if reservable_type == 'Event' && reservable.pre_registration? + NotificationCenter.call type: 'notify_admin_member_pre_booked_reservation', + receiver: User.admins_and_managers, + attached_object: self + else + NotificationCenter.call type: 'notify_admin_member_create_reservation', + receiver: User.admins_and_managers, + attached_object: self + end end def notify_member_limitation_reached diff --git a/app/models/shopping_cart.rb b/app/models/shopping_cart.rb index 31ed97e43..c9716fcdb 100644 --- a/app/models/shopping_cart.rb +++ b/app/models/shopping_cart.rb @@ -60,15 +60,26 @@ class ShoppingCart items.each do |item| objects.push(save_item(item)) end - update_credits(objects) - update_packs(objects) + event_reservation = objects.find { |o| o.is_a?(Reservation) && o.reservable_type == 'Event' } + if event_reservation&.reservable&.pre_registration + payment = Invoice.new( + invoicing_profile: @customer.invoicing_profile, + statistic_profile: @customer.statistic_profile, + operator_profile_id: @operator.invoicing_profile.id, + payment_method: @payment_method, + total: 0 + ) + else + update_credits(objects) + update_packs(objects) - payment = create_payment_document(price, objects, payment_id, payment_type) - WalletService.debit_user_wallet(payment, @customer) - next if Setting.get('prevent_invoices_zero') && price[:total].zero? + payment = create_payment_document(price, objects, payment_id, payment_type) + WalletService.debit_user_wallet(payment, @customer) + next if Setting.get('prevent_invoices_zero') && price[:total].zero? - payment.save - payment.post_save(payment_id, payment_type) + payment.save + payment.post_save(payment_id, payment_type) + end end success = !payment.nil? && objects.map(&:errors).flatten.map(&:empty?).all? && items.map(&:errors).map(&:blank?).all? diff --git a/app/models/supporting_document_file.rb b/app/models/supporting_document_file.rb index 77b2132eb..d672191fb 100644 --- a/app/models/supporting_document_file.rb +++ b/app/models/supporting_document_file.rb @@ -6,7 +6,7 @@ class SupportingDocumentFile < ApplicationRecord mount_uploader :attachment, SupportingDocumentFileUploader belongs_to :supporting_document_type - belongs_to :user + belongs_to :supportable, polymorphic: true validates :attachment, file_size: { maximum: ENV.fetch('MAX_SUPPORTING_DOCUMENT_FILE_SIZE', 5.megabytes).to_i } end diff --git a/app/models/supporting_document_refusal.rb b/app/models/supporting_document_refusal.rb index 29157e932..ffbe328c7 100644 --- a/app/models/supporting_document_refusal.rb +++ b/app/models/supporting_document_refusal.rb @@ -2,8 +2,9 @@ # An admin can mark an uploaded document as refused, this will notify the member class SupportingDocumentRefusal < ApplicationRecord - belongs_to :user + include NotificationAttachedObject + + belongs_to :supportable, polymorphic: true belongs_to :operator, class_name: 'User', inverse_of: :supporting_document_refusals - has_many :supporting_document_refusals_types, dependent: :destroy - has_many :supporting_document_types, through: :supporting_document_refusals_types + has_and_belongs_to_many :supporting_document_types end diff --git a/app/models/supporting_document_type.rb b/app/models/supporting_document_type.rb index 98c596be1..afda3d4a7 100644 --- a/app/models/supporting_document_type.rb +++ b/app/models/supporting_document_type.rb @@ -6,6 +6,7 @@ class SupportingDocumentType < ApplicationRecord has_many :supporting_document_files, dependent: :destroy - has_many :supporting_document_refusals_types, dependent: :destroy - has_many :supporting_document_refusals, through: :supporting_document_refusals_types + has_and_belongs_to_many :supporting_document_refusals, dependent: :destroy + + validates :document_type, presence: true, inclusion: { in: %w[User Child] } end diff --git a/app/models/user.rb b/app/models/user.rb index 47e8e99ac..1c5c7643d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -47,12 +47,15 @@ class User < ApplicationRecord has_many :accounting_periods, foreign_key: 'closed_by', dependent: :nullify, inverse_of: :user - has_many :supporting_document_files, dependent: :destroy - has_many :supporting_document_refusals, dependent: :destroy + has_many :supporting_document_files, as: :supportable, dependent: :destroy + has_many :supporting_document_refusals, as: :supportable, dependent: :destroy has_many :notifications, as: :receiver, dependent: :destroy has_many :notification_preferences, dependent: :destroy + has_many :children, dependent: :destroy + accepts_nested_attributes_for :children, allow_destroy: true + # fix for create admin user before_save do email&.downcase! diff --git a/app/policies/child_policy.rb b/app/policies/child_policy.rb new file mode 100644 index 000000000..e5f9a3232 --- /dev/null +++ b/app/policies/child_policy.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +# Check the access policies for API::ChildrenController +class ChildPolicy < ApplicationPolicy + def index? + !user.organization? + end + + def create? + !user.organization? && user.id == record.user_id + end + + def show? + user.privileged? || user.id == record.user_id + end + + def update? + user.privileged? || user.id == record.user_id + end + + def destroy? + user.privileged? || user.id == record.user_id + end + + def validate? + user.privileged? + end +end 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/policies/reservation_policy.rb b/app/policies/reservation_policy.rb index 61b7c145a..b52eadc8a 100644 --- a/app/policies/reservation_policy.rb +++ b/app/policies/reservation_policy.rb @@ -9,4 +9,8 @@ class ReservationPolicy < ApplicationPolicy def update? user.admin? || user.manager? || record.user == user end + + def confirm_payment? + user.admin? || user.manager? + end end diff --git a/app/policies/setting_policy.rb b/app/policies/setting_policy.rb index 65da8a4c4..5e3a620b6 100644 --- a/app/policies/setting_policy.rb +++ b/app/policies/setting_policy.rb @@ -47,7 +47,7 @@ class SettingPolicy < ApplicationPolicy machines_banner_cta_url trainings_banner_active trainings_banner_text trainings_banner_cta_active trainings_banner_cta_label trainings_banner_cta_url events_banner_active events_banner_text events_banner_cta_active events_banner_cta_label events_banner_cta_url projects_list_member_filter_presence projects_list_date_filters_presence advanced_accounting - project_categories_filter_placeholder project_categories_wording reservation_context_feature] + project_categories_filter_placeholder project_categories_wording reservation_context_feature family_account child_validation_required] end ## diff --git a/app/policies/slots_reservation_policy.rb b/app/policies/slots_reservation_policy.rb index 4d5ed316d..8774a770f 100644 --- a/app/policies/slots_reservation_policy.rb +++ b/app/policies/slots_reservation_policy.rb @@ -15,4 +15,12 @@ class SlotsReservationPolicy < ApplicationPolicy def cancel? user.admin? || user.manager? || record.reservation.user == user end + + def validate? + user.admin? || user.manager? + end + + def invalidate? + user.admin? || user.manager? + end end diff --git a/app/policies/supporting_document_file_policy.rb b/app/policies/supporting_document_file_policy.rb index 9cfaa10f2..2b91f5aab 100644 --- a/app/policies/supporting_document_file_policy.rb +++ b/app/policies/supporting_document_file_policy.rb @@ -6,15 +6,11 @@ class SupportingDocumentFilePolicy < ApplicationPolicy user.privileged? end - def create? - user.privileged? or record.user_id == user.id - end - - def update? - user.privileged? or record.user_id == user.id - end - - def download? - user.privileged? or record.user_id == user.id + %w[create update download].each do |action| + define_method "#{action}?" do + user.privileged? || + (record.supportable_type == 'User' && record.supportable_id.to_i == user.id) || + (record.supportable_type == 'Child' && user.children.exists?(id: record.supportable_id.to_i)) + end end end diff --git a/app/services/cart_service.rb b/app/services/cart_service.rb index c89d20533..24fff5c47 100644 --- a/app/services/cart_service.rb +++ b/app/services/cart_service.rb @@ -173,7 +173,8 @@ class CartService event: reservable, cart_item_reservation_slots_attributes: cart_item[:slots_reservations_attributes], normal_tickets: cart_item[:nb_reserve_places], - cart_item_event_reservation_tickets_attributes: cart_item[:tickets_attributes] || {}) + cart_item_event_reservation_tickets_attributes: cart_item[:tickets_attributes] || {}, + cart_item_event_reservation_booking_users_attributes: cart_item[:booking_users_attributes] || {}) when Space CartItem::SpaceReservation.new(customer_profile: @customer.invoicing_profile, operator_profile: @operator.invoicing_profile, diff --git a/app/services/child_service.rb b/app/services/child_service.rb new file mode 100644 index 000000000..812374976 --- /dev/null +++ b/app/services/child_service.rb @@ -0,0 +1,61 @@ +# frozen_string_literal: true + +# ChildService +class ChildService + def self.create(child) + if child.save + NotificationCenter.call type: 'notify_admin_child_created', + receiver: User.admins_and_managers, + attached_object: child + all_files_are_upload = true + SupportingDocumentType.where(document_type: 'Child').each do |sdt| + file = sdt.supporting_document_files.find_by(supportable: child) + all_files_are_upload = false if file.nil? || file.attachment_identifier.nil? + end + if all_files_are_upload + NotificationCenter.call type: 'notify_admin_user_child_supporting_document_files_created', + receiver: User.admins_and_managers, + attached_object: child + end + + return true + end + false + end + + def self.update(child, child_params) + if child.update(child_params) + all_files_are_upload = true + SupportingDocumentType.where(document_type: 'Child').each do |sdt| + file = sdt.supporting_document_files.find_by(supportable: child) + if file.nil? || file.attachment_identifier.nil? || child_params['supporting_document_files_attributes']['0']['attachment'].blank? + all_files_are_upload = false + end + end + if all_files_are_upload + NotificationCenter.call type: 'notify_admin_user_child_supporting_document_files_updated', + receiver: User.admins_and_managers, + attached_object: child + end + + return true + end + false + end + + def self.validate(child, is_valid) + is_updated = child.update(validated_at: is_valid ? Time.current : nil) + if is_updated + if is_valid + NotificationCenter.call type: 'notify_user_child_is_validated', + receiver: child.user, + attached_object: child + else + NotificationCenter.call type: 'notify_user_child_is_invalidated', + receiver: child.user, + attached_object: child + end + end + is_updated + end +end diff --git a/app/services/members/list_service.rb b/app/services/members/list_service.rb index 9c65396c0..dcb5fe070 100644 --- a/app/services/members/list_service.rb +++ b/app/services/members/list_service.rb @@ -4,7 +4,7 @@ class Members::ListService class << self def list(params) - @query = User.includes(:profile, :group, :statistic_profile) + @query = User.includes(:profile, :group, :statistic_profile, :children) .joins(:profile, :statistic_profile, :group, @@ -27,10 +27,10 @@ class Members::ListService # ILIKE => PostgreSQL case-insensitive LIKE if params[:search].size.positive? @query = @query.where('users.username ILIKE :search OR ' \ - 'profiles.first_name ILIKE :search OR ' \ - 'profiles.last_name ILIKE :search OR ' \ + "profiles.first_name || ' ' || profiles.last_name ILIKE :search OR " \ 'profiles.phone ILIKE :search OR ' \ - 'email ILIKE :search OR ' \ + 'users.email ILIKE :search OR ' \ + "children.first_name || ' ' || children.last_name ILIKE :search OR " \ 'groups.name ILIKE :search OR ' \ 'plans.base_name ILIKE :search', search: "%#{params[:search]}%") end diff --git a/app/services/reservation_confirm_payment_service.rb b/app/services/reservation_confirm_payment_service.rb new file mode 100644 index 000000000..86636263b --- /dev/null +++ b/app/services/reservation_confirm_payment_service.rb @@ -0,0 +1,86 @@ +# frozen_string_literal: true + +# confirm payment of a pre-registration reservation +class ReservationConfirmPaymentService + def initialize(reservation, operator, coupon, offered) + @reservation = reservation + @operator = operator + @offered = offered + @coupon = CartItem::Coupon.new( + customer_profile: @reservation.user.invoicing_profile, + operator_profile: @operator.invoicing_profile, + coupon: Coupon.find_by(code: coupon) + ) + end + + def total + slots_reservations = @reservation.slots_reservations.map do |sr| + { + slot_id: sr.slot_id, + offered: @offered + } + end + tickets = @reservation.tickets.map do |t| + { + event_price_category_id: t.event_price_category_id, + booked: t.booked + } + end + booking_users = @reservation.booking_users.map do |bu| + { + name: bu.name, + event_price_category_id: bu.event_price_category_id, + booked_id: bu.booked_id, + booked_type: bu.booked_type + } + end + event_reservation = CartItem::EventReservation.new(customer_profile: @reservation.user.invoicing_profile, + operator_profile: @operator.invoicing_profile, + event: @reservation.reservable, + cart_item_reservation_slots_attributes: slots_reservations, + normal_tickets: @reservation.nb_reserve_places, + cart_item_event_reservation_tickets_attributes: tickets, + cart_item_event_reservation_booking_users_attributes: booking_users) + + all_elements = { + slots: @reservation.slots_reservations.map do |sr| + { start_at: sr.slot.start_at, end_at: sr.slot.end_at, price: event_reservation.price[:amount] } + end + } + + total_amount = event_reservation.price[:amount] + + coupon_info = @coupon.price(total_amount) + + # return result + { + elements: all_elements, + total: coupon_info[:total_with_coupon].to_i, + before_coupon: coupon_info[:total_without_coupon].to_i, + coupon: @coupon.coupon + } + end + + def call + price = total + invoice = InvoicesService.create( + price, + @operator.invoicing_profile.id, + [@reservation], + @reservation.user + ) + if Setting.get('prevent_invoices_zero') && price[:total].zero? + @reservation.slots_reservations.first.update(is_confirm: true) + return invoice + end + + ActiveRecord::Base.transaction do + WalletService.debit_user_wallet(invoice, @reservation.user) + + invoice.save + invoice.post_save + @reservation.slots_reservations.first.update(is_confirm: true) + end + invoice + end +end diff --git a/app/services/slots/reservations_service.rb b/app/services/slots/reservations_service.rb index fcdc87082..8dd890662 100644 --- a/app/services/slots/reservations_service.rb +++ b/app/services/slots/reservations_service.rb @@ -19,6 +19,9 @@ class Slots::ReservationsService .where('reservations.reservable_type': reservable_types) .where('reservations.reservable_id': reservables.map { |r| r.try(:id) }) .where('slots_reservations.canceled_at': nil) + if reservables.first.is_a?(Event) && reservables.first&.pre_registration? + reservations = reservations.where('slots_reservations.is_valid': true) + end user_ids = reservations.includes(reservation: :statistic_profile) .map(&:reservation) diff --git a/app/services/slots_reservations_service.rb b/app/services/slots_reservations_service.rb index d1551b410..3699083ae 100644 --- a/app/services/slots_reservations_service.rb +++ b/app/services/slots_reservations_service.rb @@ -21,5 +21,43 @@ class SlotsReservationsService rescue Faraday::ConnectionFailed warn 'Unable to update data in elasticsearch' end + + def validate(slot_reservation) + if slot_reservation.update(is_valid: true) + reservable = slot_reservation.reservation.reservable + if reservable.is_a?(Event) + reservable.update_nb_free_places + reservable.save + end + Slots::PlacesCacheService.refresh(slot_reservation.slot) + NotificationCenter.call type: 'notify_member_reservation_validated', + receiver: slot_reservation.reservation.user, + attached_object: slot_reservation.reservation + NotificationCenter.call type: 'notify_admin_reservation_validated', + receiver: User.admins_and_managers, + attached_object: slot_reservation.reservation + return true + end + false + end + + def invalidate(slot_reservation) + if slot_reservation.update(is_valid: false) + reservable = slot_reservation.reservation.reservable + if reservable.is_a?(Event) + reservable.update_nb_free_places + reservable.save + end + Slots::PlacesCacheService.refresh(slot_reservation.slot) + NotificationCenter.call type: 'notify_member_reservation_invalidated', + receiver: slot_reservation.reservation.user, + attached_object: slot_reservation.reservation + NotificationCenter.call type: 'notify_admin_reservation_invalidated', + receiver: User.admins_and_managers, + attached_object: slot_reservation.reservation + return true + end + false + end end end diff --git a/app/services/supporting_document_file_service.rb b/app/services/supporting_document_file_service.rb index 49cd017ec..67c9b1eef 100644 --- a/app/services/supporting_document_file_service.rb +++ b/app/services/supporting_document_file_service.rb @@ -4,23 +4,32 @@ class SupportingDocumentFileService def self.list(operator, filters = {}) files = [] - if filters[:user_id].present? && (operator.privileged? || filters[:user_id].to_i == operator.id) - files = SupportingDocumentFile.where(user_id: filters[:user_id]) + if filters[:supportable_id].present? && can_list?(operator, filters[:supportable_id], filters[:supportable_type]) + files = SupportingDocumentFile.where(supportable_id: filters[:supportable_id], supportable_type: filters[:supportable_type]) end files end + def self.can_list?(operator, supportable_id, supportable_type) + operator.privileged? || + (supportable_type == 'User' && supportable_id.to_i == operator.id) || + (supportable_type == 'Child' && operator.children.exists?(id: supportable_id.to_i)) + end + def self.create(supporting_document_file) saved = supporting_document_file.save if saved - user = User.find(supporting_document_file.user_id) all_files_are_upload = true - user.group.supporting_document_types.each do |type| - file = type.supporting_document_files.find_by(user_id: supporting_document_file.user_id) - all_files_are_upload = false unless file + if supporting_document_file.supportable_type == 'User' + user = supporting_document_file.supportable + user.group.supporting_document_types.each do |type| + file = type.supporting_document_files.find_by(supportable_id: supporting_document_file.supportable_id, + supportable_type: supporting_document_file.supportable_type) + all_files_are_upload = false unless file + end end - if all_files_are_upload + if all_files_are_upload && (supporting_document_file.supportable_type == 'User') NotificationCenter.call type: 'notify_admin_user_supporting_document_files_created', receiver: User.admins_and_managers, attached_object: user @@ -32,13 +41,16 @@ class SupportingDocumentFileService def self.update(supporting_document_file, params) updated = supporting_document_file.update(params) if updated - user = supporting_document_file.user all_files_are_upload = true - user.group.supporting_document_types.each do |type| - file = type.supporting_document_files.find_by(user_id: supporting_document_file.user_id) - all_files_are_upload = false unless file + if supporting_document_file.supportable_type == 'User' + user = supporting_document_file.supportable + user.group.supporting_document_types.each do |type| + file = type.supporting_document_files.find_by(supportable_id: supporting_document_file.supportable_id, + supportable_type: supporting_document_file.supportable_type) + all_files_are_upload = false unless file + end end - if all_files_are_upload + if all_files_are_upload && (supporting_document_file.supportable_type == 'User') NotificationCenter.call type: 'notify_admin_user_supporting_document_files_updated', receiver: User.admins_and_managers, attached_object: supporting_document_file diff --git a/app/services/supporting_document_refusal_service.rb b/app/services/supporting_document_refusal_service.rb index 10bf7f52a..612983747 100644 --- a/app/services/supporting_document_refusal_service.rb +++ b/app/services/supporting_document_refusal_service.rb @@ -4,7 +4,10 @@ class SupportingDocumentRefusalService def self.list(filters = {}) refusals = [] - refusals = SupportingDocumentRefusal.where(user_id: filters[:user_id]) if filters[:user_id].present? + if filters[:supportable_id].present? + refusals = SupportingDocumentRefusal.where(supportable_id: filters[:supportable_id], + supportable_type: filters[:supportable_type]) + end refusals end @@ -12,12 +15,22 @@ class SupportingDocumentRefusalService saved = supporting_document_refusal.save if saved - NotificationCenter.call type: 'notify_admin_user_supporting_document_refusal', - receiver: User.admins_and_managers, - attached_object: supporting_document_refusal - NotificationCenter.call type: 'notify_user_supporting_document_refusal', - receiver: supporting_document_refusal.user, - attached_object: supporting_document_refusal + case supporting_document_refusal.supportable_type + when 'User' + NotificationCenter.call type: 'notify_admin_user_supporting_document_refusal', + receiver: User.admins_and_managers, + attached_object: supporting_document_refusal + NotificationCenter.call type: 'notify_user_supporting_document_refusal', + receiver: supporting_document_refusal.supportable, + attached_object: supporting_document_refusal + when 'Child' + NotificationCenter.call type: 'notify_admin_user_child_supporting_document_refusal', + receiver: User.admins_and_managers, + attached_object: SupportingDocumentRefusal.last + NotificationCenter.call type: 'notify_user_child_supporting_document_refusal', + receiver: SupportingDocumentRefusal.last.supportable.user, + attached_object: SupportingDocumentRefusal.last + end end saved end diff --git a/app/services/supporting_document_type_service.rb b/app/services/supporting_document_type_service.rb index e393a464d..342a567d2 100644 --- a/app/services/supporting_document_type_service.rb +++ b/app/services/supporting_document_type_service.rb @@ -9,7 +9,7 @@ class SupportingDocumentTypeService group.supporting_document_types.includes(:groups) else - SupportingDocumentType.all + SupportingDocumentType.where(document_type: filters[:document_type] || 'User') end end end diff --git a/app/views/api/children/_child.json.jbuilder b/app/views/api/children/_child.json.jbuilder new file mode 100644 index 000000000..0765d67ad --- /dev/null +++ b/app/views/api/children/_child.json.jbuilder @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +json.extract! child, :id, :first_name, :last_name, :email, :birthday, :phone, :user_id, :validated_at +json.supporting_document_files_attributes child.supporting_document_files do |f| + json.id f.id + json.supportable_id f.supportable_id + json.supportable_type f.supportable_type + json.supporting_document_type_id f.supporting_document_type_id + json.attachment f.attachment.file&.filename + json.attachment_name f.attachment_identifier + json.attachment_url f.attachment_identifier ? "/api/supporting_document_files/#{f.id}/download" : nil +end diff --git a/app/views/api/children/create.json.jbuilder b/app/views/api/children/create.json.jbuilder new file mode 100644 index 000000000..c14c4cc71 --- /dev/null +++ b/app/views/api/children/create.json.jbuilder @@ -0,0 +1,3 @@ +# frozen_string_literal: true + +json.partial! 'child', child: @child diff --git a/app/views/api/children/index.json.jbuilder b/app/views/api/children/index.json.jbuilder new file mode 100644 index 000000000..b876f1116 --- /dev/null +++ b/app/views/api/children/index.json.jbuilder @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +json.array! @children do |child| + json.partial! 'child', child: child +end diff --git a/app/views/api/children/show.json.jbuilder b/app/views/api/children/show.json.jbuilder new file mode 100644 index 000000000..c97cd198b --- /dev/null +++ b/app/views/api/children/show.json.jbuilder @@ -0,0 +1,3 @@ +# forzen_string_literal: true + +json.partial! 'child', child: @child diff --git a/app/views/api/children/update.json.jbuilder b/app/views/api/children/update.json.jbuilder new file mode 100644 index 000000000..c97cd198b --- /dev/null +++ b/app/views/api/children/update.json.jbuilder @@ -0,0 +1,3 @@ +# forzen_string_literal: true + +json.partial! 'child', child: @child diff --git a/app/views/api/events/_event.json.jbuilder b/app/views/api/events/_event.json.jbuilder index 09a19e0c0..49a1488e6 100644 --- a/app/views/api/events/_event.json.jbuilder +++ b/app/views/api/events/_event.json.jbuilder @@ -1,6 +1,8 @@ # frozen_string_literal: true -json.extract! event, :id, :title, :description +json.extract! event, :id, :title, :description, :event_type, :pre_registration, :pre_registration_end_date +json.pre_registration_end_date event.pre_registration_end_date&.to_date +json.nb_places_for_pre_registration event.nb_places_for_pre_registration if event.event_image json.event_image_attributes do json.id event.event_image.id diff --git a/app/views/api/invoices/_invoice.json.jbuilder b/app/views/api/invoices/_invoice.json.jbuilder index 4ac46da9d..00754b59a 100644 --- a/app/views/api/invoices/_invoice.json.jbuilder +++ b/app/views/api/invoices/_invoice.json.jbuilder @@ -11,8 +11,8 @@ json.is_online_card invoice.paid_by_card? json.date invoice.is_a?(Avoir) ? invoice.avoir_date : invoice.created_at json.chained_footprint invoice.check_footprint json.main_object do - json.type invoice.invoice_items.find(&:main).object_type - json.id invoice.invoice_items.find(&:main).object_id + json.type invoice.invoice_items.find(&:main)&.object_type + json.id invoice.invoice_items.find(&:main)&.object_id end json.items invoice.invoice_items do |item| json.id item.id diff --git a/app/views/api/members/list.json.jbuilder b/app/views/api/members/list.json.jbuilder index 38dd1b1a2..764939ce7 100644 --- a/app/views/api/members/list.json.jbuilder +++ b/app/views/api/members/list.json.jbuilder @@ -18,4 +18,16 @@ json.array!(@members) do |member| end end json.validated_at member.validated_at + json.children member.children.where('birthday >= ?', 18.years.ago).order(:created_at) do |child| + json.extract! child, :id, :first_name, :last_name, :email, :birthday, :phone, :user_id, :validated_at + json.supporting_document_files_attributes child.supporting_document_files do |f| + json.id f.id + json.supportable_id f.supportable_id + json.supportable_type f.supportable_type + json.supporting_document_type_id f.supporting_document_type_id + json.attachment f.attachment.file&.filename + json.attachment_name f.attachment_identifier + json.attachment_url f.attachment_identifier ? "/api/supporting_document_files/#{f.id}/download" : nil + end + end end diff --git a/app/views/api/members/show.json.jbuilder b/app/views/api/members/show.json.jbuilder index c718821a8..0e7a44135 100644 --- a/app/views/api/members/show.json.jbuilder +++ b/app/views/api/members/show.json.jbuilder @@ -77,13 +77,27 @@ json.events_reservations @member.reservations.where(reservable_type: 'Event').jo json.nb_reserve_places sr.reservation.nb_reserve_places json.tickets sr.reservation.tickets do |t| json.booked t.booked + json.event_price_category_id t.event_price_category_id json.price_category do json.name t.event_price_category.price_category.name end end json.reservable sr.reservation.reservable json.reservable_type 'Event' + json.event_type sr.reservation.reservable.event_type + json.event_title sr.reservation.reservable.title + json.event_pre_registration sr.reservation.reservable.pre_registration + json.is_valid sr.is_valid + json.is_paid sr.is_confirm + json.amount sr.reservation.invoice_items.sum(:amount) json.canceled_at sr.canceled_at + json.booking_users_attributes sr.reservation.booking_users.order(booked_type: :desc) do |bu| + json.id bu.id + json.name bu.name + json.event_price_category_id bu.event_price_category_id + json.booked_id bu.booked_id + json.booked_type bu.booked_type + end end json.invoices @member.invoices.order('reference DESC') do |i| json.id i.id diff --git a/app/views/api/notifications/_notify_admin_child_created.json.jbuilder b/app/views/api/notifications/_notify_admin_child_created.json.jbuilder new file mode 100644 index 000000000..d65f42b8e --- /dev/null +++ b/app/views/api/notifications/_notify_admin_child_created.json.jbuilder @@ -0,0 +1,4 @@ +json.title notification.notification_type +json.description t('.a_new_child_has_been_created_NAME_html', + NAME: notification.attached_object&.full_name || t('api.notifications.deleted_user')) + diff --git a/app/views/api/notifications/_notify_admin_member_pre_booked_reservation.json.jbuilder b/app/views/api/notifications/_notify_admin_member_pre_booked_reservation.json.jbuilder new file mode 100644 index 000000000..5488d620f --- /dev/null +++ b/app/views/api/notifications/_notify_admin_member_pre_booked_reservation.json.jbuilder @@ -0,0 +1,5 @@ +json.title notification.notification_type +json.description t('.a_RESERVABLE_reservation_was_made_by_USER_html', + RESERVABLE: notification.attached_object.reservable.name, + USER: notification.attached_object.user&.profile&.full_name || t('api.notifications.deleted_user')) + diff --git a/app/views/api/notifications/_notify_admin_reservation_invalidated.json.jbuilder b/app/views/api/notifications/_notify_admin_reservation_invalidated.json.jbuilder new file mode 100644 index 000000000..3e2aeefd4 --- /dev/null +++ b/app/views/api/notifications/_notify_admin_reservation_invalidated.json.jbuilder @@ -0,0 +1,4 @@ +json.title notification.notification_type +json.description t('.a_RESERVABLE_reservation_was_invalidated_html', + RESERVABLE: notification.attached_object.reservable.name, + NAME: notification.attached_object.user&.profile&.full_name || t('api.notifications.deleted_user')) diff --git a/app/views/api/notifications/_notify_admin_reservation_validated.json.jbuilder b/app/views/api/notifications/_notify_admin_reservation_validated.json.jbuilder new file mode 100644 index 000000000..02445775a --- /dev/null +++ b/app/views/api/notifications/_notify_admin_reservation_validated.json.jbuilder @@ -0,0 +1,4 @@ +json.title notification.notification_type +json.description t('.a_RESERVABLE_reservation_was_validated_html', + RESERVABLE: notification.attached_object.reservable.name, + NAME: notification.attached_object.user&.profile&.full_name || t('api.notifications.deleted_user')) diff --git a/app/views/api/notifications/_notify_admin_user_child_supporting_document_files_created.json.jbuilder b/app/views/api/notifications/_notify_admin_user_child_supporting_document_files_created.json.jbuilder new file mode 100644 index 000000000..4a16e4502 --- /dev/null +++ b/app/views/api/notifications/_notify_admin_user_child_supporting_document_files_created.json.jbuilder @@ -0,0 +1,3 @@ +json.title notification.notification_type +json.description t('.supporting_document_files_uploaded', + NAME: notification.attached_object&.full_name || t('api.notifications.deleted_user')) diff --git a/app/views/api/notifications/_notify_admin_user_child_supporting_document_files_updated.json.jbuilder b/app/views/api/notifications/_notify_admin_user_child_supporting_document_files_updated.json.jbuilder new file mode 100644 index 000000000..5b97b34ea --- /dev/null +++ b/app/views/api/notifications/_notify_admin_user_child_supporting_document_files_updated.json.jbuilder @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +json.title notification.notification_type +json.description t('.supporting_document_files_uploaded', + NAME: notification.attached_object&.full_name || t('api.notifications.deleted_user')) diff --git a/app/views/api/notifications/_notify_admin_user_child_supporting_document_refusal.json.jbuilder b/app/views/api/notifications/_notify_admin_user_child_supporting_document_refusal.json.jbuilder new file mode 100644 index 000000000..9d95c480d --- /dev/null +++ b/app/views/api/notifications/_notify_admin_user_child_supporting_document_refusal.json.jbuilder @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +json.title notification.notification_type +json.description t('.refusal', + NAME: notification.attached_object&.supportable&.full_name || t('api.notifications.deleted_user')) diff --git a/app/views/api/notifications/_notify_admin_user_supporting_document_files_updated.json.jbuilder b/app/views/api/notifications/_notify_admin_user_supporting_document_files_updated.json.jbuilder index 0f85e7d9b..070055a91 100644 --- a/app/views/api/notifications/_notify_admin_user_supporting_document_files_updated.json.jbuilder +++ b/app/views/api/notifications/_notify_admin_user_supporting_document_files_updated.json.jbuilder @@ -2,4 +2,4 @@ json.title notification.notification_type json.description t('.supporting_document_files_uploaded', - NAME: notification.attached_object&.user&.profile&.full_name || t('api.notifications.deleted_user')) + NAME: notification.attached_object&.supportable&.profile&.full_name || t('api.notifications.deleted_user')) diff --git a/app/views/api/notifications/_notify_admin_user_supporting_document_refusal.json.jbuilder b/app/views/api/notifications/_notify_admin_user_supporting_document_refusal.json.jbuilder index 93fb21f32..e92b63f79 100644 --- a/app/views/api/notifications/_notify_admin_user_supporting_document_refusal.json.jbuilder +++ b/app/views/api/notifications/_notify_admin_user_supporting_document_refusal.json.jbuilder @@ -2,4 +2,4 @@ json.title notification.notification_type json.description t('.refusal', - NAME: notification.attached_object&.user&.profile&.full_name || t('api.notifications.deleted_user')) + NAME: notification.attached_object&.supportable&.profile&.full_name || t('api.notifications.deleted_user')) diff --git a/app/views/api/notifications/_notify_member_pre_booked_reservation.json.jbuilder b/app/views/api/notifications/_notify_member_pre_booked_reservation.json.jbuilder new file mode 100644 index 000000000..7e212d607 --- /dev/null +++ b/app/views/api/notifications/_notify_member_pre_booked_reservation.json.jbuilder @@ -0,0 +1,3 @@ +json.title notification.notification_type +json.description t('.your_reservation_RESERVABLE_was_successfully_saved_html', + RESERVABLE: notification.attached_object.reservable.name) diff --git a/app/views/api/notifications/_notify_member_reservation_invalidated.json.jbuilder b/app/views/api/notifications/_notify_member_reservation_invalidated.json.jbuilder new file mode 100644 index 000000000..7d223ed64 --- /dev/null +++ b/app/views/api/notifications/_notify_member_reservation_invalidated.json.jbuilder @@ -0,0 +1,3 @@ +json.title notification.notification_type +json.description t('.your_reservation_RESERVABLE_was_invalidated_html', + RESERVABLE: notification.attached_object.reservable.name) diff --git a/app/views/api/notifications/_notify_member_reservation_validated.json.jbuilder b/app/views/api/notifications/_notify_member_reservation_validated.json.jbuilder new file mode 100644 index 000000000..8ccbc9fbd --- /dev/null +++ b/app/views/api/notifications/_notify_member_reservation_validated.json.jbuilder @@ -0,0 +1,3 @@ +json.title notification.notification_type +json.description t('.your_reservation_RESERVABLE_was_validated_html', + RESERVABLE: notification.attached_object.reservable.name) diff --git a/app/views/api/notifications/_notify_user_child_is_invalidated.json.jbuilder b/app/views/api/notifications/_notify_user_child_is_invalidated.json.jbuilder new file mode 100644 index 000000000..0d39d7100 --- /dev/null +++ b/app/views/api/notifications/_notify_user_child_is_invalidated.json.jbuilder @@ -0,0 +1,2 @@ +json.title notification.notification_type +json.description t('.child_invalidated') diff --git a/app/views/api/notifications/_notify_user_child_is_validated.json.jbuilder b/app/views/api/notifications/_notify_user_child_is_validated.json.jbuilder new file mode 100644 index 000000000..d53c23b3c --- /dev/null +++ b/app/views/api/notifications/_notify_user_child_is_validated.json.jbuilder @@ -0,0 +1,2 @@ +json.title notification.notification_type +json.description t('.child_validated') diff --git a/app/views/api/notifications/_notify_user_child_supporting_document_refusal.json.jbuilder b/app/views/api/notifications/_notify_user_child_supporting_document_refusal.json.jbuilder new file mode 100644 index 000000000..5a0cb327e --- /dev/null +++ b/app/views/api/notifications/_notify_user_child_supporting_document_refusal.json.jbuilder @@ -0,0 +1,4 @@ +# frozen_string_literal: true + +json.title notification.notification_type +json.description t('.refusal') diff --git a/app/views/api/notifications/_notify_user_when_child_age_will_be_18.json.jbuilder b/app/views/api/notifications/_notify_user_when_child_age_will_be_18.json.jbuilder new file mode 100644 index 000000000..348b47f06 --- /dev/null +++ b/app/views/api/notifications/_notify_user_when_child_age_will_be_18.json.jbuilder @@ -0,0 +1,6 @@ +# frozen_string_literal: true + +json.title notification.notification_type +json.description t('.child_age_will_be_18_years_ago', + NAME: notification.attached_object.full_name, + DATE: I18n.l(notification.attached_object.birthday, format: :default)) diff --git a/app/views/api/reservations/_reservation.json.jbuilder b/app/views/api/reservations/_reservation.json.jbuilder index 7ba3e0e12..4370d7d5e 100644 --- a/app/views/api/reservations/_reservation.json.jbuilder +++ b/app/views/api/reservations/_reservation.json.jbuilder @@ -7,6 +7,8 @@ json.message reservation.message json.slots_reservations_attributes reservation.slots_reservations do |sr| json.id sr.id json.canceled_at sr.canceled_at&.iso8601 + json.is_valid sr.is_valid + json.slot_id sr.slot_id json.slot_attributes do json.id sr.slot_id json.start_at sr.slot.start_at.iso8601 @@ -32,3 +34,13 @@ json.reservable do json.id reservation.reservable.id json.name reservation.reservable.name end +json.booking_users_attributes reservation.booking_users.order(booked_type: :desc) do |bu| + json.id bu.id + json.name bu.name + json.event_price_category_id bu.event_price_category_id + json.booked_id bu.booked_id + json.booked_type bu.booked_type + json.age ((Time.zone.now - bu.booked.birthday.to_time) / 1.year.seconds).floor if bu.booked_type == 'Child' +end +json.is_valid reservation.slots_reservations[0].is_valid +json.is_paid reservation.slots_reservations[0].is_confirm diff --git a/app/views/api/supporting_document_files/_supporting_document_file.json.jbuilder b/app/views/api/supporting_document_files/_supporting_document_file.json.jbuilder index 361abd8a1..89fbb7f1d 100644 --- a/app/views/api/supporting_document_files/_supporting_document_file.json.jbuilder +++ b/app/views/api/supporting_document_files/_supporting_document_file.json.jbuilder @@ -1,4 +1,4 @@ # frozen_string_literal: true -json.extract! supporting_document_file, :id, :user_id, :supporting_document_type_id +json.extract! supporting_document_file, :id, :supportable_id, :supportable_type, :supporting_document_type_id json.attachment supporting_document_file.attachment.file.filename diff --git a/app/views/api/supporting_document_refusals/_supporting_document_refusal.json.jbuilder b/app/views/api/supporting_document_refusals/_supporting_document_refusal.json.jbuilder index 71e6e28a1..d5e0bdd1c 100644 --- a/app/views/api/supporting_document_refusals/_supporting_document_refusal.json.jbuilder +++ b/app/views/api/supporting_document_refusals/_supporting_document_refusal.json.jbuilder @@ -1,3 +1,3 @@ # frozen_string_literal: true -json.extract! supporting_document_refusal, :id, :user_id, :operator_id, :supporting_document_type_ids, :message +json.extract! supporting_document_refusal, :id, :supportable_id, :supportable_type, :operator_id, :supporting_document_type_ids, :message diff --git a/app/views/api/supporting_document_types/_supporting_document_type.json.jbuilder b/app/views/api/supporting_document_types/_supporting_document_type.json.jbuilder index 68e5dec61..af33eefd5 100644 --- a/app/views/api/supporting_document_types/_supporting_document_type.json.jbuilder +++ b/app/views/api/supporting_document_types/_supporting_document_type.json.jbuilder @@ -1,3 +1,3 @@ # frozen_string_literal: true -json.extract! supporting_document_type, :id, :name, :group_ids +json.extract! supporting_document_type, :id, :name, :group_ids, :document_type diff --git a/app/views/notifications_mailer/notify_admin_child_created.html.erb b/app/views/notifications_mailer/notify_admin_child_created.html.erb new file mode 100644 index 000000000..77225fef8 --- /dev/null +++ b/app/views/notifications_mailer/notify_admin_child_created.html.erb @@ -0,0 +1,6 @@ +<%= render 'notifications_mailer/shared/hello', recipient: @recipient %> + +

      + <%= t('.body.new_child_created') %> + "<%= @attached_object&.full_name || t('api.notifications.deleted_user') %> <<%= @attached_object.email%>>" +

      diff --git a/app/views/notifications_mailer/notify_admin_member_pre_booked_reservation.html.erb b/app/views/notifications_mailer/notify_admin_member_pre_booked_reservation.html.erb new file mode 100644 index 000000000..46dc4812c --- /dev/null +++ b/app/views/notifications_mailer/notify_admin_member_pre_booked_reservation.html.erb @@ -0,0 +1,19 @@ +<%= render 'notifications_mailer/shared/hello', recipient: @recipient %> + +

      + <%= t('.body.member_reserved_html', + NAME: @attached_object.user&.profile&.full_name || t('api.notifications.deleted_user'), + RESERVABLE: @attached_object.reservable.name) %> +

      +

      <%= t('.body.reserved_slots') %>

      +
        +<% @attached_object.slots.each do |slot| %> + <% if @attached_object.reservable_type == 'Event' %> + <% (slot.start_at.to_date..slot.end_at.to_date).each do |d| %> +
      • <%= "#{I18n.l d, format: :long} #{I18n.l slot.start_at, format: :hour_minute} - #{I18n.l slot.end_at, format: :hour_minute}" %>
        • + <% end %> + <% else %> +
      • <%= "#{I18n.l slot.start_at, format: :long} - #{I18n.l slot.end_at, format: :hour_minute}" %>
        • + <% end %> +<% end %> +
      diff --git a/app/views/notifications_mailer/notify_admin_reservation_invalidated.html.erb b/app/views/notifications_mailer/notify_admin_reservation_invalidated.html.erb new file mode 100644 index 000000000..461e9235d --- /dev/null +++ b/app/views/notifications_mailer/notify_admin_reservation_invalidated.html.erb @@ -0,0 +1,7 @@ +<%= render 'notifications_mailer/shared/hello', recipient: @recipient %> + +

      + <%= t('.body.reservation_invalidated_html', + NAME: @attached_object.user&.profile&.full_name || t('api.notifications.deleted_user'), + RESERVABLE: @attached_object.reservable.name) %> +

      diff --git a/app/views/notifications_mailer/notify_admin_reservation_validated.html.erb b/app/views/notifications_mailer/notify_admin_reservation_validated.html.erb new file mode 100644 index 000000000..7551295e8 --- /dev/null +++ b/app/views/notifications_mailer/notify_admin_reservation_validated.html.erb @@ -0,0 +1,19 @@ +<%= render 'notifications_mailer/shared/hello', recipient: @recipient %> + +

      + <%= t('.body.reservation_validated_html', + NAME: @attached_object.user&.profile&.full_name || t('api.notifications.deleted_user'), + RESERVABLE: @attached_object.reservable.name) %> +

      +

      <%= t('.body.reserved_slots') %>

      +
        +<% @attached_object.slots.each do |slot| %> + <% if @attached_object.reservable_type == 'Event' %> + <% (slot.start_at.to_date..slot.end_at.to_date).each do |d| %> +
      • <%= "#{I18n.l d, format: :long} #{I18n.l slot.start_at, format: :hour_minute} - #{I18n.l slot.end_at, format: :hour_minute}" %>
        • + <% end %> + <% else %> +
      • <%= "#{I18n.l slot.start_at, format: :long} - #{I18n.l slot.end_at, format: :hour_minute}" %>
        • + <% end %> +<% end %> +
      diff --git a/app/views/notifications_mailer/notify_admin_user_child_supporting_document_files_created.html.erb b/app/views/notifications_mailer/notify_admin_user_child_supporting_document_files_created.html.erb new file mode 100644 index 000000000..239915785 --- /dev/null +++ b/app/views/notifications_mailer/notify_admin_user_child_supporting_document_files_created.html.erb @@ -0,0 +1,18 @@ +<%= render 'notifications_mailer/shared/hello', recipient: @recipient %> + +

      + <%= t('.body.supporting_document_files_uploaded_below', + NAME: @attached_object&.full_name || t('api.notifications.deleted_user')) %> +

      +
        +<% if @attached_object %> + <% SupportingDocumentType.where(document_type: 'Child').each do |type| %> +
      • <%= type.name %>
        • + <% end %> +<% end %> +
      +<% if Setting.get('child_validation_required') %> +

      + <%= t('.body.validate_child') %> +

      +<% end %> diff --git a/app/views/notifications_mailer/notify_admin_user_child_supporting_document_files_updated.html.erb b/app/views/notifications_mailer/notify_admin_user_child_supporting_document_files_updated.html.erb new file mode 100644 index 000000000..00355c465 --- /dev/null +++ b/app/views/notifications_mailer/notify_admin_user_child_supporting_document_files_updated.html.erb @@ -0,0 +1,19 @@ +<%= render 'notifications_mailer/shared/hello', recipient: @recipient %> + +

      + <%= t('.body.child_update_supporting_document_file', + NAME: @attached_object&.full_name || t('api.notifications.deleted_user')) %> +

      +
        +<% if @attached_object %> + <% SupportingDocumentType.where(document_type: 'Child').each do |type| %> +
      • <%= type.name %>
        • + <% end %> +<% end %> +
      +
    +<% if Setting.get('child_validation_required') %> +

    + <%= t('.body.validate_child') %> +

    +<% end %> diff --git a/app/views/notifications_mailer/notify_admin_user_child_supporting_document_refusal.html.erb b/app/views/notifications_mailer/notify_admin_user_child_supporting_document_refusal.html.erb new file mode 100644 index 000000000..bb97ca950 --- /dev/null +++ b/app/views/notifications_mailer/notify_admin_user_child_supporting_document_refusal.html.erb @@ -0,0 +1,15 @@ +<%= render 'notifications_mailer/shared/hello', recipient: @recipient %> + +

    + <%= t('.body.user_child_supporting_document_files_refusal', + NAME: @attached_object&.supportable&.full_name || t('api.notifications.deleted_user'), + OPERATOR: @attached_object&.operator&.profile&.full_name || t('api.notifications.deleted_user')) %> +

    +
      + <% @attached_object.supporting_document_types.each do |type| %> +
    • <%= type.name %>
      • + <% end %> +
    +

    + <%= @attached_object.message %> +

    diff --git a/app/views/notifications_mailer/notify_admin_user_supporting_document_files_updated.html.erb b/app/views/notifications_mailer/notify_admin_user_supporting_document_files_updated.html.erb index 7cae027c1..000e9cc5e 100644 --- a/app/views/notifications_mailer/notify_admin_user_supporting_document_files_updated.html.erb +++ b/app/views/notifications_mailer/notify_admin_user_supporting_document_files_updated.html.erb @@ -2,7 +2,7 @@

    <%= t('.body.user_update_supporting_document_file', - NAME: @attached_object&.user&.profile&.full_name || t('api.notifications.deleted_user')) %> + NAME: @attached_object&.supportable&.profile&.full_name || t('api.notifications.deleted_user')) %>

    • <%= @attached_object.supporting_document_type.name %>
      • diff --git a/app/views/notifications_mailer/notify_admin_user_supporting_document_refusal.html.erb b/app/views/notifications_mailer/notify_admin_user_supporting_document_refusal.html.erb index 8a5c2cdef..8c720cfbc 100644 --- a/app/views/notifications_mailer/notify_admin_user_supporting_document_refusal.html.erb +++ b/app/views/notifications_mailer/notify_admin_user_supporting_document_refusal.html.erb @@ -2,7 +2,7 @@

      <%= t('.body.user_supporting_document_files_refusal', - NAME: @attached_object&.user&.profile&.full_name || t('api.notifications.deleted_user'), + NAME: @attached_object&.supportable&.profile&.full_name || t('api.notifications.deleted_user'), OPERATOR: @attached_object&.operator&.profile&.full_name || t('api.notifications.deleted_user')) %>

        diff --git a/app/views/notifications_mailer/notify_member_pre_booked_reservation.html.erb b/app/views/notifications_mailer/notify_member_pre_booked_reservation.html.erb new file mode 100644 index 000000000..ff507953e --- /dev/null +++ b/app/views/notifications_mailer/notify_member_pre_booked_reservation.html.erb @@ -0,0 +1,16 @@ +<%= render 'notifications_mailer/shared/hello', recipient: @recipient %> + +

        <%= t('.body.reservation_saved_html', RESERVATION: @attached_object.reservable.name) %>

        + +

        <%= t('.body.your_reserved_slots') %>

        +
          +<% @attached_object.slots.each do |slot| %> + <% if @attached_object.reservable_type == 'Event' %> + <% (slot.start_at.to_date..slot.end_at.to_date).each do |d| %> +
        • <%= "#{I18n.l d, format: :long} #{I18n.l slot.start_at, format: :hour_minute} - #{I18n.l slot.end_at, format: :hour_minute}" %>
          • + <% end %> + <% else %> +
        • <%= "#{I18n.l slot.start_at, format: :long} - #{I18n.l slot.end_at, format: :hour_minute}" %>
          • + <% end %> +<% end %> +
        diff --git a/app/views/notifications_mailer/notify_member_reservation_invalidated.html.erb b/app/views/notifications_mailer/notify_member_reservation_invalidated.html.erb new file mode 100644 index 000000000..caa17bc2c --- /dev/null +++ b/app/views/notifications_mailer/notify_member_reservation_invalidated.html.erb @@ -0,0 +1,3 @@ +<%= render 'notifications_mailer/shared/hello', recipient: @recipient %> + +

        <%= t('.body.reservation_invalidated_html', RESERVATION: @attached_object.reservable.name) %>

        diff --git a/app/views/notifications_mailer/notify_member_reservation_validated.html.erb b/app/views/notifications_mailer/notify_member_reservation_validated.html.erb new file mode 100644 index 000000000..635bb1e98 --- /dev/null +++ b/app/views/notifications_mailer/notify_member_reservation_validated.html.erb @@ -0,0 +1,16 @@ +<%= render 'notifications_mailer/shared/hello', recipient: @recipient %> + +

        <%= t('.body.reservation_validated_html', RESERVATION: @attached_object.reservable.name) %>

        + +

        <%= t('.body.your_reserved_slots') %>

        +
          +<% @attached_object.slots.each do |slot| %> + <% if @attached_object.reservable_type == 'Event' %> + <% (slot.start_at.to_date..slot.end_at.to_date).each do |d| %> +
        • <%= "#{I18n.l d, format: :long} #{I18n.l slot.start_at, format: :hour_minute} - #{I18n.l slot.end_at, format: :hour_minute}" %>
          • + <% end %> + <% else %> +
        • <%= "#{I18n.l slot.start_at, format: :long} - #{I18n.l slot.end_at, format: :hour_minute}" %>
          • + <% end %> +<% end %> +
        diff --git a/app/views/notifications_mailer/notify_user_child_is_invalidated.html.erb b/app/views/notifications_mailer/notify_user_child_is_invalidated.html.erb new file mode 100644 index 000000000..3a90e8daa --- /dev/null +++ b/app/views/notifications_mailer/notify_user_child_is_invalidated.html.erb @@ -0,0 +1,5 @@ +<%= render 'notifications_mailer/shared/hello', recipient: @recipient %> + +

        + <%= t('.body.child_invalidated') %> +

        diff --git a/app/views/notifications_mailer/notify_user_child_is_validated.html.erb b/app/views/notifications_mailer/notify_user_child_is_validated.html.erb new file mode 100644 index 000000000..7d0ae40ae --- /dev/null +++ b/app/views/notifications_mailer/notify_user_child_is_validated.html.erb @@ -0,0 +1,5 @@ +<%= render 'notifications_mailer/shared/hello', recipient: @recipient %> + +

        + <%= t('.body.child_validated') %> +

        diff --git a/app/views/notifications_mailer/notify_user_child_supporting_document_refusal.html.erb b/app/views/notifications_mailer/notify_user_child_supporting_document_refusal.html.erb new file mode 100644 index 000000000..7596b4e58 --- /dev/null +++ b/app/views/notifications_mailer/notify_user_child_supporting_document_refusal.html.erb @@ -0,0 +1,16 @@ +<%= render 'notifications_mailer/shared/hello', recipient: @recipient %> + +

        + <%= t('.body.user_child_supporting_document_files_refusal') %> +

        +
          + <% @attached_object.supporting_document_types.each do |type| %> +
        • <%= type.name %>
          • + <% end %> +
        +

        + <%= @attached_object.message %> +

        +

        + <%= t('.body.action') %> +

        diff --git a/app/views/notifications_mailer/notify_user_when_child_age_will_be_18.html.erb b/app/views/notifications_mailer/notify_user_when_child_age_will_be_18.html.erb new file mode 100644 index 000000000..cb845ff68 --- /dev/null +++ b/app/views/notifications_mailer/notify_user_when_child_age_will_be_18.html.erb @@ -0,0 +1,6 @@ +<%= render 'notifications_mailer/shared/hello', recipient: @recipient %> + +<%= t('.body.child_age_will_be_18_years_ago', **{ + NAME: @attached_object.full_name, + DATE: I18n.l(@attached_object.birthday, format: :default), +}) %> diff --git a/app/workers/child_age_worker.rb b/app/workers/child_age_worker.rb new file mode 100644 index 000000000..374b451bf --- /dev/null +++ b/app/workers/child_age_worker.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +# send a notification if child age > 18 years ago +class ChildAgeWorker + include Sidekiq::Worker + + def perform + children = Child.where('birthday = ?', 18.years.ago + 2.days) + children.each do |child| + NotificationCenter.call type: 'notify_user_when_child_age_will_be_18', + receiver: child.user, + attached_object: child + end + end +end diff --git a/config/initializers/notification_types.rb b/config/initializers/notification_types.rb index 395928db5..1f9f81b58 100644 --- a/config/initializers/notification_types.rb +++ b/config/initializers/notification_types.rb @@ -77,5 +77,24 @@ NOTIFICATIONS_TYPES = [ { name: 'notify_admin_low_stock_threshold', category: 'shop', is_configurable: true, roles: ['admin', 'manager'] }, { name: 'notify_admin_training_auto_cancelled', category: 'trainings', is_configurable: true, roles: ['admin', 'manager'] }, { name: 'notify_member_training_auto_cancelled', category: 'trainings', is_configurable: false }, - { name: 'notify_user_supporting_document_reminder', category: 'supporting_documents', is_configurable: false } + { name: 'notify_user_supporting_document_reminder', category: 'supporting_documents', is_configurable: false }, + + { name: 'notify_member_training_authorization_expired', category: 'trainings', is_configurable: false }, + { name: 'notify_member_training_invalidated', category: 'trainings', is_configurable: false }, + { name: 'notify_member_reservation_limit_reached', category: 'agenda', is_configurable: false }, + { name: 'notify_admin_user_child_supporting_document_refusal', category: 'supporting_documents', is_configurable: true, roles: ['admin', 'manager'] }, + { name: 'notify_user_child_supporting_document_refusal', category: 'supporting_documents', is_configurable: false }, + { name: 'notify_admin_child_created', category: 'users_accounts', is_configurable: true, roles: ['admin', 'manager'] }, + { name: 'notify_user_child_is_validated', category: 'users_accounts', is_configurable: false }, + { name: 'notify_user_child_is_invalidated', category: 'users_accounts', is_configurable: false }, + { name: 'notify_admin_user_child_supporting_document_files_updated', category: 'supporting_documents', is_configurable: true, roles: ['admin', 'manager'] }, + { name: 'notify_admin_user_child_supporting_document_files_created', category: 'supporting_documents', is_configurable: true, roles: ['admin', 'manager'] }, + + { name: 'notify_member_reservation_validated', category: 'agenda', is_configurable: false }, + { name: 'notify_admin_reservation_validated', category: 'agenda', is_configurable: true, roles: ['admin', 'manager'] }, + { name: 'notify_member_pre_booked_reservation', category: 'agenda', is_configurable: false }, + { name: 'notify_admin_member_pre_booked_reservation', category: 'agenda', is_configurable: true, roles: ['admin', 'manager'] }, + { name: 'notify_member_reservation_invalidated', category: 'agenda', is_configurable: false }, + { name: 'notify_admin_reservation_invalidated', category: 'agenda', is_configurable: true, roles: ['admin', 'manager'] }, + { name: 'notify_user_when_child_age_will_be_18', category: 'users_accounts', is_configurable: false } ].freeze diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index e8a039903..6c2beef97 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -155,6 +155,14 @@ en: every_week: "Every week" every_month: "Every month" every_year: "Every year" + event_type: "Event type" + event_types: + standard: "Event standard" + nominative: "Event nominative" + family: "Event reserved for members" + 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: "Deadline for pre-registration" plan_form: ACTION_title: "{ACTION, select, create{New} other{Update the}} plan" tab_settings: "Settings" @@ -599,6 +607,13 @@ en: do_you_really_want_to_delete_this_price_category: "Do you really want to delete this price category?" price_category_successfully_deleted: "Price category successfully deleted." price_category_deletion_failed: "Price category deletion failed." + types: "Types" + event_type: + standard: "Standard" + family: "Reserved for members" + nominative: "Nominative" + pre_registration: "Pre-registration" + NUMBER_pre_registered: " {NUMBER} pre-registered" #add a new event events_new: add_an_event: "Add an event" @@ -633,6 +648,40 @@ en: no_reservations_for_now: "No reservation for now." back_to_monitoring: "Back to monitoring" canceled: "Canceled" + date: "Date" + booked_by: "Booked by" + reservations: "Reservations" + status: "Status" + gestion: "Gestion" + validation: "Validation" + event_status: + pre_registered: "Pre-registered" + to_pay: "To pay" + paid: "Paid" + canceled: "Canceled" + present: "Present" + registered: "Registered" + not_validated: "Not validated" + affirmative: "yes" + negative: "no" + validate: "Validate" + pay: "Pay" + validate_the_reservation: "Validate the reservation" + do_you_really_want_to_validate_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to validate this reservation? This apply to ALL booked tickets." + reservation_was_successfully_validated: "Reservation was successfully validated." + validation_failed: "Validation failed." + reservation_was_successfully_invalidated: "Reservation was successfully invalidated." + invalidation_failed: "Invalidation failed." + confirm_payment: "Confirm payment" + confirm_payment_of_html: "{ROLE, select, admin{Cash} other{Pay}}: {AMOUNT}" #(contexte : validate a payment of $20,00) + offer_this_reservation: "I offer this reservation" + i_have_received_the_payment: "I have received the payment" + reservation_was_successfully_paid: "Reservation was successfully paid." + present: "Present" + confirm_present: "Confirm presence" + confirm_present_info: "Confirm the presence of the user for this event" + reservation_was_successfully_present: "The presence of the user was successfully confirmed." + age: "{NUMBER} years old" events_settings: title: "Settings" generic_text_block: "Editorial text block" @@ -1197,6 +1246,14 @@ en: member_filter_not_confirmed: "Unconfirmed" member_filter_inactive_for_3_years: "Inactive for 3 years" member_filter_not_validated: "Not validated" + members_list_item: + item_type: "member" + surname: "Surname" + first_name: "First name" + phone: "Phone" + email: "Email" + group: "Group" + subscription: "Subscription" #add a member members_new: add_a_member: "Add a member" @@ -1244,6 +1301,12 @@ en: validate_member_error: "An unexpected error occurred: unable to validate this member." invalidate_member_error: "An unexpected error occurred: unable to invalidate this member." validate_account: "Validate the account" + child_validation: + validate_child_success: "Child successfully validated" + invalidate_child_success: "Child successfully invalidated" + validate_child_error: "An unexpected error occurred: unable to validate this child." + invalidate_child_error: "An unexpected error occurred: unable to invalidate this child." + validate_child: "Validate the child" supporting_documents_refusal_form: refusal_comment: "Comment" comment_placeholder: "Please type a comment here" @@ -1803,6 +1866,11 @@ en: do_you_really_want_to_delete_this_reservation_context: "Do you really want to delete this context?" unable_to_delete_reservation_context_already_related_to_reservations: "Unable to delete this context because it is already associated to a reservation" unable_to_delete_reservation_context_an_error_occured: "Unable to delete: an error occurred" + family_account: "family account" + family_account_info_html: "The Family account allows your members to add their children under 18 years old to their own account and directly register them for Family events. You can also request supporting documents for each child and validate their account." + enable_family_account: "Enable the Family Account option" + child_validation_required: "the account validation option for children" + child_validation_required_label: "Activate the account validation option for children" overlapping_options: training_reservations: "Trainings" machine_reservations: "Machines" @@ -1900,7 +1968,7 @@ en: no_groups_info: "Supporting documents are necessarily applied to groups.
        If you do not have any group yet, you can create one from the \"Users/Groups\" page (button on the right)." create_groups: "Create groups" supporting_documents_type_title: "Supporting documents requests" - add_type: "New supporting documents request" + add_type: "Add new document" group_name: "Group" name: "Supporting documents" no_types: "You do not have any supporting documents requests.
        Make sure you have created at least one group in order to add a request." diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index d36efb352..19ef5a426 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -155,6 +155,14 @@ fr: every_week: "Chaque semaine" every_month: "Chaque mois" every_year: "Chaque année" + event_type: "Type d'événement" + event_types: + standard: "Evénement standard" + nominative: "Evénement nominatif" + family: "Evénement réservé aux membres" + 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 limite de pré-inscription" plan_form: ACTION_title: "{ACTION, select, create{Nouvelle} other{Mettre à jour la}} formule d'abonnement" tab_settings: "Paramètres" @@ -599,6 +607,13 @@ fr: do_you_really_want_to_delete_this_price_category: "Êtes vous sur de vouloir supprimer cette catégorie tarifaire ?" price_category_successfully_deleted: "Catégorie tarifaire supprimée avec succès." price_category_deletion_failed: "Échec de la suppression de la catégorie tarifaire." + types: 'Types' + event_type: + standard: 'Standard' + family: "Réservé aux membres" + nominative: "Nominatif" + pre_registration: "Pré-inscription" + NUMBER_pre_registered: " {NUMBER} pré-inscrit" #add a new event events_new: add_an_event: "Ajouter un événement" @@ -633,6 +648,40 @@ fr: no_reservations_for_now: "Aucune réservation pour le moment." back_to_monitoring: "Retour au suivi" canceled: "Annulée" + date: "Date" + booked_by: "Réservé par" + reservations: "Réservations" + status: "Statut" + gestion: "Gestion" + validation: "Validation" + event_status: + pre_registered: "Pré-inscrit" + to_pay: "À payer" + paid: "Payé" + canceled: "Annulée" + present: "Présent" + registered: "Inscrit" + not_validated: "Non validée" + affirmative: "Oui" + negative: "Non" + validate: "Valider" + pay: "Payer" + validate_the_reservation: "Valider la réservation" + do_you_really_want_to_validate_this_reservation_this_apply_to_all_booked_tickets: "Êtes vous sur de vouloir valider cette réservation? Ceci s'applique à TOUTES les places réservées." + reservation_was_successfully_validated: "La réservation a bien été validé." + validation_failed: "La validation a échoué." + reservation_was_successfully_invalidated: "La réservation a bien été invalidée." + invalidation_failed: "L'invalidation a échoué." + confirm_payment: "Confirmer le paiement" + confirm_payment_of_html: "{ROLE, select, admin{Encaisser} other{Payer}} : {AMOUNT}" #(contexte : validate a payment of $20,00) + offer_this_reservation: "J'offre cette réservation" + i_have_received_the_payment: "J'ai reçu le paiement" + reservation_was_successfully_paid: "La réservation a bien été payée." + present: "Présenter" + confirm_present: "Confirmer la présence" + confirm_present_info: "Confirmer la présence de l'utilisateur à l'événement" + reservation_was_successfully_present: "La présence a bien été confirmée." + age: "{NUMBER} ans" events_settings: title: "Paramètres" generic_text_block: "Bloc de texte rédactionnel" @@ -1244,6 +1293,12 @@ fr: validate_member_error: "Une erreur inattendue est survenue. Impossible de valider ce compte membre." invalidate_member_error: "Une erreur inattendue est survenue. Impossible d'invalider ce compte membre." validate_account: "Valider le compte" + child_validation: + validate_child_success: "Le compte enfant a bien été validé" + invalidate_child_success: "Le compte enfant a bien été invalidé" + validate_child_error: "Une erreur inattendue est survenue. Impossible de valider ce compte enfant." + invalidate_child_error: "Une erreur inattendue est survenue. Impossible d'invalider ce compte enfant." + validate_child: "Valider le compte enfant" supporting_documents_refusal_form: refusal_comment: "Commentaire" comment_placeholder: "Veuillez saisir un commentaire ici" @@ -1802,6 +1857,15 @@ fr: do_you_really_want_to_delete_this_reservation_context: "Êtes-vous sûr de vouloir supprimer cette nature ?" unable_to_delete_reservation_context_already_related_to_reservations: "Impossible de supprimer ce contexte car il est déjà associé à une réservation" unable_to_delete_reservation_context_an_error_occured: "Impossible de supprimer : une erreur est survenue" + projects_list_member_filter_presence: "Presence of member filter on projects list" + projects_list_date_filters_presence: "Presence of date filters on projects list" + project_categories_filter_placeholder: "Placeholder for categories filter in project gallery" + project_categories_wording: "Wording used to replace \"Categories\" on public pages" + family_account: "Compte famille" + family_account_info_html: "Le compte Famille permet à vos membres d'ajouter leurs enfants de moins de 18 ans sur leur propre compte et de les inscrire directement aux évènements de type Famille. Vous pouvez aussi demander des justificatifs pour chaque enfant et valider leur compte." + enable_family_account: "Activer l'option Compte Famille" + child_validation_required: "l'option de validation des comptes enfants" + child_validation_required_label: "Activer l'option de validation des comptes enfants" overlapping_options: training_reservations: "Formations" machine_reservations: "Machines" diff --git a/config/locales/app.logged.en.yml b/config/locales/app.logged.en.yml index b904d16eb..202b90b56 100644 --- a/config/locales/app.logged.en.yml +++ b/config/locales/app.logged.en.yml @@ -37,6 +37,21 @@ en: edit_profile: "Change my data" after_edition_info_html: "Once your data are up to date, click on the synchronization button below, or disconnect then reconnect for your changes to take effect." sync_profile: "Sync my profile" + event_reservation_item: + event: "Event" + family: "Reserved for members" + nominative: "Nominative" + pre_registration: "Pre-registration" + NUMBER_normal_places_reserved: "{NUMBER} {NUMBER, plural, =0{} =1{normal place reserved} other{normal places reserved}}" + NUMBER_of_NAME_places_reserved: "{NUMBER} {NUMBER, plural, =0{} =1{of {NAME} place reserved} other{of {NAME} places reserved}}" + tracking_your_reservation: "Tracking your reservation" + in_the_process_of_validation: "In the process of validation" + settle_your_payment: "Come to the reception desk to settle" + paid: "Paid" + canceled: "Canceled" + registered: "Registered" + not_validated: "Not validated" + present: "Present" dashboard: #dashboard: public profile profile: @@ -284,6 +299,7 @@ en: app_management: "Concerning app management notifications" notification_form: notify_admin_when_user_is_created: "A user account has been created" + notify_admin_child_created: "A child has been created" notify_admin_when_user_is_imported: "A user account has been imported" notify_admin_profile_complete: "An imported account has completed its profile" notify_admin_user_merged: "An imported account has been merged with an existing account" @@ -291,8 +307,11 @@ en: notify_admin_import_complete: "An import is done" notify_admin_user_group_changed: "A user has changed his group" notify_admin_user_supporting_document_refusal: "A supporting document has been rejected" + notify_admin_user_child_supporting_document_refusal: "A supporting document of child has been rejected" notify_admin_user_supporting_document_files_created: "A user has uploaded a supporting document" notify_admin_user_supporting_document_files_updated: "A user has updated a supporting document" + notify_admin_user_child_supporting_document_files_created: "A child has uploaded a supporting document" + notify_admin_user_child_supporting_document_files_updated: "A child has updated a supporting document" notify_admin_member_create_reservation: "A member books a reservation" notify_admin_slot_is_modified: "A reservation slot has been modified" notify_admin_slot_is_canceled: "A reservation has been cancelled" diff --git a/config/locales/app.logged.fr.yml b/config/locales/app.logged.fr.yml index de8004863..8a861f2fe 100644 --- a/config/locales/app.logged.fr.yml +++ b/config/locales/app.logged.fr.yml @@ -37,6 +37,21 @@ fr: edit_profile: "Modifier mes données" after_edition_info_html: "Une fois que vos données sont à jour, cliquez sur le bouton de synchronisation ci-dessous, ou déconnectez-vous puis reconnectez-vous pour que vos changements prennent effet." sync_profile: "Synchroniser mon profil" + event_reservation_item: + event: 'Événement' + family: 'Réservé aux membres' + nominative: 'Nominatif' + pre_registration: 'Pré-inscription' + NUMBER_normal_places_reserved: "{NUMBER} {NUMBER, plural, =0{} =1{place normale réservée} other{places normales réservées}}" + NUMBER_of_NAME_places_reserved: "{NUMBER} {NUMBER, plural, =0{} =1{place {NAME} réservée} other{places {NAME} réservées}}" + tracking_your_reservation: "Suivi de votre réservation" + in_the_process_of_validation: "En cours de validation" + settle_your_payment: "Venez régler à l'accueil" + paid: "Payé" + canceled: "Annulé" + registered: "Inscrit" + not_validated: "Non validé" + present: "Présent" dashboard: #dashboard: public profile profile: @@ -284,6 +299,7 @@ fr: app_management: "Au sujet de la gestion de l'application" notification_form: notify_admin_when_user_is_created: "Un compte utilisateur a été créé" + notify_admin_child_created: "Un compte enfant a été créé" notify_admin_when_user_is_imported: "Un compte utilisateur a été importé" notify_admin_profile_complete: "Un compte importé a complété ses informations" notify_admin_user_merged: "Un compte importé a été fusionné avec un compte existant" @@ -291,8 +307,11 @@ fr: notify_admin_import_complete: "Un import est terminé" notify_admin_user_group_changed: "Un utilisateur a changé de groupe" notify_admin_user_supporting_document_refusal: "Un justificatif a été refusé" + notify_admin_user_child_supporting_document_refusal: "Un justificatif de l'enfant a été refusé" notify_admin_user_supporting_document_files_created: "Un utilisateur a téléversé un justificatif" notify_admin_user_supporting_document_files_updated: "Un utilisateur a mis à jour un justificatif" + notify_admin_user_child_supporting_document_files_created: "Un enfant a téléversé un justificatif" + notify_admin_user_child_supporting_document_files_updated: "Un enfant a mis à jour un justificatif" notify_admin_member_create_reservation: "Un membre fait une réservation" notify_admin_slot_is_modified: "Un créneau de réservation a été modifié" notify_admin_slot_is_canceled: "Une réservation a été annulée" diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index 31f8e7659..f14ace6e9 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -14,6 +14,7 @@ en: #dashboard sections dashboard: "Dashboard" my_profile: "My Profile" + my_children: "My Children" my_settings: "My Settings" my_supporting_documents_files: "My supporting documents" my_projects: "My Projects" @@ -317,6 +318,9 @@ en: event_description: "Event description" downloadable_documents: "Downloadable documents" information_and_booking: "Information and booking" + event_type: + family: "Event reserved for members" + nominative: "Nominative event" dates: "Dates" beginning: "Beginning:" ending: "Ending:" @@ -332,9 +336,12 @@ en: ticket: "{NUMBER, plural, one{ticket} other{tickets}}" make_a_gift_of_this_reservation: "Make a gift of this reservation" thank_you_your_payment_has_been_successfully_registered: "Thank you. Your payment has been successfully registered!" + thank_you_your_pre_registration_has_been_successfully_saved: "Thank you. Your pre-registration has been successfully saved!" you_can_find_your_reservation_s_details_on_your_: "You can find your reservation's details on your" + informed_by_email_your_pre_registration: "You will be kept informed by email of the progress made regarding your pre-registration." dashboard: "dashboard" you_booked_DATE: "You booked ({DATE}):" + you_pre_booked_DATE: "Your pre-registration ({DATE}):" canceled_reservation_SEATS: "Reservation canceled ({SEATS} seats)" book: "Book" confirm_and_pay: "Confirm and pay" @@ -362,6 +369,10 @@ en: view_event_list: "View events to come" share_on_facebook: "Share on Facebook" share_on_twitter: "Share on Twitter" + last_name_and_first_name: "Last name and first name" + pre_book: "Pre-book" + pre_registration_end_date: "Deadline for pre-registration" + pre_registration: "Pre-registration" #public calendar calendar: calendar: "Calendar" @@ -481,6 +492,35 @@ en: member_select: select_a_member: "Select a member" start_typing: "Start typing..." + children_dashboard: + heading: "Children" + member_heading: "My Children" + add_child: "Add a child" + child_modal: + edit_child: "Edit child" + new_child: "New child" + child_form: + child_form_info: "Only children under 18 years old can be added to your Family account. Supporting documents may be requested to validate your child's account and allow you to register them for events." + first_name: "First name" + last_name: "Last name" + birthday: "Birthday" + email: "Email" + phone: "Phone" + save: "Save" + supporting_documents: "Supporting documents" + to_complete: "To complete" + refuse_documents_info: "You can refuse a selection of documents by clicking on the following button." + refuse_documents: "Refuse documents" + child_item: + first_name: "Child first name" + last_name: "Child last name" + birthday: "Birthday" + deleted: "The child has been deleted." + unable_to_delete: "Unable to delete the child." + delete_child_modal: + confirmation_required: "Confirmation required" + confirm: "Confirm" + confirm_delete_child: "Do you really want to remove this child?" tour: conclusion: title: "Thank you for your attention" diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 605236d83..ea7ca1246 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -14,6 +14,7 @@ fr: #dashboard sections dashboard: "Tableau de bord" my_profile: "Mon profil" + my_children: "Mes enfants" my_settings: "Mes paramètres" my_supporting_documents_files: "Mes justificatifs" my_projects: "Mes projets" @@ -317,6 +318,9 @@ fr: event_description: "Description de l’événement" downloadable_documents: "Documents à télécharger" information_and_booking: "Informations et réservation" + event_type: + family: "Evénement réservé aux membres" + nominative: "Evénement nominatif" dates: "Dates" beginning: "Début :" ending: "Fin :" @@ -332,9 +336,12 @@ fr: ticket: "{NUMBER, plural, =0{place} one{place} other{places}}" make_a_gift_of_this_reservation: "Offrir cette réservation" thank_you_your_payment_has_been_successfully_registered: "Merci. Votre paiement a bien été pris en compte !" + thank_you_your_pre_registration_has_been_successfully_saved: "Merci. Votre demande a bien été prise en compte !" you_can_find_your_reservation_s_details_on_your_: "Vous pouvez retrouver le détail de votre réservation sur votre" + informed_by_email_your_pre_registration: "Vous serez tenu informé par email de la suite donnée à votre pré-inscription" dashboard: "tableau de bord" you_booked_DATE: "Vous avez réservé ({DATE}) :" + you_pre_booked_DATE: "Votre pré-inscription ({DATE}) :" canceled_reservation_SEATS: "Réservation annulée ({SEATS} places)" book: "Réserver" confirm_and_pay: "Valider et payer" @@ -362,6 +369,10 @@ fr: view_event_list: "Voir les événements à venir" share_on_facebook: "Partager sur Facebook" share_on_twitter: "Partager sur Twitter" + last_name_and_first_name: "Nom et prénom" + pre_book: "Pré-inscrire" + pre_registration_end_date: "Date limite de pré-inscription" + pre_registration: "Pré-inscription" #public calendar calendar: calendar: "Calendrier" @@ -481,6 +492,35 @@ fr: member_select: select_a_member: "Sélectionnez un membre" start_typing: "Commencez à écrire..." + children_dashboard: + heading: "Enfants" + member_heading: "Mes enfants" + add_child: "Ajouter un enfant" + child_modal: + edit_child: "Modifier un enfant" + new_child: "Ajouter un enfant" + child_form: + child_form_info: "Seuls les enfants de moins de 18 ans peuvent être ajoutés au sein de votre compte Famille. Des justificatifs peuvent être demandés afin de valider le compte de votre enfant et de vous permettre ensuite de l'inscrire à des évènements." + first_name: "Prénom" + last_name: "Nom" + birthday: "Date de naissance" + email: "Courriel" + phone: "Téléphone" + save: "Enregistrer" + supporting_documents: "Documents justificatifs" + to_complete: "À compléter" + refuse_documents: "Refuser les documents" + refuse_documents_info: "Vous pouvez refuser une sélection de documents en cliquant sur le bouton suivant." + child_item: + first_name: "Prénom de l'enfant" + last_name: "Nom de l'enfant" + birthday: "Date de naissance" + deleted: "L'enfant a bien été supprimée." + unable_to_delete: "Impossible de supprimer la demande de l'enfant." + delete_child_modal: + confirmation_required: "Confirmation requise" + confirm: "Valider" + confirm_delete_child: "Êtes-vous sûr de vouloir supprimer la demande de cet enfant ?" tour: conclusion: title: "Merci de votre attention" diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index 842cc8a13..f9ec42c3a 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -168,7 +168,7 @@ en: member_select: select_a_member: "Select a member" start_typing: "Start typing..." - member_not_validated: "Warning:
        The member was not validated." + member_not_validated: "This member has not yet been validated." #payment modal abstract_payment_modal: online_payment: "Online payment" @@ -198,6 +198,7 @@ en: group_is_required: "Group is required." trainings: "Trainings" tags: "Tags" + children: "Children" #machine/training slot modification modal confirm_modify_slot_modal: change_the_slot: "Change the slot" @@ -373,7 +374,9 @@ en: user_validation_required_alert: "Warning!
        Your administrator must validate your account. Then, you'll then be able to access all the booking features." select_the_reservation_context: "Select the context of the reservation" please_select_a_reservation_context: "Please select the context of the reservation first" - #feature-tour modal + child_validation_required_alert: "Your administrator must validate your child account. Then, you'll then be able to book the event." + child_birthday_must_be_under_18_years_ago_alert: "Your child must be under 18. Then, you'll then be able to book the event." + # feature-tour modal tour: previous: "Previous" next: "Next" @@ -446,6 +449,7 @@ en: select_all: "Select all" unselect_all: "Unselect all" form_file_upload: + placeholder: "Add a file" browse: "Browse" edit: "Edit" form_image_upload: diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 7a05f67e0..a9c433e6c 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -198,6 +198,7 @@ fr: group_is_required: "Le groupe est requis." trainings: "Formations" tags: "Étiquettes" + children: "Enfants" #machine/training slot modification modal confirm_modify_slot_modal: change_the_slot: "Modifier le créneau" @@ -373,6 +374,8 @@ fr: user_validation_required_alert: "Attention !
        Votre administrateur doit valider votre compte. Vous pourrez alors accéder à l'ensemble des fonctionnalités de réservation." select_the_reservation_context: "Sélectionnez la nature de la réservation" please_select_a_reservation_context: "Veuillez d'abord sélectionner la nature de la réservation" + child_validation_required_alert: "Attention !
        Votre administrateur doit valider votre compte enfant. Vous pourrez alors réserver l'événement." + child_birthday_must_be_under_18_years_ago_alert: "Attention !
        La date de naissance de l'enfant doit être inférieure à 18 ans. Vous pourrez alors réserver l'événement." #feature-tour modal tour: previous: "Précédent" diff --git a/config/locales/en.yml b/config/locales/en.yml index a77245d93..f69febae3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -49,6 +49,7 @@ en: gateway_amount_too_large: "Payments above %{AMOUNT} are not supported. Please order directly at the reception." product_in_use: "This product have already been ordered" slug_already_used: "is already used" + birthday_less_than_18_years_ago: "Birthday must be under 18 years ago" coupon: code_format_error: "only caps letters, numbers, and dashes are allowed" apipie: @@ -286,6 +287,8 @@ en: an_abuse_was_reported_on_TYPE_ID_NAME_html: "An abuse was reported on %{TYPE} %{ID}: %{NAME}." notify_admin_member_create_reservation: a_RESERVABLE_reservation_was_made_by_USER_html: "A %{RESERVABLE} reservation was made by %{USER}." + notify_admin_member_pre_booked_reservation: + a_RESERVABLE_reservation_was_made_by_USER_html: "A %{RESERVABLE} pre-registration was made by %{USER}." notify_admin_profile_complete: account_imported_from_PROVIDER_UID_has_completed_its_information_html: "Account imported from %{PROVIDER} (%{UID}) has completed its information." notify_admin_slot_is_canceled: @@ -314,10 +317,14 @@ en: project_NAME_has_been_published_html: "Project %{NAME} has been published." notify_admin_when_user_is_created: a_new_user_account_has_been_created_NAME_EMAIL_html: "A new user account has been created: %{NAME} <%{EMAIL}>." + notify_admin_child_created: + a_new_child_has_been_created_NAME_html: "A new child has been created: %{NAME}." notify_admin_when_user_is_imported: a_new_user_account_has_been_imported_from_PROVIDER_UID_html: "A new user account has been imported from: %{PROVIDER} (%{UID})." notify_member_create_reservation: your_reservation_RESERVABLE_was_successfully_saved_html: "Your reservation %{RESERVABLE} was successfully saved." + notify_member_pre_booked_reservation: + your_reservation_RESERVABLE_was_successfully_saved_html: "Your pre-registration %{RESERVABLE} was successfully saved." notify_member_reservation_reminder: reminder_you_have_a_reservation_RESERVABLE_to_be_held_on_DATE_html: "Reminder: You have a reservation %{RESERVABLE} to be held on %{DATE}" notify_member_slot_is_canceled: @@ -441,22 +448,44 @@ en: supporting_document_files_uploaded: "Supporting document uploaded by member %{NAME}." notify_admin_user_supporting_document_files_updated: supporting_document_files_uploaded: "Supporting document changed by member %{NAME}." + notify_admin_user_child_supporting_document_files_created: + supporting_document_files_uploaded: "Child's %{NAME} supporting document uploaded." + notify_admin_user_child_supporting_document_files_updated: + supporting_document_files_uploaded: "Supporting document changed by child %{NAME}." notify_user_is_validated: account_validated: "Your account is valid." notify_user_is_invalidated: account_invalidated: "Your account is invalid." + notify_user_child_is_validated: + child_validated: "Your account child is valid." + notify_user_child_is_invalidated: + child_invalidated: "Your account child is invalid." notify_user_supporting_document_refusal: refusal: "Your supporting documents were refused" notify_user_supporting_document_reminder: reminder_message: "This is a reminder for you to upload your supporting documents." notify_admin_user_supporting_document_refusal: refusal: "Member's supporting document %{NAME} was refused." + notify_user_child_supporting_document_refusal: + refusal: "Your child's supporting documents were refused" + notify_admin_user_child_supporting_document_refusal: + refusal: "Child's supporting document %{NAME} was refused." notify_user_order_is_ready: order_ready: "Your command %{REFERENCE} is ready" notify_user_order_is_canceled: order_canceled: "Your command %{REFERENCE} is canceled" notify_user_order_is_refunded: order_refunded: "Your command %{REFERENCE} is refunded" + notify_member_reservation_validated: + your_reservation_RESERVABLE_was_validated_html: "Your reservation %{RESERVABLE} was successfully validated." + notify_admin_reservation_validated: + a_RESERVABLE_reservation_was_validated_html: "A %{RESERVABLE} reservation of %{USER} was validated." + notify_member_reservation_invalidated: + your_reservation_RESERVABLE_was_invalidated_html: "Your pre-registration of %{RESERVABLE} wasn't validated." + notify_admin_reservation_invalidated: + a_RESERVABLE_reservation_was_invalidated_html: "A %{RESERVABLE} pre-registration of %{USER} was invalidated." + notify_user_when_child_age_will_be_18: + child_age_will_be_18_years_ago: "Your child %{NAME} will turn 18 on %{DATE}, at which point they will be automatically detached from your Family account. They will need to create their own account in order to make reservations." #statistics tools for admins statistics: subscriptions: "Subscriptions" @@ -712,6 +741,7 @@ en: project_categories_filter_placeholder: "Placeholder for categories filter in project gallery" project_categories_wording: "Wording used to replace \"Categories\" on public pages" reservation_context_feature: "Force member to select the nature of his reservation when reserving" + family_account: "Family account" #statuses of projects statuses: new: "New" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 1fd3bed8d..8c8ad30fd 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -49,6 +49,7 @@ fr: gateway_amount_too_large: "Les paiements supérieurs à %{AMOUNT} ne sont pas pris en charge. Merci de passer commande directement à l'accueil." product_in_use: "Ce produit a déjà été commandé" slug_already_used: "est déjà utilisée" + birthday_less_than_18_years_ago: "l'age devez avoir au moins 18 ans." coupon: code_format_error: "seules les majuscules, chiffres et tirets sont autorisés" apipie: @@ -286,6 +287,8 @@ fr: an_abuse_was_reported_on_TYPE_ID_NAME_html: "Un abus a été signalé sur %{TYPE} %{ID} : %{NAME}." notify_admin_member_create_reservation: a_RESERVABLE_reservation_was_made_by_USER_html: "Une réservation %{RESERVABLE} a été effectuée par %{USER}." + notify_admin_member_pre_booked_reservation: + a_RESERVABLE_reservation_was_made_by_USER_html: "Une pre-inscription %{RESERVABLE} a été effectuée par %{USER}." notify_admin_profile_complete: account_imported_from_PROVIDER_UID_has_completed_its_information_html: "Le compte importé depuis %{PROVIDER} (%{UID}) a complété ses informations." notify_admin_slot_is_canceled: @@ -314,10 +317,14 @@ fr: project_NAME_has_been_published_html: "Le projet %{NAME} vient d'être publié." notify_admin_when_user_is_created: a_new_user_account_has_been_created_NAME_EMAIL_html: "Un nouveau compte utilisateur vient d'être créé : %{NAME} <%{EMAIL}>." + notify_admin_child_created: + a_new_child_has_been_created_NAME_html: "Un nouvel enfant vient d'être créé : %{NAME}." notify_admin_when_user_is_imported: a_new_user_account_has_been_imported_from_PROVIDER_UID_html: "Un nouveau compte utilisateur vient d'être importé depuis : %{PROVIDER} (%{UID})." notify_member_create_reservation: your_reservation_RESERVABLE_was_successfully_saved_html: "Votre réservation %{RESERVABLE} a bien été enregistrée." + notify_member_pre_booked_reservation: + your_reservation_RESERVABLE_was_successfully_saved_html: "Votre pré-inscription %{RESERVABLE} a bien été prise en compte." notify_member_reservation_reminder: reminder_you_have_a_reservation_RESERVABLE_to_be_held_on_DATE_html: "Rappel : Vous avez une réservation %{RESERVABLE} qui aura lieu le %{DATE}" notify_member_slot_is_canceled: @@ -441,22 +448,44 @@ fr: supporting_document_files_uploaded: "Le membre %{NAME} a téléversé un nouveau justificatif." notify_admin_user_supporting_document_files_updated: supporting_document_files_uploaded: "Le membre %{NAME} a modifié un justificatif." + notify_admin_user_child_supporting_document_files_created: + supporting_document_files_uploaded: "L'enfant %{NAME} a téléversé un nouveau justificatif." + notify_admin_user_child_supporting_document_files_updated: + supporting_document_files_uploaded: "L'enfant %{NAME} a modifié un justificatif." notify_user_is_validated: account_validated: "Votre compte est valide." notify_user_is_invalidated: account_invalidated: "Votre compte est invalide." + notify_user_child_is_validated: + child_validated: "Votre compte enfant est valide." + notify_user_child_is_invalidated: + child_invalidated: "Votre compte enfant est invalide." notify_user_supporting_document_refusal: refusal: "Vos pièces justificatives ont été refusées" notify_user_supporting_document_reminder: reminder_message: "Ceci est un rappel pour vous demander de télécharger vos documents justificatifs." notify_admin_user_supporting_document_refusal: refusal: "Le justificatif du membre %{NAME} a été refusé." + notify_user_child_supporting_document_refusal: + refusal: "Vos pièces justificatives de l'enfant ont été refusées" + notify_admin_user_child_supporting_document_refusal: + refusal: "Le justificatif de l'enfant %{NAME} a été refusé." notify_user_order_is_ready: order_ready: "Votre commande %{REFERENCE} est prête" notify_user_order_is_canceled: order_canceled: "Votre commande %{REFERENCE} est annulée" notify_user_order_is_refunded: order_refunded: "Votre commande %{REFERENCE} est remboursée" + notify_member_reservation_validated: + your_reservation_RESERVABLE_was_validated_html: "Votre réservation de %{RESERVABLE} a été validée." + notify_admin_reservation_validated: + a_RESERVABLE_reservation_was_validated_html: "La réservation de %{RESERVABLE} de %{NAME} a été validée." + notify_member_reservation_invalidated: + your_reservation_RESERVABLE_was_invalidated_html: "Votre demande de pré-inscription de %{RESERVABLE} n'a pas été validée." + notify_admin_reservation_invalidated: + a_RESERVABLE_reservation_was_invalidated_html: "La réservation de %{RESERVABLE} de %{NAME} a été invalidée." + notify_user_when_child_age_will_be_18: + child_age_will_be_18_years_ago: "Votre enfant %{NAME} va avoir 18ans, le %{DATE}, date à laquelle il sera automatiquement détaché de votre compte Famille. Il devra se créer son propre compte pour effectuer ses réservations." #statistics tools for admins statistics: subscriptions: "Abonnements" diff --git a/config/locales/mails.en.yml b/config/locales/mails.en.yml index ee299f0ab..5a66d9098 100644 --- a/config/locales/mails.en.yml +++ b/config/locales/mails.en.yml @@ -78,6 +78,11 @@ en: body: reservation_saved_html: "You reservation %{RESERVATION} has been successfully saved" your_reserved_slots: "Your reserved slots are:" + notify_member_pre_booked_reservation: + subject: "Your pre-registration has been successfully saved" + body: + reservation_saved_html: "You pre-registration %{RESERVATION} has been successfully saved" + your_reserved_slots: "Your pre-booked slots are:" notify_member_subscribed_plan_is_changed: subject: "Your subscription has been updated" body: @@ -87,6 +92,11 @@ en: body: member_reserved_html: "User %{NAME} has reserved %{RESERVABLE}." reserved_slots: "Reserved slots are:" + notify_admin_member_pre_booked_reservation: + subject: "New pre-registration" + body: + member_reserved_html: "User %{NAME} has pre-reserved %{RESERVABLE}." + reserved_slots: "Pre-reserved slots are:" notify_member_slot_is_modified: subject: "Your reservation slot has been successfully changed" body: @@ -104,6 +114,10 @@ en: new_account_created: "A new user account has been created on the website:" user_of_group_html: "The user has registered in the group %{GROUP}" account_for_organization: "This account manage an organization:" + notify_admin_child_created: + subject: "A user's child has been created" + body: + new_child_created: "A new user's child has been created on the website" notify_admin_subscribed_plan: subject: "A subscription has been purchased" body: @@ -389,6 +403,16 @@ en: body: user_update_supporting_document_file: "Member %{NAME} has modified the supporting documents below:" validate_user: "Please validate this account" + notify_admin_user_child_supporting_document_files_created: + subject: "Supporting documents of child uploaded by a member" + body: + supporting_document_files_uploaded_below: "Child %{NAME} has uploaded the following supporting documents:" + validate_child: "Please validate this child account" + notify_admin_user_child_supporting_document_files_updated: + subject: "Child's supporting documents have changed" + body: + child_update_supporting_document_file: "Child %{NAME} has modified the supporting documents below:" + validate_child: "Please validate this child account" notify_user_is_validated: subject: "Account validated" body: @@ -397,6 +421,14 @@ en: subject: "Account invalidated" body: account_invalidated: "Your account was invalidated. You won't be able to book anymore, until your account is validated again." + notify_user_child_is_validated: + subject: "Child account validated" + body: + child_validated: "Your child account was validated. Now, you have access to event booking features." + notify_user_child_is_invalidated: + subject: "Child account invalidated" + body: + account_invalidated: "Your child account was invalidated. You won't be able to book event, until your child account is validated again." notify_user_supporting_document_refusal: subject: "Your supporting documents were refused" body: @@ -410,6 +442,15 @@ en: subject: "A member's supporting documents were refused" body: user_supporting_document_files_refusal: "Member %{NAME}'s supporting documents were rejected by %{OPERATOR}:" + notify_user_child_supporting_document_refusal: + subject: "Your child's supporting documents were refused" + body: + user_child_supporting_document_files_refusal: "Your supporting documents were refused:" + action: "Please re-upload some new supporting documents." + notify_admin_user_child_supporting_document_refusal: + subject: "A child's supporting documents were refused" + body: + user_child_supporting_document_files_refusal: "Child %{NAME}'s supporting documents were rejected by %{OPERATOR}:" shared: hello: "Hello %{user_name}" notify_user_order_is_ready: @@ -424,3 +465,25 @@ en: subject: "Your command was refunded" body: notify_user_order_is_refunded: "Your command %{REFERENCE} was refunded." + notify_member_reservation_validated: + subject: "Your reservation was validated" + body: + reservation_validated_html: "%{RESERVABLE} was validated." + your_reserved_slots: "Your reserved slots are:" + notify_admin_reservation_validated: + subject: "Pre-registration was validated" + body: + reservation_validated_html: "%{RESERVABLE} of %{NAME} was validated." + reserved_slots: "Reserved slots are:" + notify_member_reservation_invalidated: + subject: "Your pre-registration wasn't validated" + body: + reservation_invalidated_html: "%{RESERVABLE} wasn't validated." + notify_admin_reservation_invalidated: + subject: "Pre-registration wasn't validated" + body: + reservation_invalidated_html: "%{RESERVABLE} of %{NAME} wasn't validated." + notify_user_when_child_age_will_be_18: + subject: "Your child will be 18 years old" + body: + child_age_will_be_18_years_ago: "Your child %{NAME} will turn 18 on %{DATE}, at which point they will be automatically detached from your Family account. They will need to create their own account in order to make reservations." diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml index 47cd1bd75..e4f2ef4bf 100644 --- a/config/locales/mails.fr.yml +++ b/config/locales/mails.fr.yml @@ -78,6 +78,11 @@ fr: body: reservation_saved_html: "Votre réservation %{RESERVATION} a bien été enregistrée." your_reserved_slots: "Les créneaux que vous avez réservés sont :" + notify_member_pre_booked_reservation: + subject: "Votre pré-inscription a bien été prise en compte" + body: + reservation_saved_html: "Votre réservation %{RESERVATION} a bien été prise en compte." + your_reserved_slots: "Les créneaux que vous avez pré-inscrit sont :" notify_member_subscribed_plan_is_changed: subject: "Votre abonnement a été mis à jour" body: @@ -87,6 +92,11 @@ fr: body: member_reserved_html: "Le membre %{NAME} a réservé %{RESERVABLE}." reserved_slots: "Les créneaux réservés sont :" + notify_admin_member_pre_booked_reservation: + subject: "Nouvelle pre-inscription" + body: + member_reserved_html: "Le membre %{NAME} a pre-inscrit %{RESERVABLE}." + reserved_slots: "Les créneaux pre-inscrit sont :" notify_member_slot_is_modified: subject: "Votre créneau de réservation a bien été modifié" body: @@ -104,6 +114,10 @@ fr: new_account_created: "Un nouveau compte utilisateur vient d'être créé sur la plateforme :" user_of_group_html: "L'utilisateur s'est inscrit dans le groupe %{GROUP}" account_for_organization: "Ce compte gère une structure :" + notify_admin_child_created: + subject: "Un enfant a été créé" + body: + new_child_created: "Un nouveau enfant vient d'être créé sur la plateforme" notify_admin_subscribed_plan: subject: "Un abonnement a été souscrit" body: @@ -389,6 +403,16 @@ fr: body: user_update_supporting_document_file: "Le membre %{NAME} a modifié le justificatif ci-dessous :" validate_user: "Veuillez valider son compte" + notify_admin_user_child_supporting_document_files_created: + subject: "Justificatif de l'enfant téléversé par un membre" + body: + supporting_document_files_uploaded_below: "L'enfant %{NAME} a téléversé le justificatif suivant :" + validate_child: "Veuillez valider son compte enfant" + notify_admin_user_child_supporting_document_files_updated: + subject: "Le justificatif d'un enfant a changé" + body: + child_update_supporting_document_file: "L'enfant %{NAME} a modifié le justificatif ci-dessous :" + validate_child: "Veuillez valider son compte enfant" notify_user_is_validated: subject: "Compte validé" body: @@ -397,6 +421,14 @@ fr: subject: "Compte invalidé" body: account_invalidated: "Votre compte a été invalidé. Vous ne pourrez plus réserver, jusqu'à ce que votre compte soit à nouveau validé." + notify_user_child_is_validated: + subject: "Compte enfant validé" + body: + account_validated: "Votre compte enfant a été validé. Vous avez maintenant accès aux fonctionnalités de réservation de l'événement." + notify_user_child_is_invalidated: + subject: "Compte enfant invalidé" + body: + account_invalidated: "Votre compte enfant a été invalidé. Vous ne pourrez plus réserver l'événement, jusqu'à ce que votre compte enfant soit à nouveau validé." notify_user_supporting_document_refusal: subject: "Vos pièces justificatives ont été refusées" body: @@ -410,6 +442,15 @@ fr: subject: "Les justificatifs d'un membre ont été refusés" body: user_supporting_document_files_refusal: "Le justificatif du membre %{NAME} a été refusé par %{OPERATOR} :" + notify_user_child_supporting_document_refusal: + subject: "Vos pièces justificatives de l'enfant ont été refusées" + body: + user_child_supporting_document_files_refusal: "Vos pièces justificatives ont été refusées :" + action: "Veuillez téléverser de nouvelles pièces justificatives." + notify_admin_user_child_supporting_document_refusal: + subject: "Les justificatifs d'un enfant ont été refusés" + body: + user_child_supporting_document_files_refusal: "Le justificatif de l'enfant %{NAME} a été refusé par %{OPERATOR} :" shared: hello: "Bonjour %{user_name}" notify_user_order_is_ready: @@ -424,3 +465,25 @@ fr: subject: "Votre commande est remboursée" body: notify_user_order_is_refunded: "Votre commande %{REFERENCE} est remboursée :" + notify_member_reservation_validated: + subject: "Votre réservation a bien été validé" + body: + reservation_validated_html: "Votre réservation %{RESERVATION} a bien été validé." + your_reserved_slots: "Les créneaux que vous avez réservés sont :" + notify_admin_reservation_validated: + subject: "Réservation a bien été validé" + body: + reservation_validated_html: "%{RESERVABLE} du membre %{NAME} a bien été validé." + reserved_slots: "Les créneaux réservés sont :" + notify_member_reservation_invalidated: + subject: "Votre demande de pré-inscription n'a pas été validée" + body: + reservation_invalidated_html: "Votre réservation %{RESERVATION} n'a pas été validée." + notify_admin_reservation_invalidated: + subject: "Demande de pré-inscription n'a pas été validée" + body: + reservation_invalidated_html: "%{RESERVABLE} du membre %{NAME} n'a pas été validée." + notify_user_when_child_age_will_be_18: + subject: "Votre enfant va avoir 18ans" + body: + child_age_will_be_18_years_ago: "Votre enfant %{NAME} va avoir 18ans, le %{DATE}, date à laquelle il sera automatiquement détaché de votre compte Famille. Il devra se créer son propre compte pour effectuer ses réservations." diff --git a/config/routes.rb b/config/routes.rb index 646a021b1..888a9ce44 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -68,7 +68,9 @@ Rails.application.routes.draw do patch ':id/update_role', action: 'update_role', on: :collection patch ':id/validate', action: 'validate', on: :collection end - resources :reservations, only: %i[show index update] + resources :reservations, only: %i[show index update] do + post :confirm_payment, on: :collection + end resources :notifications, only: %i[index show update] do match :update_all, path: '/', via: %i[put patch], on: :collection get 'polling', action: 'polling', on: :collection @@ -123,6 +125,8 @@ Rails.application.routes.draw do end resources :slots_reservations, only: [:update] do put 'cancel', on: :member + put 'validate', on: :member + put 'invalidate', on: :member end resources :events do @@ -185,6 +189,10 @@ Rails.application.routes.draw do get 'withdrawal_instructions', on: :member end + resources :children do + patch ':id/validate', action: 'validate', on: :collection + end + # for admin resources :trainings do get :availabilities, on: :member diff --git a/config/schedule.yml b/config/schedule.yml index 953a374e5..988dcd45d 100644 --- a/config/schedule.yml +++ b/config/schedule.yml @@ -65,6 +65,10 @@ auto_cancel_authorizations: supporting_documents_reminder_worker: cron: "0 8 * * *" # every day, at 8 class: SupportingDocumentsReminderWorker + +child_age_will_be_18: + cron: "0 0 0 * * *" # every day, at midnight + class: ChildAgeWorker queue: default <%= PluginRegistry.insert_code('yml.schedule') %> diff --git a/db/migrate/20230331132506_create_children.rb b/db/migrate/20230331132506_create_children.rb new file mode 100644 index 000000000..45f536fea --- /dev/null +++ b/db/migrate/20230331132506_create_children.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +# Child is a modal for a child of a user +class CreateChildren < ActiveRecord::Migration[5.2] + def change + create_table :children do |t| + t.belongs_to :user, foreign_key: true + t.string :first_name + t.string :last_name + t.date :birthday + t.string :phone + t.string :email + + t.timestamps + end + end +end diff --git a/db/migrate/20230509161557_create_booking_users.rb b/db/migrate/20230509161557_create_booking_users.rb new file mode 100644 index 000000000..f1ba65728 --- /dev/null +++ b/db/migrate/20230509161557_create_booking_users.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +# create booking_users table +class CreateBookingUsers < ActiveRecord::Migration[7.0] + def change + create_table :booking_users do |t| + t.string :name + t.belongs_to :reservation, foreign_key: true + t.references :booked, polymorphic: true + t.references :event_price_category, foreign_key: true + + t.timestamps + end + end +end diff --git a/db/migrate/20230510141305_create_cart_item_event_reservation_booking_users.rb b/db/migrate/20230510141305_create_cart_item_event_reservation_booking_users.rb new file mode 100644 index 000000000..e5d1a3465 --- /dev/null +++ b/db/migrate/20230510141305_create_cart_item_event_reservation_booking_users.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +# A relation table between a pending event reservation and reservation users for this event +class CreateCartItemEventReservationBookingUsers < ActiveRecord::Migration[7.0] + def change + create_table :cart_item_event_reservation_booking_users do |t| + t.string :name + t.belongs_to :cart_item_event_reservation, foreign_key: true, + index: { name: 'index_cart_item_booking_users_on_cart_item_event_reservation' } + t.references :event_price_category, foreign_key: true, index: { name: 'index_cart_item_booking_users_on_event_price_category' } + t.references :booked, polymorphic: true + + t.timestamps + end + end +end diff --git a/db/migrate/20230511081018_add_event_type_to_event.rb b/db/migrate/20230511081018_add_event_type_to_event.rb new file mode 100644 index 000000000..4f1f832a9 --- /dev/null +++ b/db/migrate/20230511081018_add_event_type_to_event.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +# Add event_type to event model, to be able to create standard/nominative/family events +class AddEventTypeToEvent < ActiveRecord::Migration[7.0] + def change + add_column :events, :event_type, :string, default: 'standard' + Event.reset_column_information + Event.update_all(event_type: 'standard') + end +end diff --git a/db/migrate/20230524080448_add_ducument_type_to_supporting_document_type.rb b/db/migrate/20230524080448_add_ducument_type_to_supporting_document_type.rb new file mode 100644 index 000000000..f835e5646 --- /dev/null +++ b/db/migrate/20230524080448_add_ducument_type_to_supporting_document_type.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +# add document_type to supporting_document_type +class AddDucumentTypeToSupportingDocumentType < ActiveRecord::Migration[7.0] + def change + add_column :supporting_document_types, :document_type, :string, default: 'User' + end +end diff --git a/db/migrate/20230524083558_change_user_id_to_supportable_from_supporting_document_file.rb b/db/migrate/20230524083558_change_user_id_to_supportable_from_supporting_document_file.rb new file mode 100644 index 000000000..59253357b --- /dev/null +++ b/db/migrate/20230524083558_change_user_id_to_supportable_from_supporting_document_file.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +# change user_id to supportable from supporting_document_file +class ChangeUserIdToSupportableFromSupportingDocumentFile < ActiveRecord::Migration[7.0] + def change + rename_column :supporting_document_files, :user_id, :supportable_id + add_column :supporting_document_files, :supportable_type, :string, default: 'User' + end +end diff --git a/db/migrate/20230524110215_change_user_id_to_supportable_from_supporting_document_refusal.rb b/db/migrate/20230524110215_change_user_id_to_supportable_from_supporting_document_refusal.rb new file mode 100644 index 000000000..8c0663572 --- /dev/null +++ b/db/migrate/20230524110215_change_user_id_to_supportable_from_supporting_document_refusal.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +# change user_id to supportable from supporting_document_refusal +class ChangeUserIdToSupportableFromSupportingDocumentRefusal < ActiveRecord::Migration[7.0] + def change + rename_column :supporting_document_refusals, :user_id, :supportable_id + add_column :supporting_document_refusals, :supportable_type, :string, default: 'User' + end +end diff --git a/db/migrate/20230525101006_add_validated_at_to_child.rb b/db/migrate/20230525101006_add_validated_at_to_child.rb new file mode 100644 index 000000000..a8c3167e9 --- /dev/null +++ b/db/migrate/20230525101006_add_validated_at_to_child.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +# add validated_at to child +class AddValidatedAtToChild < ActiveRecord::Migration[7.0] + def change + add_column :children, :validated_at, :datetime + end +end 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/migrate/20230626103314_add_validated_at_to_slots_reservations.rb b/db/migrate/20230626103314_add_validated_at_to_slots_reservations.rb new file mode 100644 index 000000000..32e6922f1 --- /dev/null +++ b/db/migrate/20230626103314_add_validated_at_to_slots_reservations.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +# add validated_at to slots_reservations +class AddValidatedAtToSlotsReservations < ActiveRecord::Migration[7.0] + def change + add_column :slots_reservations, :validated_at, :datetime + end +end diff --git a/db/migrate/20230710072403_add_is_valid_to_slots_reservations.rb b/db/migrate/20230710072403_add_is_valid_to_slots_reservations.rb new file mode 100644 index 000000000..64f851e4a --- /dev/null +++ b/db/migrate/20230710072403_add_is_valid_to_slots_reservations.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +# add is_valid to slots_reservations +# remove validated_at from slots_reservations +class AddIsValidToSlotsReservations < ActiveRecord::Migration[7.0] + def up + add_column :slots_reservations, :is_valid, :boolean + SlotsReservation.reset_column_information + SlotsReservation.all.each do |sr| + sr.update_column(:is_valid, true) if sr.validated_at.present? + end + remove_column :slots_reservations, :validated_at + end + + def down + remove_column :slots_reservations, :is_valid + add_column :slots_reservations, :validated_at, :datetime + end +end diff --git a/db/migrate/20230831103208_add_is_confirm_to_slots_reservations.rb b/db/migrate/20230831103208_add_is_confirm_to_slots_reservations.rb new file mode 100644 index 000000000..57c1fbba1 --- /dev/null +++ b/db/migrate/20230831103208_add_is_confirm_to_slots_reservations.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +# add is_confirm to slots_reservations +class AddIsConfirmToSlotsReservations < ActiveRecord::Migration[7.0] + def up + add_column :slots_reservations, :is_confirm, :boolean + SlotsReservation.reset_column_information + SlotsReservation.all.each do |sr| + sr.update_column(:is_confirm, true) if sr.is_valid && sr.reservation.invoice_items.count.positive? + end + end + + def down + remove_column :slots_reservations, :is_confirm + end +end diff --git a/db/schema.rb b/db/schema.rb index f167f4316..0c08d852f 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[6.1].define(version: 2023_03_15_095054) do +ActiveRecord::Schema[6.1].define(version: 2023_03_31_132506) do # These are extensions that must be enabled in order to support this database enable_extension "fuzzystrmatch" @@ -263,6 +263,18 @@ ActiveRecord::Schema[6.1].define(version: 2023_03_15_095054) do t.index ["slug"], name: "index_categories_on_slug", unique: true end + create_table "children", force: :cascade do |t| + t.bigint "user_id" + t.string "first_name" + t.string "last_name" + t.date "birthday" + t.string "phone" + t.string "email" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["user_id"], name: "index_children_on_user_id" + end + create_table "components", id: :serial, force: :cascade do |t| t.string "name", null: false end @@ -1332,8 +1344,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_03_15_095054) do t.boolean "is_allow_newsletter" t.inet "current_sign_in_ip" t.inet "last_sign_in_ip" - t.string "mapped_from_sso" t.datetime "validated_at" + t.string "mapped_from_sso" t.index ["auth_token"], name: "index_users_on_auth_token" t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true t.index ["email"], name: "index_users_on_email", unique: true @@ -1409,6 +1421,7 @@ ActiveRecord::Schema[6.1].define(version: 2023_03_15_095054) do add_foreign_key "cart_item_reservations", "plans" add_foreign_key "cart_item_subscriptions", "invoicing_profiles", column: "customer_profile_id" add_foreign_key "cart_item_subscriptions", "plans" + add_foreign_key "children", "users" add_foreign_key "event_price_categories", "events" add_foreign_key "event_price_categories", "price_categories" add_foreign_key "events", "categories" diff --git a/db/seeds/settings.rb b/db/seeds/settings.rb index 18a901f0f..7962b9194 100644 --- a/db/seeds/settings.rb +++ b/db/seeds/settings.rb @@ -735,3 +735,6 @@ Setting.set('project_categories_filter_placeholder', 'Toutes les catégories') u Setting.set('project_categories_wording', 'Catégories') unless Setting.find_by(name: 'project_categories_wording').try(:value) Setting.set('reservation_context_feature', false) unless Setting.find_by(name: 'reservation_context_feature') + +Setting.set('family_account', false) unless Setting.find_by(name: 'family_account').try(:value) +Setting.set('child_validation_required', false) unless Setting.find_by(name: 'child_validation_required').try(:value) diff --git a/test/fixtures/history_values.yml b/test/fixtures/history_values.yml index e8ac8f534..3a378256b 100644 --- a/test/fixtures/history_values.yml +++ b/test/fixtures/history_values.yml @@ -853,6 +853,7 @@ history_value_100: invoicing_profile_id: 1 history_value_101: + id: 101 setting_id: 100 value: 'Toutes les catégories' created_at: 2023-04-05 09:16:08.000511500 Z @@ -860,6 +861,7 @@ history_value_101: invoicing_profile_id: 1 history_value_102: + id: 102 setting_id: 101 value: 'Catégories' created_at: 2023-04-05 09:16:08.000511500 Z @@ -880,4 +882,27 @@ history_value_104: value: 'false' created_at: 2023-04-05 09:16:08.000511500 Z updated_at: 2023-04-05 09:16:08.000511500 Z + +history_value_105: + id: 105 + setting_id: 104 + value: 'false' + created_at: '2023-03-31 14:38:40.000421' + updated_at: '2023-03-31 14:38:40.000421' + invoicing_profile_id: 1 + +history_value_106: + id: 106 + setting_id: 105 + value: 'false' + created_at: '2023-03-31 14:38:40.000421' + updated_at: '2023-03-31 14:38:40.000421' + invoicing_profile_id: 1 + +history_value_107: + id: 107 + setting_id: 106 + value: 'false' + created_at: '2023-03-31 14:38:40.000421' + updated_at: '2023-03-31 14:38:40.000421' invoicing_profile_id: 1 diff --git a/test/fixtures/settings.yml b/test/fixtures/settings.yml index a4447ad59..49ed9cbee 100644 --- a/test/fixtures/settings.yml +++ b/test/fixtures/settings.yml @@ -616,3 +616,15 @@ setting_104: name: reservation_context_feature created_at: 2023-04-05 09:16:08.000511500 Z updated_at: 2023-04-05 09:16:08.000511500 Z + +setting_105: + id: 105 + name: family_account + created_at: 2023-03-31 14:38:40.000421500 Z + updated_at: 2023-03-31 14:38:40.000421500 Z + +setting_106: + id: 106 + name: child_validation_required + created_at: 2023-03-31 14:38:40.000421500 Z + updated_at: 2023-03-31 14:38:40.000421500 Z diff --git a/test/frontend/__fixtures__/settings.ts b/test/frontend/__fixtures__/settings.ts index 8308e2fb7..c43dcf0be 100644 --- a/test/frontend/__fixtures__/settings.ts +++ b/test/frontend/__fixtures__/settings.ts @@ -855,6 +855,12 @@ export const settings: Array = [ value: 'false', last_update: '2022-12-23T14:39:12+0100', localized: 'Reservation context feature' + }, + { + name: 'family_account', + value: 'false', + last_update: '2023-03-31T14:39:12+0100', + localized: 'Family account' } ]; diff --git a/test/frontend/components/events/event-form.test.tsx b/test/frontend/components/events/event-form.test.tsx index 7b3d53b6c..219542a23 100644 --- a/test/frontend/components/events/event-form.test.tsx +++ b/test/frontend/components/events/event-form.test.tsx @@ -15,6 +15,7 @@ describe('EventForm', () => { expect(screen.getByLabelText(/app.admin.event_form.title/)).toBeInTheDocument(); expect(screen.getByLabelText(/app.admin.event_form.matching_visual/)).toBeInTheDocument(); expect(screen.getByLabelText(/app.admin.event_form.description/)).toBeInTheDocument(); + expect(screen.getByLabelText(/app.admin.event_form.event_type/)).toBeInTheDocument(); expect(screen.getByLabelText(/app.admin.event_form.event_category/)).toBeInTheDocument(); expect(screen.getByLabelText(/app.admin.event_form.event_themes/)).toBeInTheDocument(); expect(screen.getByLabelText(/app.admin.event_form.age_range/)).toBeInTheDocument(); diff --git a/test/integration/events/as_admin_test.rb b/test/integration/events/as_admin_test.rb index e4d721ed4..5d59eef64 100644 --- a/test/integration/events/as_admin_test.rb +++ b/test/integration/events/as_admin_test.rb @@ -22,6 +22,7 @@ class Events::AsAdminTest < ActionDispatch::IntegrationTest end_date: 1.week.from_now.utc, end_time: 1.week.from_now.utc.change(hour: 20), category_id: Category.first.id, + event_type: 'standard', amount: 0 } }.to_json,