diff --git a/CHANGELOG.md b/CHANGELOG.md index 652ceb0f4..98e10f82e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog Fab-manager +## v6.0.6 2023 May 4 + +- Fix a bug: invalid duration for machine/spaces reservations in statistics, when using slots of not 1 hour +- [TODO DEPLOY] `rails fablab:es:build_stats` THEN `rails fablab:maintenance:regenerate_statistics[2014,1]` + +## v6.0.5 2023 May 2 + +- Fix a bug: unable to show calendar for Firefox and Safari +- Improved error message for event reservation + +## v6.0.4 2023 April 25 + +- Fix a bug: notification is broken when delete a project +- Fix a bug: broken notifications email +- Fix a bug: unable to show calendar +- Update translations from Crowdin +- [TODO DEPLOY] `rails fablab:maintenance:clean_abuse_notifications` + ## v6.0.3 2023 April 12 - Fix a bug: unable to install Fab-manager by setup.sh diff --git a/Gemfile.lock b/Gemfile.lock index 4606b128b..5cb4eaf82 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -269,6 +269,8 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.8) + nokogiri (1.14.3-x86_64-darwin) + racc (~> 1.4) nokogiri (1.14.3-x86_64-linux) racc (~> 1.4) oauth2 (1.4.4) @@ -524,6 +526,7 @@ GEM zeitwerk (2.6.7) PLATFORMS + x86_64-darwin-20 x86_64-linux DEPENDENCIES diff --git a/app/controllers/api/children_controller.rb b/app/controllers/api/children_controller.rb new file mode 100644 index 000000000..ac1d98b78 --- /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).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 @child.update(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..4d05f6b56 100644 --- a/app/controllers/api/events_controller.rb +++ b/app/controllers/api/events_controller.rb @@ -96,7 +96,7 @@ 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, event_theme_ids: [], event_image_attributes: %i[id attachment], event_files_attributes: %i[id attachment _destroy], diff --git a/app/controllers/api/payzen_controller.rb b/app/controllers/api/payzen_controller.rb index 14eaf310b..3583ac12a 100644 --- a/app/controllers/api/payzen_controller.rb +++ b/app/controllers/api/payzen_controller.rb @@ -72,7 +72,7 @@ class API::PayzenController < API::PaymentsController cart = shopping_cart - if order['answer']['transactions'].any? { |transaction| transaction['status'] == 'PAID' } + if order['answer']['transactions'].all? { |transaction| transaction['status'] == 'PAID' } render on_payment_success(params[:order_id], cart) else render json: order['answer'], status: :unprocessable_entity @@ -86,10 +86,11 @@ class API::PayzenController < API::PaymentsController client = PayZen::Transaction.new transaction = client.get(params[:transaction_uuid]) + order = PayZen::Order.new.get(params[:order_id]) cart = shopping_cart - if transaction['answer']['status'] == 'PAID' + if transaction['answer']['status'] == 'PAID' && order['answer']['transactions'].all? { |t| t['status'] == 'PAID' } render on_payment_success(params[:order_id], cart) else render json: transaction['answer'], status: :unprocessable_entity 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..5ed6a7036 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,7 @@ 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); useEffect(() => { EventCategoryAPI.index() @@ -69,6 +70,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(() => { @@ -168,6 +170,20 @@ 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 (
@@ -203,6 +219,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 /> + 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() && <> +

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

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

{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() && <> + +

{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..f950e207e --- /dev/null +++ b/app/frontend/src/javascript/components/family-account/child-modal.tsx @@ -0,0 +1,64 @@ +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 => { + try { + if (child?.id) { + await ChildAPI.update(data); + } else { + await ChildAPI.create(data); + } + toggleModal(); + onSuccess(data, ''); + } catch (error) { + onError(error); + } + }; + + return ( + + {(operator?.role === 'admin' || operator?.role === 'manager') && + + } + + + ); +}; 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..1705ad6cf --- /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: (message: 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(() => { + onSuccess(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/payment-schedule/payment-schedule-item-actions.tsx b/app/frontend/src/javascript/components/payment-schedule/payment-schedule-item-actions.tsx index caf059353..7a7e8f307 100644 --- a/app/frontend/src/javascript/components/payment-schedule/payment-schedule-item-actions.tsx +++ b/app/frontend/src/javascript/components/payment-schedule/payment-schedule-item-actions.tsx @@ -54,7 +54,7 @@ export const PaymentScheduleItemActions: React.FC { - return (operator.role === 'admin' || operator.role === 'manager'); + return (operator?.role === 'admin' || operator?.role === 'manager'); }; /** diff --git a/app/frontend/src/javascript/components/payment/payzen/payzen-form.tsx b/app/frontend/src/javascript/components/payment/payzen/payzen-form.tsx index 541880808..7f7a6223b 100644 --- a/app/frontend/src/javascript/components/payment/payzen/payzen-form.tsx +++ b/app/frontend/src/javascript/components/payment/payzen/payzen-form.tsx @@ -75,7 +75,7 @@ export const PayzenForm: React.FC = ({ onSubmit, onSuccess, onE if (updateCard) return onSuccess(null); const transaction = event.clientAnswer.transactions[0]; - if (event.clientAnswer.orderStatus === 'PAID') { + if (event.clientAnswer.orderStatus === 'PAID' && transaction?.status === 'PAID') { confirmPayment(event, transaction).then((confirmation) => { PayZenKR.current.removeForms().then(() => { onSuccess(confirmation); 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`; + }; + + 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/calendar.js b/app/frontend/src/javascript/controllers/admin/calendar.js index cb290a790..3e59d6b76 100644 --- a/app/frontend/src/javascript/controllers/admin/calendar.js +++ b/app/frontend/src/javascript/controllers/admin/calendar.js @@ -69,8 +69,8 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state snapDuration: BOOKING_SNAP, selectable: true, selectHelper: true, - minTime: moment.duration(moment(bookingWindowStart.setting.value).format('HH:mm:ss')), - maxTime: moment.duration(moment(bookingWindowEnd.setting.value).format('HH:mm:ss')), + minTime: moment.duration(moment.utc(bookingWindowStart.setting.value.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), + maxTime: moment.duration(moment.utc(bookingWindowEnd.setting.value.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), select (start, end, jsEvent, view) { return calendarSelectCb(start, end, jsEvent, view); }, diff --git a/app/frontend/src/javascript/controllers/admin/members.js b/app/frontend/src/javascript/controllers/admin/members.js index e26a3da48..e7b388827 100644 --- a/app/frontend/src/javascript/controllers/admin/members.js +++ b/app/frontend/src/javascript/controllers/admin/members.js @@ -291,7 +291,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) { @@ -303,6 +303,32 @@ 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; + }); + console.log(member.children); + return member; + } + return member; + }); + }; + /** * Ask for confirmation then delete the specified administrator * @param admins {Array} full list of administrators @@ -588,6 +614,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/admin/settings.js b/app/frontend/src/javascript/controllers/admin/settings.js index 4e07dcc30..91ffa6818 100644 --- a/app/frontend/src/javascript/controllers/admin/settings.js +++ b/app/frontend/src/javascript/controllers/admin/settings.js @@ -71,8 +71,8 @@ Application.Controllers.controller('SettingsController', ['$scope', '$rootScope' $scope.subscriptionExplicationsAlert = { name: 'subscription_explications_alert', value: settingsPromise.subscription_explications_alert }; $scope.eventExplicationsAlert = { name: 'event_explications_alert', value: settingsPromise.event_explications_alert }; $scope.spaceExplicationsAlert = { name: 'space_explications_alert', value: settingsPromise.space_explications_alert }; - $scope.windowStart = { name: 'booking_window_start', value: settingsPromise.booking_window_start }; - $scope.windowEnd = { name: 'booking_window_end', value: settingsPromise.booking_window_end }; + $scope.windowStart = { name: 'booking_window_start', value: moment.utc(settingsPromise.booking_window_start).format('YYYY-MM-DD HH:mm:ss') }; + $scope.windowEnd = { name: 'booking_window_end', value: moment.utc(settingsPromise.booking_window_end).format('YYYY-MM-DD HH:mm:ss') }; $scope.mainColorSetting = { name: 'main_color', value: settingsPromise.main_color }; $scope.secondColorSetting = { name: 'secondary_color', value: settingsPromise.secondary_color }; $scope.nameGenre = { name: 'name_genre', value: settingsPromise.name_genre }; @@ -487,8 +487,12 @@ Application.Controllers.controller('SettingsController', ['$scope', '$rootScope' // we prevent the admin from setting the closing time before the opening time $scope.$watch('windowEnd.value', function (newValue, oldValue, scope) { - if ($scope.windowStart && moment($scope.windowStart.value).isAfter(newValue)) { - return $scope.windowEnd.value = oldValue; + if (scope.windowStart) { + const startTime = moment($scope.windowStart.value).format('HH:mm:ss'); + const endTime = moment(newValue).format('HH:mm:ss'); + if (startTime >= endTime) { + scope.windowEnd.value = oldValue; + } } }); diff --git a/app/frontend/src/javascript/controllers/calendar.js b/app/frontend/src/javascript/controllers/calendar.js index a4f4ac162..e0977c9dd 100644 --- a/app/frontend/src/javascript/controllers/calendar.js +++ b/app/frontend/src/javascript/controllers/calendar.js @@ -204,8 +204,8 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ center: 'title', right: '' }, - minTime: moment.duration(moment(bookingWindowStart.setting.value).format('HH:mm:ss')), - maxTime: moment.duration(moment(bookingWindowEnd.setting.value).format('HH:mm:ss')), + minTime: moment.duration(moment.utc(bookingWindowStart.setting.value.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), + maxTime: moment.duration(moment.utc(bookingWindowEnd.setting.value.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), defaultView: window.innerWidth <= 480 ? 'agendaDay' : 'agendaWeek', eventClick (event, jsEvent, view) { return calendarEventClickCb(event, jsEvent, view); 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 8fe4e618a..0c7a86483 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,9 @@ 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) { // compute the total remaining places - let remain = $scope.event.nb_free_places - $scope.reserve.nbReservePlaces; + let remain = ($scope.event.event_type === 'family' ? ($scope.children.length + 1) : $scope.event.nb_free_places) - $scope.reserve.nbReservePlaces; for (let ticket in $scope.reserve.tickets) { remain -= $scope.reserve.tickets[ticket]; } @@ -247,17 +256,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 = () => { @@ -322,6 +355,9 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' Member.get({ id: $scope.ctrl.member.id }, function (member) { $scope.ctrl.member = member; getReservations($scope.event.id, 'Event', $scope.ctrl.member.id); + getChildren($scope.ctrl.member.id).then(() => { + updateNbReservePlaces(); + }); }); } }; @@ -372,7 +408,7 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' } , function (response) { // reservation failed - growl.error(response && response.data && response.data.card && response.data.card[0] || 'server error'); + growl.error(response && response.data && _.keys(response.data)[0] && response.data[_.keys(response.data)[0]][0] || 'server error'); // unset the attempting marker $scope.attempting = false; }) @@ -583,6 +619,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.validatedAt) { + return false; + } + } + } + } + return true; + } + + $scope.isUnder18YearsAgo = (date) => { + return moment(date).isAfter(moment().subtract(18, 'year')); + } + /* PRIVATE SCOPE */ /** @@ -602,6 +670,9 @@ 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); + getChildren($scope.currentUser.id).then(function (children) { + updateNbReservePlaces(); + }); } // watch when a coupon is applied to re-compute the total price @@ -626,6 +697,74 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' }).$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; + } + } + } + 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', + validatedAt: 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') { + const maxPlaces = $scope.children.length + 1; + 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 +777,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 +796,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 +841,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; } @@ -815,6 +972,7 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' $scope.reservations.push(reservation); }); resetEventReserve(); + updateNbReservePlaces(); $scope.reserveSuccess = true; $scope.coupon.applied = null; if ($scope.currentUser.role === 'admin') { diff --git a/app/frontend/src/javascript/controllers/machines.js.erb b/app/frontend/src/javascript/controllers/machines.js.erb index c6fa655c9..9d8556865 100644 --- a/app/frontend/src/javascript/controllers/machines.js.erb +++ b/app/frontend/src/javascript/controllers/machines.js.erb @@ -447,8 +447,8 @@ Application.Controllers.controller('ReserveMachineController', ['$scope', '$tran // fullCalendar (v2) configuration $scope.calendarConfig = CalendarConfig({ - minTime: moment.duration(moment(settingsPromise.booking_window_start).format('HH:mm:ss')), - maxTime: moment.duration(moment(settingsPromise.booking_window_end).format('HH:mm:ss')), + minTime: moment.duration(moment.utc(settingsPromise.booking_window_start.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), + maxTime: moment.duration(moment.utc(settingsPromise.booking_window_end.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), eventClick (event, jsEvent, view) { return calendarEventClickCb(event, jsEvent, view); }, diff --git a/app/frontend/src/javascript/controllers/spaces.js.erb b/app/frontend/src/javascript/controllers/spaces.js.erb index 13899c7c2..d4bded6da 100644 --- a/app/frontend/src/javascript/controllers/spaces.js.erb +++ b/app/frontend/src/javascript/controllers/spaces.js.erb @@ -385,8 +385,8 @@ Application.Controllers.controller('ReserveSpaceController', ['$scope', '$transi // fullCalendar (v2) configuration $scope.calendarConfig = CalendarConfig({ - minTime: moment.duration(moment(settingsPromise.booking_window_start).format('HH:mm:ss')), - maxTime: moment.duration(moment(settingsPromise.booking_window_end).format('HH:mm:ss')), + minTime: moment.duration(moment.utc(settingsPromise.booking_window_start.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), + maxTime: moment.duration(moment.utc(settingsPromise.booking_window_end.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), eventClick (event, jsEvent, view) { return calendarEventClickCb(event, jsEvent, view); }, diff --git a/app/frontend/src/javascript/controllers/trainings.js.erb b/app/frontend/src/javascript/controllers/trainings.js.erb index 929e56148..0fa0a18a8 100644 --- a/app/frontend/src/javascript/controllers/trainings.js.erb +++ b/app/frontend/src/javascript/controllers/trainings.js.erb @@ -155,8 +155,8 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$tra // fullCalendar (v2) configuration $scope.calendarConfig = CalendarConfig({ - minTime: moment.duration(moment(settingsPromise.booking_window_start).format('HH:mm:ss')), - maxTime: moment.duration(moment(settingsPromise.booking_window_end).format('HH:mm:ss')), + minTime: moment.duration(moment.utc(settingsPromise.booking_window_start.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), + maxTime: moment.duration(moment.utc(settingsPromise.booking_window_end.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), eventClick (event, jsEvent, view) { return calendarEventClickCb(event, jsEvent, view); }, 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..892ca95dc 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,8 @@ export interface Event { }>, recurrence: RecurrenceOption, recurrence_end_at: Date, - advanced_accounting_attributes?: AdvancedAccounting + advanced_accounting_attributes?: AdvancedAccounting, + event_type: EventType, } 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 b3fbe012b..db950a40d 100644 --- a/app/frontend/src/javascript/models/reservation.ts +++ b/app/frontend/src/javascript/models/reservation.ts @@ -45,6 +45,13 @@ export interface Reservation { }, total_booked_seats?: number, created_at?: TDateISO, + booking_users_attributes?: { + id: number, + name: string, + event_price_category_id: number, + booked_id: number, + booked_type: string, + } } export interface ReservationIndexFilter extends ApiFilter { diff --git a/app/frontend/src/javascript/models/setting.ts b/app/frontend/src/javascript/models/setting.ts index 27f84db14..5090487cb 100644 --- a/app/frontend/src/javascript/models/setting.ts +++ b/app/frontend/src/javascript/models/setting.ts @@ -178,7 +178,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 26ce00a93..936162a4e 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: { @@ -615,7 +627,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/stylesheets/application.scss b/app/frontend/src/stylesheets/application.scss index b70e769c6..cf9ff38aa 100644 --- a/app/frontend/src/stylesheets/application.scss +++ b/app/frontend/src/stylesheets/application.scss @@ -52,6 +52,9 @@ @import "modules/events/event-form"; @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/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/reservations.html b/app/frontend/templates/admin/events/reservations.html index 81d87e088..b7a04527c 100644 --- a/app/frontend/templates/admin/events/reservations.html +++ b/app/frontend/templates/admin/events/reservations.html @@ -29,7 +29,11 @@ - {{ reservation.user_full_name }} + {{ reservation.user_full_name }} +
+ {{bu.name}} + {{bu.name}} +
{{ reservation.created_at | amDateFormat:'LL LTS' }} diff --git a/app/frontend/templates/admin/members/edit.html b/app/frontend/templates/admin/members/edit.html index c3479225e..752bffe3a 100644 --- a/app/frontend/templates/admin/members/edit.html +++ b/app/frontend/templates/admin/members/edit.html @@ -62,10 +62,15 @@ + + + + @@ -208,10 +213,20 @@
{{ 'app.admin.members_edit.NUMBER_full_price_tickets_reserved' }} + +
+ {{bu.name}} + {{bu.name}} +
{{ 'app.admin.members_edit.NUMBER_NAME_tickets_reserved' }} + +
+ {{bu.name}} + {{bu.name}} + 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.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..7be0fb820 100644 --- a/app/frontend/templates/admin/settings/compte.html +++ b/app/frontend/templates/admin/settings/compte.html @@ -51,6 +51,30 @@
+
+

{{ 'app.admin.settings.family_account' }}

+

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

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

@@ -156,4 +180,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..9af91bd8f 100644 --- a/app/frontend/templates/dashboard/events.html +++ b/app/frontend/templates/dashboard/events.html @@ -26,12 +26,20 @@ translate-values="{NUMBER: r.nb_reserve_places}"> {{ 'app.logged.dashboard.events.NUMBER_normal_places_reserved' }} + +
+ {{bu.name}} +
{{ 'app.logged.dashboard.events.NUMBER_of_NAME_places_reserved' }} + +
+ {{bu.name}} + 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 ec362a3d5..66f217f80 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,11 @@
    +
    + {{ 'app.public.events_show.event_type.nominative' }} + {{ 'app.public.events_show.event_type.family' }} +
    -
    {{event.category.name}}
    {{theme.name}} @@ -116,16 +119,78 @@
    - {{ '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' }} +

    +     +
    +
    @@ -157,7 +222,7 @@
    {{ 'app.public.events_show.you_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} }}
    @@ -190,11 +255,11 @@
    -
    +
    -
    +
    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 7dbc6dc96..523b00633 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/excel_helper.rb b/app/helpers/excel_helper.rb index 81653b6d2..de4622826 100644 --- a/app/helpers/excel_helper.rb +++ b/app/helpers/excel_helper.rb @@ -41,7 +41,7 @@ module ExcelHelper unless type.simple data.push hit['_source']['stat'] styles.push nil - types.push :string + types.push :float end [data, styles, types] diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 1520bd44d..723773ac0 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/concerns/stat_concern.rb b/app/models/concerns/stat_concern.rb index 1743af6e4..2b0549ba4 100644 --- a/app/models/concerns/stat_concern.rb +++ b/app/models/concerns/stat_concern.rb @@ -8,7 +8,7 @@ module StatConcern attribute :type, String attribute :subType, String attribute :date, String - attribute :stat, Integer + attribute :stat, Float attribute :userId, Integer attribute :gender, String attribute :age, Integer diff --git a/app/models/event.rb b/app/models/event.rb index 60bb3f70b..96ab48199 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 diff --git a/app/models/project.rb b/app/models/project.rb index 860e2f5ad..238353e96 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -40,6 +40,8 @@ class Project < ApplicationRecord has_many :project_steps, dependent: :destroy accepts_nested_attributes_for :project_steps, allow_destroy: true + has_many :abuses, as: :signaled, dependent: :destroy, class_name: 'Abuse' + # validations validates :author, :name, presence: true diff --git a/app/models/reservation.rb b/app/models/reservation.rb index d0472354b..9b9d0ff4f 100644 --- a/app/models/reservation.rb +++ b/app/models/reservation.rb @@ -23,6 +23,9 @@ class Reservation < ApplicationRecord has_many :prepaid_pack_reservations, dependent: :destroy + 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) } validate :training_not_fully_reserved, if: -> { reservable.is_a?(Training) } 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..843bc46c8 100644 --- a/app/models/supporting_document_refusal.rb +++ b/app/models/supporting_document_refusal.rb @@ -2,7 +2,7 @@ # An admin can mark an uploaded document as refused, this will notify the member class SupportingDocumentRefusal < ApplicationRecord - belongs_to :user + 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 diff --git a/app/models/supporting_document_type.rb b/app/models/supporting_document_type.rb index 98c596be1..d0be09fe0 100644 --- a/app/models/supporting_document_type.rb +++ b/app/models/supporting_document_type.rb @@ -8,4 +8,6 @@ class SupportingDocumentType < ApplicationRecord has_many :supporting_document_refusals_types, dependent: :destroy has_many :supporting_document_refusals, through: :supporting_document_refusals_types + + validates :document_type, presence: true, inclusion: { in: %w[User Child] } end diff --git a/app/models/user.rb b/app/models/user.rb index 8568a444a..bfcca8093 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/setting_policy.rb b/app/policies/setting_policy.rb index 1593beb55..7593c0c76 100644 --- a/app/policies/setting_policy.rb +++ b/app/policies/setting_policy.rb @@ -46,7 +46,7 @@ class SettingPolicy < ApplicationPolicy external_id machines_banner_active machines_banner_text machines_banner_cta_active machines_banner_cta_label 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] + events_banner_cta_url family_account child_validation_required] 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 6c6588e4b..52210c40d 100644 --- a/app/services/cart_service.rb +++ b/app/services/cart_service.rb @@ -171,7 +171,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..45ebd1a4c --- /dev/null +++ b/app/services/child_service.rb @@ -0,0 +1,59 @@ +# 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) + 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_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/event_service.rb b/app/services/event_service.rb index 639353313..7a6adcaf6 100644 --- a/app/services/event_service.rb +++ b/app/services/event_service.rb @@ -33,8 +33,8 @@ class EventService end def date_range(starting, ending, all_day) - start_date = Time.zone.parse(starting[:date]) - end_date = Time.zone.parse(ending[:date]) + start_date = Date.parse(starting[:date]) + end_date = Date.parse(ending[:date]) start_time = starting[:time] ? Time.zone.parse(starting[:time]) : nil end_time = ending[:time] ? Time.zone.parse(ending[:time]) : nil if all_day || start_time.nil? || end_time.nil? diff --git a/app/services/members/list_service.rb b/app/services/members/list_service.rb index 6ed15eefd..93968f637 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/statistics/concerns/helpers_concern.rb b/app/services/statistics/concerns/helpers_concern.rb index d851a4eb2..6508fe4b1 100644 --- a/app/services/statistics/concerns/helpers_concern.rb +++ b/app/services/statistics/concerns/helpers_concern.rb @@ -39,11 +39,11 @@ module Statistics::Concerns::HelpersConcern def difference_in_hours(start_at, end_at) if start_at.to_date == end_at.to_date - ((end_at - start_at) / 3600.0).to_i + ((end_at - start_at) / 3600.0).to_f else end_at_to_start_date = end_at.change(year: start_at.year, month: start_at.month, day: start_at.day) - hours = ((end_at_to_start_date - start_at) / 60 / 60).to_i - hours = ((end_at.to_date - start_at.to_date).to_i + 1) * hours if end_at.to_date > start_at.to_date + hours = ((end_at_to_start_date - start_at) / 60 / 60).to_f + hours = ((end_at.to_date - start_at.to_date).to_f + 1) * hours if end_at.to_date > start_at.to_date hours end end diff --git a/app/services/statistics/fetcher_service.rb b/app/services/statistics/fetcher_service.rb index 42eb79817..ee130f4dd 100644 --- a/app/services/statistics/fetcher_service.rb +++ b/app/services/statistics/fetcher_service.rb @@ -57,7 +57,7 @@ class Statistics::FetcherService machine_type: r.reservable.friendly_id, machine_name: r.reservable.name, slot_dates: r.slots.map(&:start_at).map(&:to_date), - nb_hours: (r.slots.map(&:duration).map(&:to_i).reduce(:+) / 3600.0).to_i, + nb_hours: (r.slots.map(&:duration).map(&:to_i).reduce(:+) / 3600.0).to_f, ca: calcul_ca(r.original_invoice) }.merge(user_info(profile)) yield result end @@ -81,7 +81,7 @@ class Statistics::FetcherService space_name: r.reservable.name, space_type: r.reservable.slug, slot_dates: r.slots.map(&:start_at).map(&:to_date), - nb_hours: (r.slots.map(&:duration).map(&:to_i).reduce(:+) / 3600.0).to_i, + nb_hours: (r.slots.map(&:duration).map(&:to_i).reduce(:+) / 3600.0).to_f, ca: calcul_ca(r.original_invoice) }.merge(user_info(profile)) yield result 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..885a29d28 100644 --- a/app/views/api/events/_event.json.jbuilder +++ b/app/views/api/events/_event.json.jbuilder @@ -1,6 +1,6 @@ # frozen_string_literal: true -json.extract! event, :id, :title, :description +json.extract! event, :id, :title, :description, :event_type if event.event_image json.event_image_attributes do json.id event.event_image.id diff --git a/app/views/api/members/list.json.jbuilder b/app/views/api/members/list.json.jbuilder index 38dd1b1a2..97840a4b8 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.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..051b19718 100644 --- a/app/views/api/members/show.json.jbuilder +++ b/app/views/api/members/show.json.jbuilder @@ -77,13 +77,22 @@ 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.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_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_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/reservations/_reservation.json.jbuilder b/app/views/api/reservations/_reservation.json.jbuilder index 7ba3e0e12..b5d34bc26 100644 --- a/app/views/api/reservations/_reservation.json.jbuilder +++ b/app/views/api/reservations/_reservation.json.jbuilder @@ -32,3 +32,10 @@ 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 +end 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_low_stock_threshold.html.erb b/app/views/notifications_mailer/notify_admin_low_stock_threshold.html.erb index 0c1bae992..a5dff9aa3 100644 --- a/app/views/notifications_mailer/notify_admin_low_stock_threshold.html.erb +++ b/app/views/notifications_mailer/notify_admin_low_stock_threshold.html.erb @@ -1,10 +1,10 @@ <%= render 'notifications_mailer/shared/hello', recipient: @recipient %>

      - <%= t('.body.low_stock', { PRODUCT: @attached_object.name }) %> + <%= t('.body.low_stock', **{ PRODUCT: @attached_object.name }) %>

      - <%= t('.body.stocks_state_html', { INTERNAL: @attached_object.stock['internal'], EXTERNAL: @attached_object.stock['external'] }) %> +<%= t('.body.stocks_state_html', **{ INTERNAL: @attached_object.stock['internal'], EXTERNAL: @attached_object.stock['external'] }) %>

      <%=link_to( t('.body.manage_stock'), "#{root_url}#!/admin/store/products/#{@attached_object.id}/edit", target: "_blank" )%> diff --git a/app/views/notifications_mailer/notify_admin_training_auto_cancelled.html.erb b/app/views/notifications_mailer/notify_admin_training_auto_cancelled.html.erb index 8a62126d3..41b94d0ce 100644 --- a/app/views/notifications_mailer/notify_admin_training_auto_cancelled.html.erb +++ b/app/views/notifications_mailer/notify_admin_training_auto_cancelled.html.erb @@ -1,7 +1,7 @@ <%= render 'notifications_mailer/shared/hello', recipient: @recipient %>

      - <%= t('.body.cancelled_training', { + <%= t('.body.cancelled_training', **{ TRAINING: @attached_object.trainings.first.name, DATE: I18n.l(@attached_object.start_at.to_date), START: I18n.l(@attached_object.start_at, format: :hour_minute), 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_admin_when_user_is_created.html.erb b/app/views/notifications_mailer/notify_admin_when_user_is_created.html.erb index f994e2be5..6412854e5 100644 --- a/app/views/notifications_mailer/notify_admin_when_user_is_created.html.erb +++ b/app/views/notifications_mailer/notify_admin_when_user_is_created.html.erb @@ -6,7 +6,7 @@

        - <%= t('.body.user_of_group_html', { GROUP: @attached_object&.group&.name }) %> + <%= t('.body.user_of_group_html', GROUP: @attached_object&.group&.name) %>

        <% if @attached_object.invoicing_profile.organization %> diff --git a/app/views/notifications_mailer/notify_admin_when_user_is_imported.html.erb b/app/views/notifications_mailer/notify_admin_when_user_is_imported.html.erb index eac0434bb..8fe92d867 100644 --- a/app/views/notifications_mailer/notify_admin_when_user_is_imported.html.erb +++ b/app/views/notifications_mailer/notify_admin_when_user_is_imported.html.erb @@ -2,7 +2,7 @@ <%= render 'notifications_mailer/shared/hello', recipient: @recipient %>

        <%= t('.body.new_account_imported', ID: @attached_object.id, PROVIDER: provider.name) %>
        - <%= t('.body.provider_uid', UID:@attached_object.uid) %>

        + <%= t('.body.provider_uid', UID: @attached_object.uid) %>

        <% if provider.sso_fields.size > 1 %>

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

          diff --git a/app/views/notifications_mailer/notify_member_training_authorization_expired.html.erb b/app/views/notifications_mailer/notify_member_training_authorization_expired.html.erb index f4fc020ed..9522275a6 100644 --- a/app/views/notifications_mailer/notify_member_training_authorization_expired.html.erb +++ b/app/views/notifications_mailer/notify_member_training_authorization_expired.html.erb @@ -1,6 +1,6 @@ <%= render 'notifications_mailer/shared/hello', recipient: @recipient %> -<%= t('.body.training_expired_html', { +<%= t('.body.training_expired_html', **{ TRAINING: @attached_object.name, MACHINES: @attached_object.machines.map(&:name).join(', '), DATE: I18n.l((DateTime.current - @attached_object.authorization_period.months).to_date), diff --git a/app/views/notifications_mailer/notify_member_training_auto_cancelled.html.erb b/app/views/notifications_mailer/notify_member_training_auto_cancelled.html.erb index ca8144c00..e50d0a0c3 100644 --- a/app/views/notifications_mailer/notify_member_training_auto_cancelled.html.erb +++ b/app/views/notifications_mailer/notify_member_training_auto_cancelled.html.erb @@ -1,7 +1,7 @@ <%= render 'notifications_mailer/shared/hello', recipient: @recipient %>

          - <%= t('.body.cancelled_training', { + <%= t('.body.cancelled_training', **{ TRAINING: @attached_object.reservation.reservable.name, DATE: I18n.l(@attached_object.start_at.to_date), START: I18n.l(@attached_object.start_at, format: :hour_minute), diff --git a/app/views/notifications_mailer/notify_member_training_invalidated.html.erb b/app/views/notifications_mailer/notify_member_training_invalidated.html.erb index fd6ae0e5f..0390c504a 100644 --- a/app/views/notifications_mailer/notify_member_training_invalidated.html.erb +++ b/app/views/notifications_mailer/notify_member_training_invalidated.html.erb @@ -1,6 +1,6 @@ <%= render 'notifications_mailer/shared/hello', recipient: @recipient %> -<%= t('.body.training_invalidated_html', { +<%= t('.body.training_invalidated_html', **{ TRAINING: @attached_object.name, MACHINES: @attached_object.machines.map(&:name).join(', '), DATE: I18n.l((DateTime.current - @attached_object.authorization_period.months).to_date), 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/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 8714ac56d..7a9adb526 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -151,6 +151,11 @@ 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 family" plan_form: ACTION_title: "{ACTION, select, create{New} other{Update the}} plan" tab_settings: "Settings" @@ -1184,6 +1189,14 @@ en: member_filter_all: "All" member_filter_not_confirmed: "Unconfirmed" member_filter_inactive_for_3_years: "Inactive for 3 years" + 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" @@ -1231,6 +1244,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" @@ -1773,6 +1792,10 @@ en: extended_prices_in_same_day: "Extended prices in the same day" public_registrations: "Public registrations" show_username_in_admin_list: "Show the username in the list" + family_account: "family account" + family_account_info_html: "By activating this option, you offer your members the possibility to add their child(ren) to their own account. You can also request proof if you wish to validate them." + enable_family_account: "Enable the Family Account option" + child_validation_required_label: "Activate the account validation option for children" overlapping_options: training_reservations: "Trainings" machine_reservations: "Machines" @@ -1870,7 +1893,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 e7082ef58..1c70e2252 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -151,6 +151,11 @@ 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 famille" plan_form: ACTION_title: "{ACTION, select, create{Nouvelle} other{Mettre à jour la}} formule d'abonnement" tab_settings: "Paramètres" @@ -1231,6 +1236,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" @@ -1773,6 +1784,10 @@ fr: extended_prices_in_same_day: "Prix étendus le même jour" public_registrations: "Inscriptions publiques" show_username_in_admin_list: "Afficher le nom d'utilisateur dans la liste" + family_account: "Compte famille" + family_account_info_html: "En activant cette option, vous offrez à vos membres la possibilité d'ajouter sur leur propre compte leur(s) enfants. Vous pouvez aussi demander un justificatif si vous souhaitez les valider." + enable_family_account: "Activer l'option Compte Famille" + 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.admin.it.yml b/config/locales/app.admin.it.yml index 6398a72a2..4a62c96b2 100644 --- a/config/locales/app.admin.it.yml +++ b/config/locales/app.admin.it.yml @@ -112,7 +112,7 @@ it: create_success: "Lo spazio è stato creato correttamente" update_success: "Lo spazio è stato aggiornato correttamente" event_form: - ACTION_title: "{ACTION, select, create{Nuovo} other{Aggiorna l'}} evento" + ACTION_title: "{ACTION, select, create{Nuovo} other{Aggiorna}} evento" title: "Titolo" matching_visual: "Corrispondenza illustazione" description: "Descrizione" @@ -152,7 +152,7 @@ it: every_month: "Ogni mese" every_year: "Ogni anno" plan_form: - ACTION_title: "{ACTION, select, create{Nuovo} other{Aggiorna l'}}evento" + ACTION_title: "{ACTION, select, create{Nuovo} other{Aggiorna}}evento" tab_settings: "Impostazioni" tab_usage_limits: "Limiti di utilizzo" description: "Descrizione" @@ -285,7 +285,7 @@ it: #manage the trainings & machines slots calendar: calendar_management: "Gestione calendario" - trainings: "Certificazioni" + trainings: "Abilitazioni" machines: "Macchine" spaces: "Spazi" events: "Eventi" @@ -416,7 +416,7 @@ it: themes: "Temi" add_a_new_theme: "Aggiungi un nuovo tema" licences: "Licenze" - statuses: "Statuto" + statuses: "Status" description: "Descrizione" add_a_new_licence: "Aggiungere una nuova licenza" manage_abuses: "Gestisci i report" @@ -1783,7 +1783,7 @@ it: title: "Titolo" fablab_title: "Titolo del FabLab" title_concordance: "Corrispondenza del titolo" - male: "Machio." + male: "Maschio." female: "Femmina." neutral: "Neutrale." eg: "es:" @@ -1804,7 +1804,7 @@ it: public_registrations_allowed: "Registrazioni pubbliche consentite" help: "Aiuto" feature_tour: "Tour delle funzionalità" - feature_tour_info_html: "

          Quando un amministratore o un manager è connesso, un tour di funzionalità verrà attivato la prima volta che visita ogni sezione dell'applicazione. È possibile modificare questo comportamento in uno dei seguenti valori:

          • « Una volta » per mantenere il comportamento predefinito.
          • « Per sessione » per visualizzare i tour ogni volta che riapri l'applicazione.
          • « trigger manuale» per impedire la visualizzazione automatica dei tour. Sarà comunque possibile attivarli premendo il tasto F1 o cliccando su « Aiuto » nel menu dell'utente.
          " + feature_tour_info_html: "

          Quando un amministratore o un manager è connesso, un tour di funzionalità verrà attivato la prima volta che visita ogni sezione dell'applicazione. È possibile modificare questo comportamento in uno dei seguenti valori:

          • « Una volta » per mantenere il comportamento predefinito.
          • « Per sessione » per visualizzare i tour ogni volta che riapri l'applicazione.
          • « Trigger manuale» per impedire la visualizzazione automatica dei tour. Sarà comunque possibile attivarli premendo il tasto F1 o cliccando su « Aiuto » nel menu dell'utente.
          " feature_tour_display_mode: "Modalità visualizzazione tour funzionalità" display_mode: once: "Una volta" @@ -2373,7 +2373,7 @@ it: filter_clear: "Cancella tutto" filter_apply: "Applica" filter_ref: "Per riferimento" - filter_status: "Per stato" + filter_status: "Per status" filter_client: "Per cliente" filter_period: "Per periodo" filter_period_from: "Da" diff --git a/config/locales/app.logged.en.yml b/config/locales/app.logged.en.yml index b904d16eb..f284fbc5d 100644 --- a/config/locales/app.logged.en.yml +++ b/config/locales/app.logged.en.yml @@ -284,6 +284,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 +292,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..24550f9d1 100644 --- a/config/locales/app.logged.fr.yml +++ b/config/locales/app.logged.fr.yml @@ -284,6 +284,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 +292,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 7dfc61f69..8ac4efcbe 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" @@ -311,6 +312,9 @@ en: event_description: "Event description" downloadable_documents: "Downloadable documents" information_and_booking: "Information and booking" + event_type: + family: "Family event" + nominative: "Nominative event" dates: "Dates" beginning: "Beginning:" ending: "Ending:" @@ -356,6 +360,7 @@ 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" #public calendar calendar: calendar: "Calendar" @@ -475,6 +480,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: "Please note that you can only add a child under the age of 18. Supporting documents are requested by your administrator, they will be useful to validate your child's account and authorize the reservation of 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 09a07a116..d0ec74bf8 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" @@ -311,6 +312,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 famille" + nominative: "Evénement nominatif" dates: "Dates" beginning: "Début :" ending: "Fin :" @@ -356,6 +360,7 @@ 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" #public calendar calendar: calendar: "Calendrier" @@ -475,6 +480,34 @@ fr: member_select: select_a_member: "Sélectionnez un membre" start_typing: "Commencez à écrire..." + children_dashboard: + 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: "Notez que vous ne pouvez ajouter que vos enfants de moins de 18 ans. Des pièces justificatives sont demandés par votre administrateur, elles lui seront utiles pour valider le compte de votre enfant et ainsi autoriser la réservation d'é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.public.it.yml b/config/locales/app.public.it.yml index 5c6a0c76f..963c6a577 100644 --- a/config/locales/app.public.it.yml +++ b/config/locales/app.public.it.yml @@ -185,12 +185,12 @@ it: rough_draft: "Bozza preliminare" status_filter: all_statuses: "Tutti gli stati" - select_status: "Seleziona uno stato" + select_status: "Seleziona uno status" #details of a projet projects_show: rough_draft: "Bozza" project_description: "Descrizione del progetto" - by_name: "Per {NAME}" + by_name: "di {NAME}" step_N: "Fase {INDEX}" share_on_facebook: "Condividi su Facebook" share_on_twitter: "Condividi su Twitter" @@ -237,7 +237,7 @@ it: all_machines: "Tutte le macchine" machine_card: book: "Prenota" - consult: "Guarda" + consult: "Vedi" #details of a machine machines_show: book_this_machine: "Modifica questa macchina" @@ -549,7 +549,7 @@ it: content: "Le macchine sono gli utensili a disposizione degli utenti da prenotare." view: title: "Visualizza" - content: "Per modificare o eliminare una macchina, prima clicca qui. Non sarai in grado di eliminare una macchina che è già stata associata a uno slot, ma potrai disattivarla." + content: "Per modificare o eliminare una macchina, clicca qui. Non sarai in grado di eliminare una macchina che è già stata associata a uno slot di disponibilità, ma potrai disattivarla." reserve: title: "Prenota" content: "Clicca qui per accedere a un calendario che mostra slot liberi. Questo ti permetterà di prenotare questa macchina per un utente e di gestire le prenotazioni esistenti." diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index 423e3a6f9..89d498897 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -165,7 +165,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" @@ -195,6 +195,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" @@ -367,7 +368,9 @@ en: slot_tags: "Slot tags" user_tags: "User tags" no_tags: "No tags" - user_validation_required_alert: "Warning!
          Your administrator must validate your account. Then, you'll then be able to access all the booking features." + user_validation_required_alert: "Your administrator must validate your account. Then, you'll then be able to access all the booking features." + 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" @@ -440,6 +443,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 e03e762b3..e11b94748 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -195,6 +195,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" @@ -368,6 +369,8 @@ fr: user_tags: "Étiquettes de l'utilisateur" no_tags: "Aucune étiquette" user_validation_required_alert: "Attention !
          Votre administrateur doit valider votre compte. Vous pourrez alors accéder à l'ensemble des fonctionnalités de 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/app.shared.it.yml b/config/locales/app.shared.it.yml index 9adae1b81..f136a1376 100644 --- a/config/locales/app.shared.it.yml +++ b/config/locales/app.shared.it.yml @@ -4,7 +4,7 @@ it: #translations of common buttons buttons: confirm_changes: "Conferma le modifiche" - consult: "Guarda" + consult: "Vedi" edit: "Modifica" change: "Modifica" delete: "Elimina" diff --git a/config/locales/en.yml b/config/locales/en.yml index 3bd7aae37..911c463d0 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: @@ -313,6 +314,8 @@ 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: @@ -440,14 +443,26 @@ 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_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: @@ -697,6 +712,7 @@ en: trainings_authorization_validity_duration: "Trainings validity period duration" trainings_invalidation_rule: "Trainings automatic invalidation" trainings_invalidation_rule_period: "Grace period before invalidating a training" + family_account: "Family account" #statuses of projects statuses: new: "New" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 5331975c3..96384e6d4 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: @@ -313,6 +314,8 @@ 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 nouveau 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: @@ -440,14 +443,26 @@ 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_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: diff --git a/config/locales/mails.en.yml b/config/locales/mails.en.yml index 6151da3c6..0d6ca6a84 100644 --- a/config/locales/mails.en.yml +++ b/config/locales/mails.en.yml @@ -104,6 +104,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 +393,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 +411,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: @@ -406,6 +428,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: diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml index 0517ad9e2..60bfe3be1 100644 --- a/config/locales/mails.fr.yml +++ b/config/locales/mails.fr.yml @@ -104,6 +104,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 +393,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 +411,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: @@ -406,6 +428,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: diff --git a/config/routes.rb b/config/routes.rb index 4f9872af2..3b28737f2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -183,6 +183,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/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/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/notification_types.rb b/db/seeds/notification_types.rb index 8dbe8dc68..d5fe045ba 100644 --- a/db/seeds/notification_types.rb +++ b/db/seeds/notification_types.rb @@ -31,3 +31,59 @@ unless NotificationType.find_by(name: 'notify_member_reservation_limit_reached') is_configurable: false ) end + +unless NotificationType.find_by(name: 'notify_admin_user_child_supporting_document_refusal') + NotificationType.create!( + name: 'notify_admin_user_child_supporting_document_refusal', + category: 'supporting_documents', + is_configurable: true + ) +end + +unless NotificationType.find_by(name: 'notify_user_child_supporting_document_refusal') + NotificationType.create!( + name: 'notify_user_child_supporting_document_refusal', + category: 'supporting_documents', + is_configurable: false + ) +end + +unless NotificationType.find_by(name: 'notify_admin_child_created') + NotificationType.create!( + name: 'notify_admin_child_created', + category: 'users_accounts', + is_configurable: true + ) +end + +unless NotificationType.find_by(name: 'notify_user_child_is_validated') + NotificationType.create!( + name: 'notify_user_child_is_validated', + category: 'users_accounts', + is_configurable: false + ) +end + +unless NotificationType.find_by(name: 'notify_user_child_is_invalidated') + NotificationType.create!( + name: 'notify_user_child_is_invalidated', + category: 'users_accounts', + is_configurable: false + ) +end + +unless NotificationType.find_by(name: 'notify_admin_user_child_supporting_document_files_updated') + NotificationType.create!( + name: 'notify_admin_user_child_supporting_document_files_updated', + category: 'supporting_documents', + is_configurable: true + ) +end + +unless NotificationType.find_by(name: 'notify_admin_user_child_supporting_document_files_created') + NotificationType.create!( + name: 'notify_admin_user_child_supporting_document_files_created', + category: 'supporting_documents', + is_configurable: true + ) +end diff --git a/db/seeds/settings.rb b/db/seeds/settings.rb index 4df47c23c..0e8d57d35 100644 --- a/db/seeds/settings.rb +++ b/db/seeds/settings.rb @@ -728,3 +728,6 @@ Setting.set('accounting_Error_code', 'ERROR') unless Setting.find_by(name: 'acco Setting.set('accounting_Error_label', 'Erroneous invoices to refund') unless Setting.find_by(name: 'accounting_Error_label').try(:value) Setting.set('external_id', false) unless Setting.find_by(name: 'external_id').try(:value) + +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/db/structure.sql b/db/structure.sql index 0f648a913..e52dab82f 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -115,8 +115,8 @@ SET default_tablespace = ''; CREATE TABLE public.abuses ( id integer NOT NULL, - signaled_id integer, signaled_type character varying, + signaled_id integer, first_name character varying, last_name character varying, email character varying, @@ -236,8 +236,8 @@ CREATE TABLE public.addresses ( locality character varying, country character varying, postal_code character varying, - placeable_id integer, placeable_type character varying, + placeable_id integer, created_at timestamp without time zone, updated_at timestamp without time zone ); @@ -346,8 +346,8 @@ CREATE TABLE public.ar_internal_metadata ( CREATE TABLE public.assets ( id integer NOT NULL, - viewable_id integer, viewable_type character varying, + viewable_id integer, attachment character varying, type character varying, created_at timestamp without time zone, @@ -520,6 +520,41 @@ CREATE SEQUENCE public.availability_tags_id_seq ALTER SEQUENCE public.availability_tags_id_seq OWNED BY public.availability_tags.id; +-- +-- Name: booking_users; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.booking_users ( + id bigint NOT NULL, + name character varying, + reservation_id bigint, + booked_type character varying, + booked_id bigint, + event_price_category_id bigint, + created_at timestamp(6) without time zone NOT NULL, + updated_at timestamp(6) without time zone NOT NULL +); + + +-- +-- Name: booking_users_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.booking_users_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: booking_users_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE public.booking_users_id_seq OWNED BY public.booking_users.id; + + -- -- Name: cart_item_coupons; Type: TABLE; Schema: public; Owner: - -- @@ -553,6 +588,41 @@ CREATE SEQUENCE public.cart_item_coupons_id_seq ALTER SEQUENCE public.cart_item_coupons_id_seq OWNED BY public.cart_item_coupons.id; +-- +-- Name: cart_item_event_reservation_booking_users; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.cart_item_event_reservation_booking_users ( + id bigint NOT NULL, + name character varying, + cart_item_event_reservation_id bigint, + event_price_category_id bigint, + booked_type character varying, + booked_id bigint, + created_at timestamp(6) without time zone NOT NULL, + updated_at timestamp(6) without time zone NOT NULL +); + + +-- +-- Name: cart_item_event_reservation_booking_users_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.cart_item_event_reservation_booking_users_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: cart_item_event_reservation_booking_users_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE public.cart_item_event_reservation_booking_users_id_seq OWNED BY public.cart_item_event_reservation_booking_users.id; + + -- -- Name: cart_item_event_reservation_tickets; Type: TABLE; Schema: public; Owner: - -- @@ -892,6 +962,43 @@ CREATE SEQUENCE public.chained_elements_id_seq ALTER SEQUENCE public.chained_elements_id_seq OWNED BY public.chained_elements.id; +-- +-- Name: children; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.children ( + id bigint NOT NULL, + user_id bigint, + first_name character varying, + last_name character varying, + birthday date, + phone character varying, + email character varying, + created_at timestamp without time zone NOT NULL, + updated_at timestamp without time zone NOT NULL, + validated_at timestamp(6) without time zone +); + + +-- +-- Name: children_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.children_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: children_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE public.children_id_seq OWNED BY public.children.id; + + -- -- Name: components; Type: TABLE; Schema: public; Owner: - -- @@ -965,8 +1072,8 @@ ALTER SEQUENCE public.coupons_id_seq OWNED BY public.coupons.id; CREATE TABLE public.credits ( id integer NOT NULL, - creditable_id integer, creditable_type character varying, + creditable_id integer, plan_id integer, hours integer, created_at timestamp without time zone, @@ -1136,7 +1243,8 @@ CREATE TABLE public.events ( recurrence_id integer, age_range_id integer, category_id integer, - deleted_at timestamp without time zone + deleted_at timestamp without time zone, + event_type character varying DEFAULT 'standard'::character varying ); @@ -1762,15 +1870,15 @@ ALTER SEQUENCE public.notification_types_id_seq OWNED BY public.notification_typ CREATE TABLE public.notifications ( id integer NOT NULL, receiver_id integer, - attached_object_id integer, attached_object_type character varying, + attached_object_id integer, notification_type_id integer, is_read boolean DEFAULT false, created_at timestamp without time zone, updated_at timestamp without time zone, receiver_type character varying, is_send boolean DEFAULT false, - meta_data jsonb DEFAULT '{}'::jsonb + meta_data jsonb DEFAULT '"{}"'::jsonb ); @@ -2498,8 +2606,8 @@ CREATE TABLE public.prices ( id integer NOT NULL, group_id integer, plan_id integer, - priceable_id integer, priceable_type character varying, + priceable_id integer, amount integer, created_at timestamp without time zone NOT NULL, updated_at timestamp without time zone NOT NULL, @@ -2962,8 +3070,8 @@ CREATE TABLE public.reservations ( message text, created_at timestamp without time zone, updated_at timestamp without time zone, - reservable_id integer, reservable_type character varying, + reservable_id integer, nb_reserve_places integer, statistic_profile_id integer ); @@ -2995,8 +3103,8 @@ ALTER SEQUENCE public.reservations_id_seq OWNED BY public.reservations.id; CREATE TABLE public.roles ( id integer NOT NULL, name character varying, - resource_id integer, resource_type character varying, + resource_id integer, created_at timestamp without time zone, updated_at timestamp without time zone ); @@ -3639,10 +3747,11 @@ ALTER SEQUENCE public.subscriptions_id_seq OWNED BY public.subscriptions.id; CREATE TABLE public.supporting_document_files ( id bigint NOT NULL, supporting_document_type_id bigint, - user_id bigint, + supportable_id bigint, attachment character varying, created_at timestamp without time zone NOT NULL, - updated_at timestamp without time zone NOT NULL + updated_at timestamp without time zone NOT NULL, + supportable_type character varying DEFAULT 'User'::character varying ); @@ -3671,11 +3780,12 @@ ALTER SEQUENCE public.supporting_document_files_id_seq OWNED BY public.supportin CREATE TABLE public.supporting_document_refusals ( id bigint NOT NULL, - user_id bigint, + supportable_id bigint, operator_id integer, message text, created_at timestamp without time zone NOT NULL, - updated_at timestamp without time zone NOT NULL + updated_at timestamp without time zone NOT NULL, + supportable_type character varying DEFAULT 'User'::character varying ); @@ -3716,7 +3826,8 @@ CREATE TABLE public.supporting_document_types ( id bigint NOT NULL, name character varying, created_at timestamp without time zone NOT NULL, - updated_at timestamp without time zone NOT NULL + updated_at timestamp without time zone NOT NULL, + document_type character varying DEFAULT 'User'::character varying ); @@ -4102,8 +4213,8 @@ CREATE TABLE public.users ( is_allow_newsletter boolean, current_sign_in_ip inet, last_sign_in_ip inet, - mapped_from_sso character varying, - validated_at timestamp without time zone + validated_at timestamp without time zone, + mapped_from_sso character varying ); @@ -4312,6 +4423,13 @@ ALTER TABLE ONLY public.availabilities ALTER COLUMN id SET DEFAULT nextval('publ ALTER TABLE ONLY public.availability_tags ALTER COLUMN id SET DEFAULT nextval('public.availability_tags_id_seq'::regclass); +-- +-- Name: booking_users id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.booking_users ALTER COLUMN id SET DEFAULT nextval('public.booking_users_id_seq'::regclass); + + -- -- Name: cart_item_coupons id; Type: DEFAULT; Schema: public; Owner: - -- @@ -4319,6 +4437,13 @@ ALTER TABLE ONLY public.availability_tags ALTER COLUMN id SET DEFAULT nextval('p ALTER TABLE ONLY public.cart_item_coupons ALTER COLUMN id SET DEFAULT nextval('public.cart_item_coupons_id_seq'::regclass); +-- +-- Name: cart_item_event_reservation_booking_users id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.cart_item_event_reservation_booking_users ALTER COLUMN id SET DEFAULT nextval('public.cart_item_event_reservation_booking_users_id_seq'::regclass); + + -- -- Name: cart_item_event_reservation_tickets id; Type: DEFAULT; Schema: public; Owner: - -- @@ -4389,6 +4514,13 @@ ALTER TABLE ONLY public.categories ALTER COLUMN id SET DEFAULT nextval('public.c ALTER TABLE ONLY public.chained_elements ALTER COLUMN id SET DEFAULT nextval('public.chained_elements_id_seq'::regclass); +-- +-- Name: children id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.children ALTER COLUMN id SET DEFAULT nextval('public.children_id_seq'::regclass); + + -- -- Name: components id; Type: DEFAULT; Schema: public; Owner: - -- @@ -5150,6 +5282,14 @@ ALTER TABLE ONLY public.availability_tags ADD CONSTRAINT availability_tags_pkey PRIMARY KEY (id); +-- +-- Name: booking_users booking_users_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.booking_users + ADD CONSTRAINT booking_users_pkey PRIMARY KEY (id); + + -- -- Name: cart_item_coupons cart_item_coupons_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -5158,6 +5298,14 @@ ALTER TABLE ONLY public.cart_item_coupons ADD CONSTRAINT cart_item_coupons_pkey PRIMARY KEY (id); +-- +-- Name: cart_item_event_reservation_booking_users cart_item_event_reservation_booking_users_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.cart_item_event_reservation_booking_users + ADD CONSTRAINT cart_item_event_reservation_booking_users_pkey PRIMARY KEY (id); + + -- -- Name: cart_item_event_reservation_tickets cart_item_event_reservation_tickets_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -5238,6 +5386,14 @@ ALTER TABLE ONLY public.chained_elements ADD CONSTRAINT chained_elements_pkey PRIMARY KEY (id); +-- +-- Name: children children_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.children + ADD CONSTRAINT children_pkey PRIMARY KEY (id); + + -- -- Name: components components_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -5718,6 +5874,14 @@ ALTER TABLE ONLY public.roles ADD CONSTRAINT roles_pkey PRIMARY KEY (id); +-- +-- Name: schema_migrations schema_migrations_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.schema_migrations + ADD CONSTRAINT schema_migrations_pkey PRIMARY KEY (version); + + -- -- Name: settings settings_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -6061,6 +6225,41 @@ CREATE INDEX index_availability_tags_on_availability_id ON public.availability_t CREATE INDEX index_availability_tags_on_tag_id ON public.availability_tags USING btree (tag_id); +-- +-- Name: index_booking_users_on_booked; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_booking_users_on_booked ON public.booking_users USING btree (booked_type, booked_id); + + +-- +-- Name: index_booking_users_on_event_price_category_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_booking_users_on_event_price_category_id ON public.booking_users USING btree (event_price_category_id); + + +-- +-- Name: index_booking_users_on_reservation_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_booking_users_on_reservation_id ON public.booking_users USING btree (reservation_id); + + +-- +-- Name: index_cart_item_booking_users_on_cart_item_event_reservation; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_cart_item_booking_users_on_cart_item_event_reservation ON public.cart_item_event_reservation_booking_users USING btree (cart_item_event_reservation_id); + + +-- +-- Name: index_cart_item_booking_users_on_event_price_category; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_cart_item_booking_users_on_event_price_category ON public.cart_item_event_reservation_booking_users USING btree (event_price_category_id); + + -- -- Name: index_cart_item_coupons_on_coupon_id; Type: INDEX; Schema: public; Owner: - -- @@ -6082,6 +6281,13 @@ CREATE INDEX index_cart_item_coupons_on_customer_profile_id ON public.cart_item_ CREATE INDEX index_cart_item_coupons_on_operator_profile_id ON public.cart_item_coupons USING btree (operator_profile_id); +-- +-- Name: index_cart_item_event_reservation_booking_users_on_booked; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_cart_item_event_reservation_booking_users_on_booked ON public.cart_item_event_reservation_booking_users USING btree (booked_type, booked_id); + + -- -- Name: index_cart_item_event_reservations_on_customer_profile_id; Type: INDEX; Schema: public; Owner: - -- @@ -6243,6 +6449,13 @@ CREATE UNIQUE INDEX index_categories_on_slug ON public.categories USING btree (s CREATE INDEX index_chained_elements_on_element ON public.chained_elements USING btree (element_type, element_id); +-- +-- Name: index_children_on_user_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_children_on_user_id ON public.children USING btree (user_id); + + -- -- Name: index_coupons_on_code; Type: INDEX; Schema: public; Owner: - -- @@ -7111,6 +7324,13 @@ CREATE INDEX index_subscriptions_on_plan_id ON public.subscriptions USING btree CREATE INDEX index_subscriptions_on_statistic_profile_id ON public.subscriptions USING btree (statistic_profile_id); +-- +-- Name: index_supporting_document_files_on_supportable_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_supporting_document_files_on_supportable_id ON public.supporting_document_files USING btree (supportable_id); + + -- -- Name: index_supporting_document_files_on_supporting_document_type_id; Type: INDEX; Schema: public; Owner: - -- @@ -7119,17 +7339,10 @@ CREATE INDEX index_supporting_document_files_on_supporting_document_type_id ON p -- --- Name: index_supporting_document_files_on_user_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_supporting_document_refusals_on_supportable_id; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_supporting_document_files_on_user_id ON public.supporting_document_files USING btree (user_id); - - --- --- Name: index_supporting_document_refusals_on_user_id; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX index_supporting_document_refusals_on_user_id ON public.supporting_document_refusals USING btree (user_id); +CREATE INDEX index_supporting_document_refusals_on_supportable_id ON public.supporting_document_refusals USING btree (supportable_id); -- @@ -7377,21 +7590,6 @@ CREATE INDEX proof_of_identity_type_id_and_proof_of_identity_refusal_id ON publi CREATE UNIQUE INDEX unique_not_null_external_id ON public.invoicing_profiles USING btree (external_id) WHERE (external_id IS NOT NULL); --- --- Name: unique_schema_migrations; Type: INDEX; Schema: public; Owner: - --- - -CREATE UNIQUE INDEX unique_schema_migrations ON public.schema_migrations USING btree (version); - - --- --- Name: accounting_periods accounting_periods_del_protect; Type: RULE; Schema: public; Owner: - --- - -CREATE RULE accounting_periods_del_protect AS - ON DELETE TO public.accounting_periods DO INSTEAD NOTHING; - - -- -- Name: accounting_periods accounting_periods_upd_protect; Type: RULE; Schema: public; Owner: - -- @@ -7425,6 +7623,14 @@ ALTER TABLE ONLY public.payment_schedules ADD CONSTRAINT fk_rails_00308dc223 FOREIGN KEY (wallet_transaction_id) REFERENCES public.wallet_transactions(id); +-- +-- Name: cart_item_event_reservation_booking_users fk_rails_0964335a37; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.cart_item_event_reservation_booking_users + ADD CONSTRAINT fk_rails_0964335a37 FOREIGN KEY (event_price_category_id) REFERENCES public.event_price_categories(id); + + -- -- Name: cart_item_free_extensions fk_rails_0d11862969; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -7625,6 +7831,14 @@ ALTER TABLE ONLY public.subscriptions ADD CONSTRAINT fk_rails_358a71f738 FOREIGN KEY (statistic_profile_id) REFERENCES public.statistic_profiles(id); +-- +-- Name: booking_users fk_rails_38ad1ae7e8; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.booking_users + ADD CONSTRAINT fk_rails_38ad1ae7e8 FOREIGN KEY (reservation_id) REFERENCES public.reservations(id); + + -- -- Name: invoices fk_rails_40d78f8cf6; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -7689,6 +7903,14 @@ ALTER TABLE ONLY public.chained_elements ADD CONSTRAINT fk_rails_4fad806cca FOREIGN KEY (previous_id) REFERENCES public.chained_elements(id); +-- +-- Name: cart_item_event_reservation_booking_users fk_rails_5206c6ca4a; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.cart_item_event_reservation_booking_users + ADD CONSTRAINT fk_rails_5206c6ca4a FOREIGN KEY (cart_item_event_reservation_id) REFERENCES public.cart_item_event_reservations(id); + + -- -- Name: cart_item_event_reservation_tickets fk_rails_5307e8aab8; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -7926,7 +8148,7 @@ ALTER TABLE ONLY public.orders -- ALTER TABLE ONLY public.supporting_document_refusals - ADD CONSTRAINT fk_rails_91d424352e FOREIGN KEY (user_id) REFERENCES public.users(id); + ADD CONSTRAINT fk_rails_91d424352e FOREIGN KEY (supportable_id) REFERENCES public.users(id); -- @@ -8025,6 +8247,14 @@ ALTER TABLE ONLY public.cart_item_coupons ADD CONSTRAINT fk_rails_a44bac1e45 FOREIGN KEY (operator_profile_id) REFERENCES public.invoicing_profiles(id); +-- +-- Name: children fk_rails_a51d7cfb22; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.children + ADD CONSTRAINT fk_rails_a51d7cfb22 FOREIGN KEY (user_id) REFERENCES public.users(id); + + -- -- Name: projects_themes fk_rails_b021a22658; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -8257,6 +8487,14 @@ ALTER TABLE ONLY public.projects ADD CONSTRAINT fk_rails_e812590204 FOREIGN KEY (author_statistic_profile_id) REFERENCES public.statistic_profiles(id); +-- +-- Name: booking_users fk_rails_e88263229e; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.booking_users + ADD CONSTRAINT fk_rails_e88263229e FOREIGN KEY (event_price_category_id) REFERENCES public.event_price_categories(id); + + -- -- Name: user_tags fk_rails_ea0382482a; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -8368,7 +8606,6 @@ INSERT INTO "schema_migrations" (version) VALUES ('20140605125131'), ('20140605142133'), ('20140605151442'), -('20140606133116'), ('20140609092700'), ('20140609092827'), ('20140610153123'), @@ -8437,14 +8674,12 @@ INSERT INTO "schema_migrations" (version) VALUES ('20150507075620'), ('20150512123546'), ('20150520132030'), -('20150520133409'), ('20150526130729'), ('20150527153312'), ('20150529113555'), ('20150601125944'), ('20150603104502'), ('20150603104658'), -('20150603133050'), ('20150604081757'), ('20150604131525'), ('20150608142234'), @@ -8526,7 +8761,6 @@ INSERT INTO "schema_migrations" (version) VALUES ('20160905142700'), ('20160906094739'), ('20160906094847'), -('20160906145713'), ('20160915105234'), ('20161123104604'), ('20170109085345'), @@ -8693,6 +8927,16 @@ INSERT INTO "schema_migrations" (version) VALUES ('20230324095639'), ('20230328094807'), ('20230328094808'), -('20230328094809'); +('20230328094809'), +('20230331132506'), +('20230509121907'), +('20230509161557'), +('20230510141305'), +('20230511080650'), +('20230511081018'), +('20230524080448'), +('20230524083558'), +('20230524110215'), +('20230525101006'); diff --git a/lib/tasks/fablab/maintenance.rake b/lib/tasks/fablab/maintenance.rake index 23a6dc4f7..3402555fa 100644 --- a/lib/tasks/fablab/maintenance.rake +++ b/lib/tasks/fablab/maintenance.rake @@ -155,5 +155,12 @@ namespace :fablab do end_date = args.end == 'today' ? Time.current.end_of_day : start_date.next_month [start_date, end_date] end + + desc 'Clean the abuse notifications if signaled object is null' + task clean_abuse_notifications: :environment do + Abuse.all.each do |abuse| + abuse.destroy if abuse.signaled.nil? + end + end end end diff --git a/package.json b/package.json index 070f89f6d..38cad9cdb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fab-manager", - "version": "6.0.2", + "version": "6.0.6", "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.", "keywords": [ "fablab", diff --git a/test/fixtures/history_values.yml b/test/fixtures/history_values.yml index 4ce437af6..7d86b33d6 100644 --- a/test/fixtures/history_values.yml +++ b/test/fixtures/history_values.yml @@ -852,3 +852,18 @@ history_value_100: updated_at: 2023-04-05 09:16:08.000511500 Z invoicing_profile_id: 1 +history_value_101: + id: 101 + setting_id: 100 + 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_102: + id: 102 + setting_id: 101 + 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 eb21fa7f8..0f0af2853 100644 --- a/test/fixtures/settings.yml +++ b/test/fixtures/settings.yml @@ -586,3 +586,15 @@ setting_99: name: home_css created_at: 2023-04-05 09:16:08.000511500 Z updated_at: 2023-04-05 09:16:08.000511500 Z + +setting_100: + id: 100 + name: family_account + created_at: 2023-03-31 14:38:40.000421500 Z + updated_at: 2023-03-31 14:38:40.000421500 Z + +setting_101: + id: 101 + 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 03dd134be..578fc6dbb 100644 --- a/test/frontend/__fixtures__/settings.ts +++ b/test/frontend/__fixtures__/settings.ts @@ -825,6 +825,12 @@ export const settings: Array = [ value: 'https://www.sleede.com/', last_update: '2022-12-23T14:39:12+0100', localized: 'Url' + }, + { + 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, diff --git a/test/integration/events/timezone_test.rb b/test/integration/events/timezone_test.rb index 2c2489e41..4f8db9e4a 100644 --- a/test/integration/events/timezone_test.rb +++ b/test/integration/events/timezone_test.rb @@ -46,8 +46,8 @@ class Events::TimezoneTest < ActionDispatch::IntegrationTest e = Event.find_by(id: event[:id]) assert_not_nil e, 'Event was not created in database' - assert_equal '2023-06-15', e.availability.start_at.to_date.iso8601 - assert_equal '2023-06-15', e.availability.end_at.to_date.iso8601 + assert_equal '2023-06-14', e.availability.start_at.to_date.iso8601 + assert_equal '2023-06-14', e.availability.end_at.to_date.iso8601 assert_equal '09:48', e.availability.start_at.strftime('%R') assert_equal '11:48', e.availability.end_at.strftime('%R') end