-
+
+
{criteriaList?.map((item, index) => (
0) && (
-
+
{fund.criteria_editable && (
diff --git a/react/src/dashboard/components/elements/resource-states/PrevalidationRequestStateLabels.tsx b/react/src/dashboard/components/elements/resource-states/PrevalidationRequestStateLabels.tsx
new file mode 100644
index 000000000..60fd751d8
--- /dev/null
+++ b/react/src/dashboard/components/elements/resource-states/PrevalidationRequestStateLabels.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import TableEmptyValue from '../table-empty-value/TableEmptyValue';
+import useTranslate from '../../../hooks/useTranslate';
+import Label from '../image_cropper/Label';
+import PrevalidationRequest from '../../../props/models/PrevalidationRequest';
+
+export default function PrevalidationRequestStateLabels({ request }: { request: PrevalidationRequest }) {
+ const translate = useTranslate();
+
+ if (request.state === 'success') {
+ return ;
+ }
+
+ if (request.state === 'pending') {
+ return ;
+ }
+
+ if (request.state === 'fail') {
+ return ;
+ }
+
+ return ;
+ fundId: number;
+ modal: ModalState;
+ className?: string;
+ recordTypes?: Array;
+ onCompleted: () => void;
+}) {
+ const translate = useTranslate();
+ const openModal = useOpenModal();
+ const pushDanger = usePushDanger();
+ const pushSuccess = usePushSuccess();
+ const pushApiError = usePushApiError();
+
+ const fileService = useFileService();
+ const fundService = useFundService();
+ const prevalidationRequestService = usePrevalidationRequestService();
+
+ const [fund, setFund] = useState(funds?.find((fund) => fund.id == fundId) || funds[0]);
+ const [step, setStep] = useState(Steps.select_fund);
+ const [data, setData] = useState>(null);
+ const [changed, setChanged] = useState(false);
+ const [csvFile, setCsvFile] = useState(null);
+ const [hideModal, setHideModal] = useState(false);
+ const [isDragOver, setIsDragOver] = useState(false);
+ const [dataChunkSize] = useState(50);
+ const [progressBar, setProgressBar] = useState(null);
+
+ const [csvErrors, setCsvErrors] = useState({});
+ const [csvWarnings, setCsvWarnings] = useState({});
+ const [csvIsValid, setCsvIsValid] = useState(false);
+ const [csvProgress, setCsvProgress] = useState(CSVProgress.initial);
+
+ const [progressStatus, setProgressStatus] = useState('');
+ const [acceptedFiles] = useState(['.csv']);
+ const [processingMode, setProcessingMode] = useState(null);
+
+ const abortRef = useRef(false);
+ const processedRef = useRef<{ processed: number; total: number }>({ processed: 0, total: 0 });
+ const cancelPhaseRef = useRef(null);
+ const closeAfterCancelRef = useRef(false);
+ const inputRef = useRef(null);
+
+ const criteriaRecordTypeKeys = useMemo(() => {
+ return recordTypes?.filter((recordType) => recordType.criteria)?.map((recordType) => recordType.key);
+ }, [recordTypes]);
+
+ const fundRecordKey = useMemo(() => {
+ return fund.csv_required_keys_except_prefill.filter((key) => key.endsWith('_eligible'))?.[0];
+ }, [fund.csv_required_keys_except_prefill]);
+
+ const fundRecordKeyValue = useMemo(() => {
+ return fund.criteria?.filter((criteria) => {
+ return criteria.record_type_key == fundRecordKey && criteria.operator == '=';
+ })[0]?.value;
+ }, [fund.criteria, fundRecordKey]);
+
+ const closeModal = useCallback(() => {
+ if (changed) {
+ onCompleted();
+ }
+
+ modal.close();
+ }, [changed, modal, onCompleted]);
+
+ const downloadExampleCsv = useCallback(() => {
+ fileService.downloadFile(
+ (fund.key || 'fund') + '_sample.csv',
+ fundService.sampleCSVForPrevalidationRequest(fund),
+ );
+ }, [fileService, fund, fundService]);
+
+ const reset = useCallback((abortRefValue = true) => {
+ abortRef.current = abortRefValue;
+
+ setHideModal(false);
+ setCsvFile(null);
+ setCsvErrors({});
+ setCsvIsValid(false);
+ setCsvProgress(CSVProgress.initial);
+ }, []);
+
+ const filterSelectedFiles = useCallback(
+ (files: FileList) => {
+ return [...files].filter((file) => {
+ return acceptedFiles.includes('.' + file.name.split('.')[file.name.split('.').length - 1]);
+ });
+ },
+ [acceptedFiles],
+ );
+
+ const showInvalidRows = useCallback(
+ (errors = {}, rows = [], rowIndex = 0) => {
+ const items = Object.keys(errors)
+ .map(function (key) {
+ const keyData = key.split('.');
+ const keyDataId = keyData[1];
+ const fieldKey = keyData[2];
+ const index = parseInt(keyDataId, 10) + 1 + rowIndex;
+
+ return [index, errors[key], fieldKey];
+ })
+ .sort((a, b) => a[0] - b[0]);
+
+ const uniqueRows = items.reduce((arr, item) => {
+ return arr.includes(item[0]) ? arr : [...arr, item[0]];
+ }, []);
+
+ const message = [
+ `${uniqueRows.length} van ${rows.length}`,
+ `rij(en) uit het bulkbestand zijn niet geimporteerd,`,
+ `bekijk het bestand bij welke rij(en) het mis gaat.`,
+ ].join(' ');
+
+ pushDanger('Waarschuwing', message);
+
+ setHideModal(true);
+
+ openModal((modal) => (
+ ({
+ value: `Rij: ${item[0]}: ${item[2]} - ${item[1]}`,
+ _uid: uniqueId('rand_'),
+ label: item?.[fund.csv_primary_key],
+ }))}
+ onConfirm={() => {
+ reset();
+ }}
+ onCancel={() => {
+ reset();
+ }}
+ />
+ ));
+ },
+ [fund?.csv_primary_key, openModal, pushDanger, reset],
+ );
+
+ const parseCsvFile = useCallback(
+ async (file: File): Promise>> => {
+ return await new Promise(function (complete) {
+ try {
+ Papa.parse(file, { complete });
+ } catch (e) {
+ pushDanger(e);
+ complete(null);
+ }
+ });
+ },
+ [pushDanger],
+ );
+
+ const uploadFile = useCallback(
+ async (file?: File) => {
+ const results = await parseCsvFile(file);
+
+ if (!results) {
+ return reset();
+ }
+
+ results.data = results.data.filter((item) => !!item);
+
+ const data = (results.data = results.data.filter((item) => !!item));
+ const header = data.length > 0 ? data[0] : [];
+
+ const body = (data.length > 0 ? data.slice(1) : []).filter((row) => {
+ return Array.isArray(row) && row.filter((item) => !!item).length > 0;
+ });
+
+ const csvErrors: CSVErrorProp = {};
+ const csvWarnings: CSVWarningProp = {};
+
+ if (header.length == 0) {
+ csvErrors.emptyHeader = 'Het .csv bestand is leeg, controleer het bestand';
+ }
+
+ if (header.filter((item) => item === 'bsn').length == 0) {
+ csvErrors.missingBsn = 'In het .csv bestand ontbreken persoonsgegevens: BSN';
+ }
+
+ if (body.length == 0) {
+ csvErrors.emptyBody = 'Het .csv bestand heeft kolomnamen maar geen inhoud, controleer de inhoud.';
+ }
+
+ // append eligibility key
+ if (fund && fundRecordKey && fundRecordKeyValue && header.indexOf(fundRecordKey) === -1) {
+ header.unshift(fundRecordKey);
+ body.forEach((row) => row.unshift(fundRecordKeyValue));
+ }
+
+ const invalidRecordTypes = header.filter((recordTypeKey: ProfileRecordType & 'bsn') => {
+ return recordTypeKey !== 'bsn' && criteriaRecordTypeKeys.indexOf(recordTypeKey) == -1;
+ });
+
+ const missingRecordTypes = fund.csv_required_keys_except_prefill.filter((recordTypeKey: string) => {
+ return header.indexOf(recordTypeKey) == -1;
+ });
+
+ const optionalRecordTypes = header.filter((recordTypeKey) => {
+ return (
+ recordTypeKey !== 'bsn' &&
+ fund.csv_required_keys_except_prefill.indexOf(recordTypeKey) == -1 &&
+ fund.csv_required_keys_by_groups.indexOf(recordTypeKey) == -1
+ );
+ });
+
+ if (invalidRecordTypes.length > 0) {
+ csvErrors.invalidRecordTypes = `Het .csv bestand heeft de volgende ongeldige persoonsgegevens: '${invalidRecordTypes.join(
+ "', '",
+ )}'`;
+ }
+
+ if (missingRecordTypes.length > 0) {
+ csvErrors.missingRecordTypes = `In het .csv bestand ontbreken persoonsgegevens die verplicht zijn voor dit fonds '${
+ fund.name
+ }': '${missingRecordTypes.join("', '")}'`;
+ }
+
+ if (optionalRecordTypes.length > 0) {
+ csvWarnings.optionalRecordTypes = [
+ `In het .csv bestand zijn persoonsgegevens toegevoegd die optioneel zijn voor "${fund.name}" fonds. `,
+ 'Controleer of deze persoonsgegevens echt nodig zijn voor de toekenning. ',
+ `De volgende persoonsgegevens zijn optioneel: "${optionalRecordTypes.join("', '")}".`,
+ ];
+ }
+
+ const parsedData = body.reduce(function (result, val) {
+ const row = {};
+
+ header.forEach((hVal, hKey) => {
+ if (val[hKey] && val[hKey] != '') {
+ row[hVal] = val[hKey];
+ }
+ });
+
+ return isEmpty(row) ? result : [...result, row];
+ }, []) as RowDataPropData[];
+
+ setCsvFile(file);
+
+ setCsvErrors(csvErrors);
+ setCsvWarnings(csvWarnings);
+
+ setData(parsedData);
+ setCsvIsValid(Object.keys(csvErrors).length === 0);
+ setCsvProgress(CSVProgress.validated);
+ },
+ [criteriaRecordTypeKeys, fund, fundRecordKey, fundRecordKeyValue, parseCsvFile, reset],
+ );
+
+ const updateProgressBarValue = useCallback((progress: number, status?: string) => {
+ setProgressBar(progress);
+ setProgressStatus(progress < 100 ? status || 'Aan het uploaden...' : 'Klaar!');
+ }, []);
+
+ const notifyCanceled = useCallback(() => {
+ const { processed, total } = processedRef.current;
+ const phase = cancelPhaseRef.current;
+
+ if (phase === 'validate') {
+ pushSuccess('Validatie geannuleerd', `Gevalideerd: ${processed} van ${total}. Geen uploads uitgevoerd.`);
+ } else if (phase === 'upload') {
+ pushSuccess('Upload geannuleerd', `Geüpload: ${processed} van ${total}.`);
+ } else {
+ pushSuccess('Upload geannuleerd', `Verwerkt: ${processed} van ${total}.`);
+ }
+ }, [pushSuccess]);
+
+ const finalizeCancel = useCallback(() => {
+ setProcessingMode(null);
+ setCsvProgress(CSVProgress.validated);
+ setProgressBar(0);
+ setProgressStatus('');
+ setHideModal(false);
+ notifyCanceled();
+ cancelPhaseRef.current = null;
+
+ if (closeAfterCancelRef.current) {
+ closeAfterCancelRef.current = false;
+ modal.close();
+ }
+ }, [modal, notifyCanceled]);
+
+ const requestCancel = useCallback(() => {
+ if (processingMode) {
+ cancelPhaseRef.current = processingMode;
+ abortRef.current = true;
+ closeAfterCancelRef.current = true;
+ return;
+ }
+
+ setStep(Steps.select_fund);
+ }, [processingMode]);
+
+ useBeforeUnload(!!processingMode);
+
+ const chunkList = useCallback((arr: Array, len: number) => {
+ const chunks = [];
+ const n = arr.length;
+
+ let i = 0;
+
+ while (i < n) {
+ chunks.push(arr.slice(i, (i += len)));
+ }
+
+ return chunks;
+ }, []);
+
+ const startValidationToServer = useCallback((): Promise => {
+ return new Promise((resolve) => {
+ setCsvProgress(CSVProgress.uploading);
+ setProcessingMode('validate');
+ processedRef.current = { processed: 0, total: data.length };
+
+ const submitData = chunkList(JSON.parse(JSON.stringify(data)), dataChunkSize);
+ const chunksCount = submitData.length;
+ const errors = {};
+
+ let currentChunkNth = 0;
+
+ updateProgressBarValue(0, 'Aan het valideren...');
+
+ const resolveIfFinished = () => {
+ if (abortRef.current) {
+ abortRef.current = false;
+ finalizeCancel();
+ return resolve(false);
+ }
+
+ if (currentChunkNth == chunksCount) {
+ setProcessingMode(null);
+
+ if (Object.keys(errors).length > 0) {
+ showInvalidRows(errors, data);
+ setCsvProgress(CSVProgress.validated);
+ setProgressBar(0);
+ setProgressStatus('');
+ return resolve(false);
+ }
+
+ return resolve(true);
+ }
+
+ validateChunk(submitData[currentChunkNth]);
+ };
+
+ const validateChunk = (data: Array<{ [key: string]: string }>) => {
+ prevalidationRequestService
+ .storeBatchValidate(fund.organization_id, data, fund.id)
+ .then(() => {
+ currentChunkNth++;
+ processedRef.current = {
+ processed: Math.min(currentChunkNth * dataChunkSize, processedRef.current.total),
+ total: processedRef.current.total,
+ };
+ updateProgressBarValue((currentChunkNth / chunksCount) * 100, 'Aan het valideren...');
+ resolveIfFinished();
+ })
+ .catch((err: ResponseError) => {
+ if (err.status == 422 && err.data.errors) {
+ Object.keys(err.data.errors).forEach(function (key) {
+ const keyData = key.split('.');
+ keyData[1] = (parseInt(keyData[1], 10) + currentChunkNth * dataChunkSize).toString();
+ errors[keyData.join('.')] = err.data.errors[key];
+ });
+ } else {
+ setProcessingMode(null);
+ pushApiError(err, 'Onbekende error.');
+ return resolve(false);
+ }
+
+ currentChunkNth++;
+ processedRef.current = {
+ processed: Math.min(currentChunkNth * dataChunkSize, processedRef.current.total),
+ total: processedRef.current.total,
+ };
+ updateProgressBarValue((currentChunkNth / chunksCount) * 100, 'Aan het valideren...');
+ resolveIfFinished();
+ });
+ };
+
+ validateChunk(submitData[currentChunkNth]);
+ });
+ }, [
+ chunkList,
+ data,
+ dataChunkSize,
+ updateProgressBarValue,
+ prevalidationRequestService,
+ fund.organization_id,
+ fund.id,
+ pushApiError,
+ showInvalidRows,
+ finalizeCancel,
+ ]);
+
+ const startUploadingToServer = useCallback((): Promise => {
+ return new Promise((resolve, reject) => {
+ setCsvProgress(CSVProgress.uploading);
+ setProcessingMode('upload');
+ processedRef.current = { processed: 0, total: data.length };
+
+ const submitData = chunkList(JSON.parse(JSON.stringify(data)), dataChunkSize);
+ const chunksCount = submitData.length;
+
+ let currentChunkNth = 0;
+
+ updateProgressBarValue(0, 'Aan het uploaden...');
+
+ const uploadChunk = async function (data: Array<{ [key: string]: string }>) {
+ prevalidationRequestService
+ .storeBatch(fund.organization_id, data, fund.id, {
+ name: csvFile.name,
+ content: await fileToText(csvFile),
+ total: data.length,
+ chunk: currentChunkNth,
+ chunks: chunksCount,
+ chunkSize: dataChunkSize,
+ })
+ .then(() => {
+ setChanged(true);
+
+ currentChunkNth++;
+ processedRef.current = {
+ processed: Math.min(currentChunkNth * dataChunkSize, processedRef.current.total),
+ total: processedRef.current.total,
+ };
+ updateProgressBarValue((currentChunkNth / chunksCount) * 100, 'Aan het uploaden...');
+
+ if (currentChunkNth == chunksCount) {
+ setTimeout(() => {
+ setProgressBar(100);
+ setCsvProgress(CSVProgress.uploaded);
+ onCompleted?.();
+ setProcessingMode(null);
+ resolve(null);
+ }, 0);
+ } else {
+ if (abortRef.current) {
+ abortRef.current = false;
+ finalizeCancel();
+ return resolve(false);
+ }
+
+ uploadChunk(submitData[currentChunkNth]);
+ }
+ })
+ .catch((err: ResponseError) => {
+ if (err.status == 422 && err.data.errors) {
+ showInvalidRows(err.data.errors, data, currentChunkNth * 100);
+
+ return err.data?.errors?.data
+ ? pushDanger(err.data.errors.data[0])
+ : pushDanger('Onbekende error.');
+ }
+
+ pushApiError(err, 'Onbekende error.');
+ setProcessingMode(null);
+ reject();
+ });
+ };
+
+ uploadChunk(submitData[currentChunkNth]).then();
+ });
+ }, [
+ chunkList,
+ data,
+ dataChunkSize,
+ updateProgressBarValue,
+ prevalidationRequestService,
+ fund.organization_id,
+ fund.id,
+ csvFile,
+ onCompleted,
+ pushApiError,
+ showInvalidRows,
+ pushDanger,
+ finalizeCancel,
+ ]);
+
+ const onConfirmUpload = useCallback(async () => {
+ pushSuccess('Inladen...', 'Inladen van gegevens voor controle op dubbele waarden!', {
+ icon: 'download-outline',
+ });
+
+ const validated = await startValidationToServer();
+
+ if (!validated) {
+ return;
+ }
+
+ setProgressBar(0);
+ updateProgressBarValue(0, 'Aan het uploaden...');
+ startUploadingToServer().then();
+ }, [pushSuccess, startUploadingToServer, startValidationToServer, updateProgressBarValue]);
+
+ const onDragEvent = useCallback((e: React.DragEvent, isDragOver: boolean) => {
+ e?.preventDefault();
+ e?.stopPropagation();
+
+ setIsDragOver(isDragOver);
+ }, []);
+
+ return (
+ >([]);
+ const [paginatorKey] = useState('prevalidation_requests');
+
+ const [recordTypes, setRecordTypes] = useState>(null);
+ const [prevalidationRequests, setPrevalidationRequests] = useState<
+ PaginationData & { meta: { failed_count?: number } }
+ >(null);
+
+ const [states] = useState([
+ { key: null, name: translate('prevalidation_requests.states.all') },
+ { key: 'pending', name: translate('prevalidation_requests.states.pending') },
+ { key: 'success', name: translate('prevalidation_requests.states.success') },
+ { key: 'fail', name: translate('prevalidation_requests.states.fail') },
+ ]);
+
+ const [filterValues, filterValuesActive, filterUpdate, filter] = useFilterNext<{
+ q?: string;
+ to?: string;
+ from?: string;
+ state?: string;
+ fund_id?: number;
+ page?: number;
+ per_page?: number;
+ }>(
+ {
+ q: '',
+ fund_id: null,
+ state: null,
+ from: null,
+ to: null,
+ page: 1,
+ per_page: paginatorService.getPerPage(paginatorKey, 10),
+ },
+ {
+ queryParams: {
+ q: StringParam,
+ fund_id: NumberParam,
+ state: createEnumParam(['pending', 'success', 'fail']),
+ from: StringParam,
+ to: StringParam,
+ per_page: NumberParam,
+ page: NumberParam,
+ },
+ },
+ );
+
+ const { headElement, configsElement } = useConfigurableTable(prevalidationRequestService.getColumns());
+
+ const fetchPrevalidationRequests = useCallback(() => {
+ if (activeOrganization?.allow_prevalidation_requests) {
+ setProgress(0);
+
+ prevalidationRequestService
+ .list(activeOrganization.id, { ...filterValuesActive })
+ .then((res) => setPrevalidationRequests(res.data))
+ .finally(() => setProgress(100));
+ }
+ }, [
+ activeOrganization?.allow_prevalidation_requests,
+ activeOrganization.id,
+ setProgress,
+ prevalidationRequestService,
+ filterValuesActive,
+ ]);
+
+ const fetchFunds = useCallback(() => {
+ setProgress(0);
+
+ fundService
+ .list(activeOrganization?.id, { state: 'active_paused_and_closed', per_page: 100 })
+ .then((res) => {
+ setFunds(res.data.data.filter((fund) => hasPermission(fund.organization, Permission.VALIDATE_RECORDS)));
+ })
+ .finally(() => setProgress(100));
+ }, [setProgress, fundService, activeOrganization?.id]);
+
+ const uploadPrevalidationRequests = useCallback(
+ (funds: Array, fundId: number, onCreate?: () => void) => {
+ openModal((modal) => (
+ {
+ prevalidationRequestService
+ .destroy(activeOrganization?.id, request.id)
+ .then(() => {
+ pushSuccess('Gelukt!', 'Verzoek verwijderd.');
+ fetchPrevalidationRequests();
+ modal.close();
+ })
+ .catch(pushApiError);
+ },
+ text: translate('modals.danger_zone.remove_prevalidation_request.buttons.confirm'),
+ }}
+ />
+ ));
+ },
+ [
+ openModal,
+ translate,
+ activeOrganization?.id,
+ fetchPrevalidationRequests,
+ prevalidationRequestService,
+ pushApiError,
+ pushSuccess,
+ ],
+ );
+
+ const fetchRecordTypes = useCallback(() => {
+ setProgress(0);
+
+ recordTypeService
+ .list()
+ .then((res) => setRecordTypes(res.data))
+ .finally(() => setProgress(100));
+ }, [recordTypeService, setProgress]);
+
+ useEffect(() => {
+ fetchRecordTypes();
+ }, [fetchRecordTypes]);
+
+ useEffect(() => {
+ fetchPrevalidationRequests();
+ }, [fetchPrevalidationRequests]);
+
+ useEffect(() => {
+ fetchFunds();
+ }, [fetchFunds]);
+
+ useEffect(() => {
+ if (!activeOrganization?.allow_prevalidation_requests) {
+ navigateState(DashboardRoutes.ORGANIZATIONS);
+ }
+ }, [activeOrganization?.allow_prevalidation_requests, navigateState]);
+
+ if (funds?.length === 0) {
+ return ;
csv_primary_key: string;
csv_required_keys: Array;
+ csv_required_keys_except_prefill: Array;
+ csv_required_keys_by_groups: Array;
formulas?: Array;
budget?: FundVoucherStatistics & {
used_active_vouchers?: string;
diff --git a/react/src/dashboard/props/models/FundCriteriaGroup.tsx b/react/src/dashboard/props/models/FundCriteriaGroup.tsx
new file mode 100644
index 000000000..d35e98784
--- /dev/null
+++ b/react/src/dashboard/props/models/FundCriteriaGroup.tsx
@@ -0,0 +1,7 @@
+export default interface FundCriteriaGroup {
+ id?: number;
+ title: string;
+ description_html?: string;
+ order: number;
+ required: boolean;
+}
diff --git a/react/src/dashboard/props/models/FundCriterion.tsx b/react/src/dashboard/props/models/FundCriterion.tsx
index 18add2eba..a03293db3 100644
--- a/react/src/dashboard/props/models/FundCriterion.tsx
+++ b/react/src/dashboard/props/models/FundCriterion.tsx
@@ -21,5 +21,7 @@ export default interface FundCriterion {
has_record?: boolean;
is_valid?: boolean;
fund_criteria_step_id?: number;
+ fund_criteria_group_id?: number;
+ fill_type?: 'manual' | 'prefill';
rules?: Array;
}
diff --git a/react/src/dashboard/props/models/Organization.tsx b/react/src/dashboard/props/models/Organization.tsx
index d3969f353..daebcd86f 100644
--- a/react/src/dashboard/props/models/Organization.tsx
+++ b/react/src/dashboard/props/models/Organization.tsx
@@ -121,6 +121,7 @@ export default interface Organization {
allow_profiles_relations?: boolean;
allow_profiles_households?: boolean;
allow_2fa_restrictions?: boolean;
+ allow_prevalidation_requests?: boolean;
allow_reservation_custom_fields: boolean;
auth_2fa_funds_policy: 'optional' | 'required' | 'restrict_features';
auth_2fa_funds_remember_ip: boolean;
diff --git a/react/src/dashboard/props/models/PrevalidationRequest.tsx b/react/src/dashboard/props/models/PrevalidationRequest.tsx
new file mode 100644
index 000000000..400db8994
--- /dev/null
+++ b/react/src/dashboard/props/models/PrevalidationRequest.tsx
@@ -0,0 +1,18 @@
+import Fund from './Fund';
+
+export default interface PrevalidationRequest {
+ id: number;
+ fund_id: number;
+ state: string;
+ bsn: string;
+ identity_address: string;
+ failed_reason?: string;
+ failed_reason_locale?: string;
+ fund?: Fund;
+ employee: {
+ id: number;
+ email?: string;
+ identity_address: string;
+ organization_id: number;
+ };
+}
diff --git a/react/src/dashboard/router/routes.tsx b/react/src/dashboard/router/routes.tsx
index a540e53be..bb298ce42 100644
--- a/react/src/dashboard/router/routes.tsx
+++ b/react/src/dashboard/router/routes.tsx
@@ -103,6 +103,7 @@ import ImplementationPreCheck from '../components/pages/implementation-pre-check
import ImplementationTranslations from '../components/pages/implementations-edit/ImplementationTranslations';
import ImplementationAnnouncements from '../components/pages/implementations-edit/ImplementationAnnouncements';
import ImplementationTermsAndPrivacy from '../components/pages/implementations-edit/ImplementationTermsAndPrivacy';
+import PrevalidationRequests from '../components/pages/person-prevalidations/PrevalidationRequests';
const router = new RouterBuilder();
@@ -649,6 +650,11 @@ router.state(DashboardRoutes.CSV_VALIDATION, , item: string) => {
diff --git a/react/src/dashboard/services/FundService.ts b/react/src/dashboard/services/FundService.ts
index 926a56eb9..d877de4f5 100644
--- a/react/src/dashboard/services/FundService.ts
+++ b/react/src/dashboard/services/FundService.ts
@@ -242,6 +242,12 @@ export class FundService {
return Papa.unparse([fund.csv_required_keys.filter((key) => !key.endsWith('_eligible'))]);
}
+ public sampleCSVForPrevalidationRequest(fund: Fund): string {
+ return Papa.unparse([
+ ['bsn', ...fund.csv_required_keys_except_prefill.filter((key) => !key.endsWith('_eligible'))],
+ ]);
+ }
+
public topUp(company_id: number, fund_id: number): Promise> {
return this.apiRequest.post(`${this.prefix}/${company_id}/funds/${fund_id}/top-up`);
}
diff --git a/react/src/dashboard/services/PrevalidationRequestService.ts b/react/src/dashboard/services/PrevalidationRequestService.ts
new file mode 100644
index 000000000..cafcb241b
--- /dev/null
+++ b/react/src/dashboard/services/PrevalidationRequestService.ts
@@ -0,0 +1,77 @@
+import { useState } from 'react';
+import ApiRequestService from './ApiRequestService';
+import ApiResponse, { ApiResponseSingle } from '../props/ApiResponses';
+import { ConfigurableTableColumn } from '../components/pages/vouchers/hooks/useConfigurableTable';
+import PrevalidationRequest from '../props/models/PrevalidationRequest';
+
+export class PrevalidationRequestService {
+ /**
+ * @param apiRequest
+ */
+ public constructor(protected apiRequest: ApiRequestService = new ApiRequestService()) {}
+
+ /**
+ * Url prefix
+ *
+ * @param data
+ */
+ public prefix = '/platform/organizations';
+
+ public list(organization_id: number, filters: object = {}): Promise> {
+ return this.apiRequest.get(`${this.prefix}/${organization_id}/prevalidation-requests`, filters);
+ }
+
+ public storeBatch(
+ organization_id: number,
+ data: Array<{ [key: string]: string }>,
+ fund_id: number = null,
+ file?: object,
+ ): Promise {
+ return this.apiRequest.post(`${this.prefix}/${organization_id}/prevalidation-requests/collection`, {
+ data: data,
+ fund_id: fund_id,
+ file,
+ });
+ }
+
+ public storeBatchValidate(
+ organization_id: number,
+ data: Array<{ [key: string]: string }>,
+ fund_id: number = null,
+ ): Promise> {
+ return this.apiRequest.post(`${this.prefix}/${organization_id}/prevalidation-requests/collection/validate`, {
+ data: data,
+ fund_id: fund_id,
+ });
+ }
+
+ public resubmitFailed(organization_id: number): Promise> {
+ return this.apiRequest.get(`${this.prefix}/${organization_id}/prevalidation-requests/resubmit-failed`);
+ }
+
+ public resubmit(organization_id: number, id: number): Promise> {
+ return this.apiRequest.get(`${this.prefix}/${organization_id}/prevalidation-requests/${id}/resubmit`);
+ }
+
+ public destroy(organization_id: number, id: number): Promise> {
+ return this.apiRequest.delete(`${this.prefix}/${organization_id}/prevalidation-requests/${id}`);
+ }
+
+ public getColumns(): Array {
+ const list = ['bsn', 'fund', 'employee', 'state', 'failed_reason'].filter((item) => item);
+
+ return list.map((key) => ({
+ key,
+ label: `prevalidation_requests.labels.${key}`,
+ tooltip: {
+ key: key,
+ title: `prevalidation_requests.labels.${key}`,
+ description: `prevalidation_requests.tooltips.${key}`,
+ },
+ }));
+ }
+}
+
+export function usePrevalidationRequestService(): PrevalidationRequestService {
+ return useState(new PrevalidationRequestService())[0];
+}
diff --git a/react/src/webshop/components/elements/file-uploader/FileUploader.tsx b/react/src/webshop/components/elements/file-uploader/FileUploader.tsx
index 9f4c8d091..532863099 100644
--- a/react/src/webshop/components/elements/file-uploader/FileUploader.tsx
+++ b/react/src/webshop/components/elements/file-uploader/FileUploader.tsx
@@ -68,7 +68,7 @@ export default function FileUploader({
| 'product_reservation_custom_field';
title?: string;
files?: Array;
- template?: 'default' | 'compact' | 'inline';
+ template?: 'default' | 'compact' | 'inline' | 'group';
hideInlineTitle?: boolean;
allowMultiple?: boolean;
maxFiles?: number;
@@ -298,6 +298,7 @@ export default function FileUploader({
className={classNames('block', 'block-file-uploader', {
'block-file-uploader-compact': template === 'compact',
'block-file-uploader-inline': template === 'inline',
+ 'block-file-uploader-group': template === 'group',
})}
data-dusk="fileUploader">
{translate('global.file_uploader.max_size')}
)}
- {(template === 'inline' || template === 'compact') && effectiveMaxFiles && (
+ {(template === 'inline' || template === 'compact' || template === 'group') && effectiveMaxFiles && (
+
+ setFund({ ...fund, criteria })}
onSaveCriteria={saveCriteria}
- bodyClassName={'collapsable-body'}
- footerClassName={'collapsable-footer'}
/>
);
diff --git a/react/src/dashboard/components/pages/person-prevalidations/PrevalidationRequests.tsx b/react/src/dashboard/components/pages/person-prevalidations/PrevalidationRequests.tsx
new file mode 100644
index 000000000..6fe03ac49
--- /dev/null
+++ b/react/src/dashboard/components/pages/person-prevalidations/PrevalidationRequests.tsx
@@ -0,0 +1,474 @@
+import React, { useState, useCallback, useEffect } from 'react';
+import { useFundService } from '../../../services/FundService';
+import Fund from '../../../props/models/Fund';
+import useTranslate from '../../../hooks/useTranslate';
+import LoadingCard from '../../elements/loading-card/LoadingCard';
+import { hasPermission } from '../../../helpers/utils';
+import useSetProgress from '../../../hooks/useSetProgress';
+import SelectControl from '../../elements/select-control/SelectControl';
+import SelectControlOptionsFund from '../../elements/select-control/templates/SelectControlOptionsFund';
+import useActiveOrganization from '../../../hooks/useActiveOrganization';
+import useOpenModal from '../../../hooks/useOpenModal';
+import usePaginatorService from '../../../modules/paginator/services/usePaginatorService';
+import { PaginationData } from '../../../props/ApiResponses';
+import PrevalidationRequest from '../../../props/models/PrevalidationRequest';
+import useConfigurableTable from '../vouchers/hooks/useConfigurableTable';
+import useFilterNext from '../../../modules/filter_next/useFilterNext';
+import ClickOutside from '../../elements/click-outside/ClickOutside';
+import FilterItemToggle from '../../elements/tables/elements/FilterItemToggle';
+import DatePickerControl from '../../elements/forms/controls/DatePickerControl';
+import { dateFormat, dateParse } from '../../../helpers/dates';
+import LoaderTableCard from '../../elements/loader-table-card/LoaderTableCard';
+import TableTopScroller from '../../elements/tables/TableTopScroller';
+import { strLimit } from '../../../helpers/string';
+import TableEmptyValue from '../../elements/table-empty-value/TableEmptyValue';
+import Paginator from '../../../modules/paginator/components/Paginator';
+import { createEnumParam, NumberParam, StringParam } from 'use-query-params';
+import EmptyCard from '../../elements/empty-card/EmptyCard';
+import { Permission } from '../../../props/models/Organization';
+import { usePrevalidationRequestService } from '../../../services/PrevalidationRequestService';
+import ModalPrevalidationRequestsUpload from '../../modals/ModalPrevalidationRequestsUpload';
+import RecordType from '../../../props/models/RecordType';
+import { useRecordTypeService } from '../../../services/RecordTypeService';
+import PrevalidationRequestStateLabels from '../../elements/resource-states/PrevalidationRequestStateLabels';
+import TableRowActions from '../../elements/tables/TableRowActions';
+import usePushSuccess from '../../../hooks/usePushSuccess';
+import usePushApiError from '../../../hooks/usePushApiError';
+import { DashboardRoutes } from '../../../modules/state_router/RouterBuilder';
+import { useNavigateState } from '../../../modules/state_router/Router';
+import ModalDangerZone from '../../modals/ModalDangerZone';
+
+export default function PrevalidationRequests() {
+ const translate = useTranslate();
+ const openModal = useOpenModal();
+ const setProgress = useSetProgress();
+ const pushApiError = usePushApiError();
+ const pushSuccess = usePushSuccess();
+ const navigateState = useNavigateState();
+ const activeOrganization = useActiveOrganization();
+
+ const fundService = useFundService();
+ const paginatorService = usePaginatorService();
+ const recordTypeService = useRecordTypeService();
+ const prevalidationRequestService = usePrevalidationRequestService();
+
+ const [funds, setFunds] = useState
+
+
+ );
+}
diff --git a/react/src/dashboard/components/pages/feature/Feature.tsx b/react/src/dashboard/components/pages/feature/Feature.tsx
index 3735f6e79..d08b09e6c 100644
--- a/react/src/dashboard/components/pages/feature/Feature.tsx
+++ b/react/src/dashboard/components/pages/feature/Feature.tsx
@@ -248,7 +248,7 @@ export default function Feature() {
/>
)}
- {feature.key === 'subsidy_funds' && (
+ {feature.key === 'product_funds' && (
Upload CSV-bestand
+
+ {step == Steps.select_fund && (
+
+
+
+ )}
+
+ {step == Steps.upload_csv && (
+
+ {
+ setFund(funds.find((fund) => fund.id === fund_id));
+ }}
+ options={funds}
+ allowSearch={false}
+ optionsComponent={SelectControlOptionsFund}
+ />
+
+
+ {translate('modals.modal_voucher_create.labels.fund')}
+
+ onDragEvent(e, true)}
+ onDragEnter={(e) => onDragEvent(e, true)}
+ onDragLeave={(e) => onDragEvent(e, false)}
+ onDragEnd={(e) => onDragEvent(e, false)}
+ onDrop={(e) => {
+ onDragEvent(e, false);
+ uploadFile(filterSelectedFiles(e.dataTransfer.files)?.[0]).then();
+ }}>
+
+
+
+ {
+ uploadFile(filterSelectedFiles(e.target.files)?.[0]).then();
+ e.target.value = null;
+ }}
+ />
+
+ {csvProgress <= CSVProgress.validated && (
+
+ )}
+ inputRef.current.click()}>
+
+ )}
+
+
+
+
+
+ {translate('csv_upload.labels.upload')}
+
+ {translate('csv_upload.labels.swipe')} +
+ + {translate('csv_upload.labels.swipe')} +
+ {csvProgress <= CSVProgress.validated && (
+
+ )}
+ {csvProgress <= CSVProgress.validated && (
+
+ )}
+
+
+ {csvProgress >= CSVProgress.uploading && (
+
+
+ )}
+
+ {csvFile && csvProgress < CSVProgress.uploading && (
+
+ {csvProgress == CSVProgress.uploading && (
+
+ )}
+ {csvProgress == CSVProgress.uploaded && (
+
+ )}
+
+
+
+
+
+ )}
+
+
+
+ {Object.keys(csvErrors).length === 0 && Object.keys(csvWarnings).length > 0 && (
+
+ {csvIsValid ? (
+
+ ) : (
+
+ )}
+
+
+
+ {csvFile.name}
+ {fileSize(csvFile.size)}
+ reset(false)}
+ />
+
+
+ {Object.keys(csvWarnings).map((key) => (
+
+ )}
+
+ {Object.keys(csvErrors).length > 0 && (
+ {csvWarnings[key]}
+ ))}
+
+ {Object.keys(csvErrors).map((key) => (
+
+ )}
+ {csvErrors[key]}
+ ))}
+
+ {csvProgress < CSVProgress.uploading && (
+
+ )}
+
+
+
+
+
+ {/* Cancel button */}
+
+
+ {/* Confirm selected fund button */}
+ {step == Steps.select_fund && (
+
+ )}
+
+ {/* Upload selected CSV or cancel button */}
+ {step == Steps.upload_csv && (
+
+ {csvProgress}
+ {csvProgress != CSVProgress.validated}
+ {csvIsValid}
+ {csvProgress < CSVProgress.uploaded ? (
+
+ ) : (
+
+ )}
+
+ )}
+
+
+
+
+
+ );
+}
diff --git a/react/src/dashboard/hooks/useBeforeUnload.tsx b/react/src/dashboard/hooks/useBeforeUnload.tsx
new file mode 100644
index 000000000..9ca589be6
--- /dev/null
+++ b/react/src/dashboard/hooks/useBeforeUnload.tsx
@@ -0,0 +1,18 @@
+import { useEffect } from 'react';
+
+export default function useBeforeUnload(enabled: boolean) {
+ useEffect(() => {
+ if (!enabled) {
+ return;
+ }
+
+ const handleBeforeUnload = (event: BeforeUnloadEvent) => {
+ event.preventDefault();
+ event.returnValue = '';
+ };
+
+ window.addEventListener('beforeunload', handleBeforeUnload);
+
+ return () => window.removeEventListener('beforeunload', handleBeforeUnload);
+ }, [enabled]);
+}
diff --git a/react/src/dashboard/i18n/i18n-nl.js b/react/src/dashboard/i18n/i18n-nl.js
index 6f7a7ced5..3bcacab2b 100644
--- a/react/src/dashboard/i18n/i18n-nl.js
+++ b/react/src/dashboard/i18n/i18n-nl.js
@@ -74,7 +74,6 @@ export default {
'validation-request': 'Validatie verzoek',
'restore-email': 'Inloggen via e-mail',
},
- // MENU = menu-validator.pug, menu-provider.pug, menu-sponsor.pug
menu: {
organizational: 'Organisatie',
implementation: 'Webshop',
@@ -102,7 +101,6 @@ export default {
components,
- // MEAPP LANDINGSPAGE = index.pug
meapp_index: {
navbar: {
municipality: 'GEMEENTE',
@@ -141,7 +139,6 @@ export default {
app: 'De app bewaart een profiel van de gebruiker, dit profiel maakt het mogelijk dat de gegevens hergebruikt kunnen worden voor het mee doen aan andere regelingen.',
},
},
- // PROVIDER HOME = home-provider.pug
home_provider: {
header: {
default: {
@@ -277,7 +274,6 @@ export default {
},
},
},
- // SPONSOR HOME = home-sponsor.pug
home_sponsor: {
header: {
title: 'Gemeentelijk dashboard',
@@ -336,10 +332,8 @@ export default {
},
},
},
- // VALIDATOR HOME = home-validator.pug
// DON'T TRANSLATE , THE VALIDATOR WILL NOT HAVE A LANDINGSPAGE
- // CSV-VALIDATION = csv-validation.pug
csv_validation: {
header: {
title: 'Aanvragers toevoegen',
@@ -350,7 +344,6 @@ export default {
upload: 'Upload .csv bestand',
},
},
- // FINANCIAL DASHBOARD = financial-dashboard-transaction.pug
financial_dashboard: {
header: {
title: 'Financiele statistieken',
@@ -432,7 +425,6 @@ export default {
show_notifications: 'Show +{{ count }} notifications',
},
- // EDIT IMPLEMENTATION = implementation-edit.pug
implementation_edit: {
header: {
title: 'Website instellingen',
@@ -521,7 +513,6 @@ export default {
},
},
- // EDIT FUNDS = funds-edit.pug
funds_edit: {
header: {
title_add: 'Fonds toevoegen',
@@ -550,7 +541,6 @@ export default {
},
},
- // PRE CHECK FUNDS = funds-pre-check.pug
funds_pre_check: {
header: {
title: 'Regelingencheck',
@@ -569,7 +559,6 @@ export default {
},
},
- // SHOW FUNDS = funds-show.pug
funds_show: {
titles: {
top_ups: 'Bekijk aanvullingen',
@@ -629,12 +618,10 @@ export default {
},
},
- // FUNDS = funds.pug
funds_pug: {
title: 'Fondsen',
},
- // HOME = home.pug
home: {
buttons: {
login: 'Log in',
@@ -642,7 +629,6 @@ export default {
},
},
- // EDIT OFFICES = offices-edits.pug
offices_edit: {
header: {
title_add: 'Vestiging toevoegen',
@@ -672,7 +658,6 @@ export default {
},
},
- // OFFICES = offices.pug
offices: {
buttons: {
adjust: 'Bewerk',
@@ -707,7 +692,6 @@ export default {
},
},
- // ORGANIZATION PROVIDERS = provider-organizations.pug
provider_organizations: {
header: {
title: 'Aanbieders',
@@ -766,7 +750,6 @@ export default {
},
},
- // ORGANIZATION VALIDATORS = organization-validators.pug
organization_validators: {
labels: {
address: 'Adres',
@@ -780,7 +763,6 @@ export default {
},
},
- //EDIT ORGANIZATIONS = organization-edit.pug
organization_edit: {
header: {
title_add: 'Organisatie aanmaken',
@@ -822,7 +804,6 @@ export default {
},
},
- // ORGANIZATIONS = organizations.pug
organizations: {
header: {
title: 'Kies een organisatie om in te loggen',
@@ -840,7 +821,6 @@ export default {
},
},
- // SHOW PRODUCTS = product-show.pug
//TRANSLATION NOT FINISHED -> PAGE NOT DONE
products_show: {
header: {
@@ -869,7 +849,6 @@ export default {
},
},
- // PRODUCTS = product.pug
products: {
offers: 'Aanbod',
add: 'Voeg aanbod toe',
@@ -904,7 +883,6 @@ export default {
},
},
- // PRODUCTS = product.pug
sponsor_products: {
offers: 'Aanbod',
labels: {
@@ -976,7 +954,6 @@ export default {
},
},
- // PROVIDER IDENTITIES = provider-identities.pug
provider_identities: {
labels: {
address: 'Adres',
@@ -990,7 +967,6 @@ export default {
},
},
- // EDIT PROVIDER IDENTITIES = provider-identity-edit.pug
provider_identity_edit: {
buttons: {
adjust: 'Beoordelaar aanpassen',
@@ -1003,7 +979,6 @@ export default {
},
},
- // SIGN UP FORM FOR PROVIDERS = provider-sign-up.pug
sign_up_provider: {
header: {
main_header: 'Aanmelden als aanbieder',
@@ -1227,7 +1202,6 @@ export default {
title: 'Fondsen',
},
},
- // SIGN UP FORM FOR SPONSORS = sponsor-sign-up.pug
sign_up_sponsor: {
header: {
main_header: 'Aanmelden als sponsor',
@@ -1361,7 +1335,6 @@ export default {
description: 'Aanmelden voor een fonds is alleen mogelijk via onze website op een vaste computer.',
},
},
- // SIGN UP FORM FOR VALIDATORS = validator-sign-up.pug
sign_up_validator: {
header: {
main_header: 'Aanmelden als beoordelaar',
@@ -1500,7 +1473,6 @@ export default {
},
},
- // Organization-employees.pug
organization_employees: {
labels: {
email: 'E-mailadres',
@@ -1532,7 +1504,6 @@ export default {
},
},
- // Organization-employees.pug
implementation_funds: {
labels: {
name: 'Naam',
@@ -1546,7 +1517,6 @@ export default {
},
},
- // RESERVATION = modals/modal-reservation-create.pug
reservation_create: {
tooltips: {
product: [
@@ -1557,7 +1527,6 @@ export default {
},
},
- // VALIDATION REQUEST - validation-request.pug
validation_request: {
buttons: {
accept: 'Accepteren',
@@ -1573,7 +1542,6 @@ export default {
iban_confirmation: 'IBAN verkeerde bevestiging',
},
- // OVERVIEW VALIDATIONS REQUESTS = validation-requests.pug
validation_requests: {
labels: {
id: 'ID',
@@ -1748,10 +1716,8 @@ export default {
},
},
- // EMPTY BLOCK = empty-block.pug
// No translations needed
- // FUND CARD FOR PROVIDERS = fund-card-provider.pug
fund_card_provider_finances: {
status: {
hold: 'Wachten',
@@ -1800,13 +1766,9 @@ export default {
},
},
- // PROVIDER MENU = menu-provider.pug
// No translations needed
- // PROVIDER MENU = menu-sponsor.pug
// No translations needed
- // VALIDATOR MENU = menu-validator.pug
// No translations needed
- // ADDING FUNDS MODAL - modal-funds-add.pug
modal_funds_add: {
header: {
title: 'Budget toevoegen aan fonds',
@@ -1849,7 +1811,6 @@ export default {
},
},
- // SELECT PHOTO = photo-selector.pug
photo_selector: {
labels: {
image: 'Afbeelding',
@@ -1859,7 +1820,6 @@ export default {
},
},
- // PRE VALIDATED TABLE = prevalidated_table.pug
prevalidated_table: {
header: {
title: 'Klaarzetten',
@@ -1892,13 +1852,9 @@ export default {
},
},
- // PROGRESS BAR = progress-bar.pug
// No translations needed
- // SCHEDULE CONTROL = schedule-controle.pug
// No translations needed
- // PAGINATOR LOADER = paginator-loader.pug
-
paginator_loader: {
buttons: {
load: 'Laad meer activatie codes',
@@ -1919,7 +1875,6 @@ export default {
},
},
- // MENU = langing/navbar.pug
topnavbar: {
items: {
funds: 'Fondsen',
@@ -1937,7 +1892,6 @@ export default {
funds: 'Fondsen',
},
},
- // AUTHENTICATION POPUP = popup-auth.pug
popup_auth: {
header: {
title: 'Inloggen op het dashboard',
diff --git a/react/src/dashboard/i18n/nl/i18n-modals-danger_zone.js b/react/src/dashboard/i18n/nl/i18n-modals-danger_zone.js
index 28d3b9850..956a3befa 100644
--- a/react/src/dashboard/i18n/nl/i18n-modals-danger_zone.js
+++ b/react/src/dashboard/i18n/nl/i18n-modals-danger_zone.js
@@ -16,6 +16,7 @@ import recreate_bi_connection from './modals/danger-zone/recreate-bi-connection'
import remove_reservation_field from './modals/danger-zone/remove-reservation-field';
import remove_mollie_connection from './modals/danger-zone/remove-mollie-connection';
import exclude_pre_check_fund from './modals/danger-zone/exclude_pre_check_fund';
+import remove_prevalidation_request from './modals/danger-zone/remove-prevalidation-request';
export default {
remove_provider_application,
@@ -36,4 +37,5 @@ export default {
remove_reservation_field,
remove_mollie_connection,
exclude_pre_check_fund,
+ remove_prevalidation_request,
};
diff --git a/react/src/dashboard/i18n/nl/i18n-pages.js b/react/src/dashboard/i18n/nl/i18n-pages.js
index fba76d806..86bb6d537 100644
--- a/react/src/dashboard/i18n/nl/i18n-pages.js
+++ b/react/src/dashboard/i18n/nl/i18n-pages.js
@@ -39,6 +39,7 @@ import product_funds from './pages/product-funds';
import reimbursement_categories from './pages/reimbursement-categories';
import provider_organization_funds from './pages/provider-organization-funds';
import transaction_bulks from './pages/transaction-bulks';
+import prevalidation_requests from './pages/prevalidation-requests';
export default {
vouchers,
@@ -82,4 +83,5 @@ export default {
reimbursement_categories,
provider_organization_funds,
transaction_bulks,
+ prevalidation_requests,
};
diff --git a/react/src/dashboard/i18n/nl/modals/danger-zone/remove-prevalidation-request.js b/react/src/dashboard/i18n/nl/modals/danger-zone/remove-prevalidation-request.js
new file mode 100644
index 000000000..f39ac0c62
--- /dev/null
+++ b/react/src/dashboard/i18n/nl/modals/danger-zone/remove-prevalidation-request.js
@@ -0,0 +1,8 @@
+export default {
+ title: 'Gegevens verwijderen',
+ description: 'Weet je zeker dat je deze gegevens wilt verwijderen?',
+ buttons: {
+ cancel: 'Annuleren',
+ confirm: 'Bevestigen',
+ },
+};
diff --git a/react/src/dashboard/i18n/nl/pages/prevalidation-requests.js b/react/src/dashboard/i18n/nl/pages/prevalidation-requests.js
new file mode 100644
index 000000000..0240a2b29
--- /dev/null
+++ b/react/src/dashboard/i18n/nl/pages/prevalidation-requests.js
@@ -0,0 +1,39 @@
+export default {
+ header: {
+ title: 'Klaarzetten met BRP',
+ },
+ labels: {
+ bsn: 'BSN',
+ fund: 'Fonds',
+ employee: 'Medewerker',
+ failed_reason: 'Reden van mislukking',
+ created_at: 'Datum',
+ search: 'Zoeken',
+ state: 'Status',
+ from: 'Van',
+ to: 'Tot',
+ },
+ buttons: {
+ upload: 'Upload .csv bestand',
+ resubmit: 'Opnieuw verzenden',
+ delete: 'Verwijderen',
+ resubmit_failed: 'Mislukte verzoeken opnieuw verzenden',
+ },
+ states: {
+ pending: 'In behandeling',
+ success: 'Gelukt',
+ fail: 'Mislukt',
+ all: 'Alle',
+ },
+ tooltips: {
+ bsn: 'BSN',
+ fund: 'Fonds',
+ employee: 'Medewerker',
+ state: 'Status',
+ failed_reason: 'Reden van mislukking',
+ },
+ empty: {
+ title: 'Geen aanvragers klaargezet',
+ description: 'Er zijn nog geen aanvragers klaargezet voor dit fonds.',
+ },
+};
diff --git a/react/src/dashboard/layout/elements/aside/LayoutAsideSponsor.tsx b/react/src/dashboard/layout/elements/aside/LayoutAsideSponsor.tsx
index ffa69167a..a9f426b95 100644
--- a/react/src/dashboard/layout/elements/aside/LayoutAsideSponsor.tsx
+++ b/react/src/dashboard/layout/elements/aside/LayoutAsideSponsor.tsx
@@ -77,6 +77,20 @@ export default function LayoutAsideSponsor({ organization }: { organization: Org
false,
),
},
+ {
+ id: 'prevalidation_requests',
+ name: 'Klaarzetten met BRP',
+ state: DashboardRoutes.PREVALIDATION_REQUESTS,
+ dusk: 'csvPrevalidationRequestsPage',
+ stateParams: { organizationId: organization?.id },
+ show:
+ organization.allow_prevalidation_requests &&
+ hasPermission(
+ organization,
+ [Permission.VALIDATE_RECORDS, Permission.MANAGE_VALIDATORS],
+ false,
+ ),
+ },
{
id: 'fund_requests',
name: 'Aanvragen',
diff --git a/react/src/dashboard/modules/state_router/RouterBuilder.tsx b/react/src/dashboard/modules/state_router/RouterBuilder.tsx
index 754bd99b2..f14fc0d7a 100644
--- a/react/src/dashboard/modules/state_router/RouterBuilder.tsx
+++ b/react/src/dashboard/modules/state_router/RouterBuilder.tsx
@@ -98,6 +98,7 @@ export enum DashboardRoutes {
ORGANIZATION_NOTIFICATIONS = 'organization-notifications',
FEEDBACK = 'feedback',
CSV_VALIDATION = 'csv-validation',
+ PREVALIDATION_REQUESTS = 'prevalidation-requests',
PREFERENCE_EMAILS = 'preferences-emails',
PREFERENCE_NOTIFICATIONS = 'preferences-notifications',
SECURITY_2FA = 'security-2fa',
diff --git a/react/src/dashboard/props/models/Fund.tsx b/react/src/dashboard/props/models/Fund.tsx
index 62f4392f4..a8940df90 100644
--- a/react/src/dashboard/props/models/Fund.tsx
+++ b/react/src/dashboard/props/models/Fund.tsx
@@ -117,6 +117,8 @@ export default interface Fund {
faq?: Array
+
+
+
+ {translate('prevalidation_requests.header.title')} ({prevalidationRequests?.meta?.total})
+
+
+
+
+ {prevalidationRequests.meta.failed_count > 0 && (
+
+ )}
+
+
+
+
+
+ filter.update({ fund_id })}
+ optionsComponent={SelectControlOptionsFund}
+ dusk="prevalidationsSelectFund"
+ />
+
+
+ {filter.show && (
+ filter.resetFilters()}>
+
+ Wis filters
+
+ )}
+
+ {!filter.show && (
+
+
+ )}
+
+
+ filter.update({ q: e.target.value })}
+ />
+
+
+ filter.setShow(false)}>
+ {filter.show && (
+
+
+
+
+ )}
+
+
+
+
+
+
+
+
+ filter.update({ q: e.target.value })}
+ />
+
+
+
+ filter.update({ state })}
+ />
+
+
+
+ filter.update({ from: dateFormat(from) })}
+ />
+
+
+
+ filter.update({ to: dateFormat(to) })}
+ />
+
+
+
+
+
+ {prevalidationRequests?.meta.total > 0 && (
+
+ {configsElement}
+
+
+
+ {headElement}
+
+
+ {prevalidationRequests.data.map((row) => (
+
+
+
+ | {row.bsn} | + +
+
+ {row.fund ? strLimit(row.fund?.name, 32) :
+
+
+ {row.fund ? (
+ strLimit(row.fund?.implementation?.name, 32)
+ ) : (
+
+ |
+ + {row.employee?.email || 'Onbekend'} + | +
+ |
+
+ {row.state === 'fail' && row.failed_reason ? (
+ row.failed_reason_locale
+ ) : (
+ |
+
+
+ {row.state === 'fail' ? (
+
+
+ )}
+ />
+ ) : (
+ {
+ resubmitRequest(row);
+ close();
+ }}>
+ {' '}
+ {translate(
+ 'prevalidation_requests.buttons.resubmit',
+ )}
+
+ {
+ deleteRequest(row);
+ close();
+ }}>
+ {' '}
+ {translate('prevalidation_requests.buttons.delete')}
+
+ |
+
+
+ )}
+
{translate('global.file_uploader.max_files', { count: effectiveMaxFiles })}
@@ -365,7 +366,7 @@ export default function FileUploader({
{fileItems.length > 0 && (
- {template === 'inline' && !hideInlineTitle && (
+ {(template === 'inline' || template === 'group') && !hideInlineTitle && (
{translate('global.file_uploader.attachments')}
{item.has_preview && !hidePreviewButton && (
diff --git a/react/src/webshop/components/pages/fund-requests-show/elements/FundRequestRecordsBlock.tsx b/react/src/webshop/components/pages/fund-requests-show/elements/FundRequestRecordsBlock.tsx
index ba5ad1a66..773ec5e22 100644
--- a/react/src/webshop/components/pages/fund-requests-show/elements/FundRequestRecordsBlock.tsx
+++ b/react/src/webshop/components/pages/fund-requests-show/elements/FundRequestRecordsBlock.tsx
@@ -1,4 +1,4 @@
-import React, { Dispatch, Fragment, SetStateAction } from 'react';
+import React, { Dispatch, Fragment, SetStateAction, useMemo } from 'react';
import FundRequest from '../../../../../dashboard/props/models/FundRequest';
import useTranslate from '../../../../../dashboard/hooks/useTranslate';
import FundRequestRecordsBlockItem from './FundRequestRecordsBlockItem';
@@ -26,6 +26,17 @@ export default function FundRequestRecordsBlock({
}) {
const translate = useTranslate();
+ const visibleRecordTypeKeys = useMemo(() => {
+ return (
+ fundRequest?.fund?.criteria
+ ?.filter(
+ (criterion) =>
+ !['children_same_address_nth', 'partner_same_address_nth'].includes(criterion.record_type_key),
+ )
+ .map((criterion) => criterion.record_type_key) || []
+ );
+ }, [fundRequest?.fund?.criteria]);
+
return (
);
diff --git a/react/src/webshop/components/pages/funds-request/FundRequest.tsx b/react/src/webshop/components/pages/funds-request/FundRequest.tsx
index 6c77f49a6..3de6b63c3 100644
--- a/react/src/webshop/components/pages/funds-request/FundRequest.tsx
+++ b/react/src/webshop/components/pages/funds-request/FundRequest.tsx
@@ -43,6 +43,8 @@ import { orderBy, sortBy } from 'lodash';
import FundRequestHelpBlock from './elements/FundRequestHelpBlock';
import FundRequestStepPhysicalCardRequestAddress from './elements/steps/FundRequestStepPhysicalCardRequestAddress';
import { WebshopRoutes } from '../../../modules/state_router/RouterBuilder';
+import FundCriteriaGroup from '../../../../dashboard/props/models/FundCriteriaGroup';
+import FundRequestPersonBsnApiWarning from './elements/FundRequestPersonBsnApiWarning';
export type LocalCriterion = FundCriterion & {
input_value?: string;
@@ -57,10 +59,18 @@ export type LocalCriterion = FundCriterion & {
requested?: boolean;
};
-type FundCriteriaStepLocal = FundCriteriaStep & {
+export type FundCriteriaStepLocal = FundCriteriaStep & {
uid?: string;
uploaderTemplate: 'inline' | 'default';
criteria: Array;
+ groups: Array }>;
+};
+
+export type Prefills = {
+ person: Array<{ record_type_key: string; value: string }>;
+ partner?: Array<{ record_type_key: string; value: string }>;
+ children?: Array>;
+ error?: { key: string; message: string };
};
export default function FundRequest() {
@@ -110,12 +120,14 @@ export default function FundRequest() {
const [criteriaStepKeys, setCriteriaStepKeys] = useState([]);
const [pendingCriteria, setPendingCriteria] = useState>([]);
+ const [personPrefills, setPersonPrefills] = useState(null);
const [fund, setFund] = useState(null);
const [vouchers, setVouchers] = useState>(null);
const [recordTypes, setRecordTypes] = useState>(null);
const [fundRequests, setFundRequests] = useState>(null);
const [personApiRecordsFetch, setPersonApiRecordsFetch] = useState(false);
+ const [prefillsError, setPrefillsError] = useState<{ key: string; message: string }>(null);
const bsnIsKnown = useMemo(() => !!authIdentity?.bsn, [authIdentity]);
const emailSetupShow = useMemo(() => !authIdentity?.email, [authIdentity]);
@@ -143,6 +155,16 @@ export default function FundRequest() {
}, {});
}, [pendingCriteria]);
+ const hasPersonBsnApi = useMemo(
+ () =>
+ bsnIsKnown &&
+ fund &&
+ authIdentity &&
+ fund.allow_fund_request_prefill &&
+ fund.organization.has_person_bsn_api,
+ [authIdentity, bsnIsKnown, fund],
+ );
+
const shouldRequestRecord = useShouldRequestRecord(recordTypesByKey, recordValuesByType);
const criteriaSteps = useMemo>(() => {
@@ -153,14 +175,42 @@ export default function FundRequest() {
const fundSteps = fund.criteria_steps.map((step) => step.id);
const hasOrders = pendingCriteria.filter((item) => item.order !== null).length > 0;
+ const prefillGuards = {
+ children_same_address_nth: (p: Prefills) => p.children?.length,
+ partner_same_address_nth: (p: Prefills) => p.partner?.length,
+ };
+
const customSteps = fund.criteria_steps.map(
(step): FundCriteriaStepLocal => ({
...step,
uid: `criteria_step_${step.id}`,
uploaderTemplate: 'inline',
+ groups: fund.criteria_groups
+ .map((group) => ({
+ ...group,
+ criteria: orderBy(
+ pendingCriteria
+ .filter((criterion) => criterion.fund_criteria_step_id == step.id)
+ .filter((criterion) => criterion.fund_criteria_group_id === group.id)
+ .map((criterion) => ({ ...criterion, requested: shouldRequestRecord(criterion) }))
+ .filter((item) => item.requested),
+ 'order',
+ ),
+ }))
+ .filter((group) => group.criteria.length > 0),
criteria: orderBy(
pendingCriteria
.filter((criterion) => criterion.fund_criteria_step_id == step.id)
+ .filter((criterion) => criterion.fund_criteria_group_id === null)
+ .filter((criterion) => {
+ if (criterion.fill_type !== 'prefill' || !personPrefills) {
+ return true;
+ }
+
+ const guard = prefillGuards[criterion.record_type_key];
+
+ return guard ? !!guard(personPrefills) : true;
+ })
.map((criterion) => ({ ...criterion, requested: shouldRequestRecord(criterion) })),
'order',
),
@@ -178,15 +228,20 @@ export default function FundRequest() {
order: 1000,
criteria: [{ ...criterion, requested: shouldRequestRecord(criterion) }],
uploaderTemplate: 'default',
+ groups: [],
}),
);
const combinedSteps = [...customSteps, ...stepLessCriteria].filter(
- (step) => step.criteria.filter((criterion) => criterion.requested).length > 0,
+ (step) =>
+ step.criteria.filter((criterion) => criterion.requested).length > 0 ||
+ step.groups
+ .map((group) => group.criteria.filter((criterion) => criterion.requested).length > 0)
+ .filter((group) => group).length > 0,
);
return sortBy(combinedSteps, 'order');
- }, [fund, pendingCriteria, recordTypesByKey, shouldRequestRecord]);
+ }, [fund, pendingCriteria, personPrefills, recordTypesByKey, shouldRequestRecord]);
const setStepByName = useCallback(
(stepName: string) => {
@@ -480,33 +535,37 @@ export default function FundRequest() {
}, [authIdentity, fund, fundRequestService, setProgress]);
const checkPersonBsnApiRecords = useCallback(() => {
- if (
- !bsnIsKnown ||
- !fund ||
- !authIdentity ||
- !fund.allow_fund_request_prefill ||
- !fund.organization.has_person_bsn_api ||
- personApiRecordsFetch
- ) {
+ if (!hasPersonBsnApi || personApiRecordsFetch) {
return;
}
setPersonApiRecordsFetch(true);
fundService.getPersonPrefills(fund.id).then((res) => {
+ if (res.data.error?.key) {
+ setPrefillsError(res.data.error);
+ return;
+ }
+
+ setPersonPrefills(res.data);
+
setPendingCriteria((criteria) => {
return [
...criteria.map((criterion) => {
- criterion.input_value =
- res.data.filter((item) => item.record_type_key === criterion.record_type_key)[0]?.value ||
- criterion.input_value;
+ if (criterion.fill_type === 'prefill') {
+ const prefillItem = res.data.person.filter(
+ (item) => item.record_type_key === criterion.record_type_key,
+ )[0];
+
+ criterion.input_value = prefillItem?.value || criterion.input_value;
+ }
return criterion;
}),
];
});
});
- }, [bsnIsKnown, fund, fundService, authIdentity, personApiRecordsFetch]);
+ }, [hasPersonBsnApi, personApiRecordsFetch, fundService, fund]);
useEffect(() => {
fetchFund();
@@ -552,8 +611,10 @@ export default function FundRequest() {
// The user has to sign-in first
const voucher = getFirstActiveFundVoucher(fund, vouchers);
const pendingRequests = fundRequests.filter((request) => request.state === 'pending');
- const pendingCriteria = fund.criteria.filter((criterion) => !criterion.is_valid || !criterion.has_record);
const invalidCriteria = fund.criteria.filter((criterion) => !criterion.is_valid);
+ const pendingCriteria = fund.criteria
+ .filter((criterion) => !criterion.is_valid || !criterion.has_record)
+ .map((criterion) => ({ ...criterion, requested: true }));
// Voucher already received, go to the voucher
if (voucher) {
@@ -612,11 +673,21 @@ export default function FundRequest() {
useEffect(() => {
const removedData = {};
+ const addedData = [];
const criteria = pendingCriteria
.map((item) => {
const defaultValue = fundService.getCriterionControlDefaultValue(item.record_type, item.operator);
+ if (shouldRequestRecord(item) && !item.requested && personPrefills && item.fill_type === 'prefill') {
+ addedData.push(item.record_type_key);
+ const prefillItem = personPrefills.person.filter(
+ (prefill) => prefill.record_type_key === item.record_type_key,
+ )[0];
+
+ item.input_value = prefillItem?.value || item.input_value;
+ }
+
if (!shouldRequestRecord(item) && item.input_value != defaultValue) {
removedData[item.record_type_key] = {
input_value: item.input_value,
@@ -633,6 +704,8 @@ export default function FundRequest() {
delete item.is_checked;
}
+ item.requested = shouldRequestRecord(item);
+
return { ...item };
})
.map((item) => {
@@ -643,10 +716,10 @@ export default function FundRequest() {
return { ...item };
});
- if (Object.keys(removedData).length > 0) {
+ if (Object.keys(removedData).length > 0 || addedData.length > 0) {
setPendingCriteria([...criteria]);
}
- }, [fundService, pendingCriteria, shouldRequestRecord]);
+ }, [fundService, pendingCriteria, personPrefills, shouldRequestRecord]);
useEffect(() => {
if (autoSubmit && steps?.[step] == 'confirm_criteria' && !autoSubmitted) {
@@ -655,7 +728,17 @@ export default function FundRequest() {
}
}, [autoSubmit, autoSubmitted, step, steps, submitConfirmCriteria]);
- if (!fund || !vouchers || !fundRequests || (steps[step] == 'confirm_criteria' && autoSubmit)) {
+ if (prefillsError) {
+ return ;
- recordTypes: Array;
+ recordTypesByKey: { [_key: string]: RecordType };
submitInProgress: boolean;
uploaderTemplate: 'default' | 'inline';
setSubmitInProgress: React.Dispatch>;
formDataBuild: (criteria: Array) => object;
setCriterion: (index: number, update: Partial) => void;
+ groups: Array }>;
+ prefills: Prefills;
}) {
const translate = useTranslate();
const setProgress = useSetProgress();
const fundRequestService = useFundRequestService();
- const recordTypesByKey = useMemo(() => {
- return recordTypes?.reduce((acc, type) => ({ ...acc, [type.key]: type }), {});
- }, [recordTypes]);
+ const [errors, setErrors] = useState({});
+
+ const hasPrefills = useMemo(() => {
+ return (
+ criteria.filter((criterion) => criterion.fill_type === 'prefill').length > 0 ||
+ groups
+ .map((group) => group.criteria.filter((criterion) => criterion.fill_type === 'prefill').length > 0)
+ .filter((group) => group).length > 0
+ );
+ }, [criteria, groups]);
// Submit or Validate record criteria
const validateCriteria = useCallback(
@@ -83,10 +88,14 @@ export default function FundRequestStepCriteria({
// Submit criteria record
const validateStepCriteria = useCallback(
- (criteria: Array) => {
+ (criteria: Array, groups: Array }>) => {
+ const items: Array = [
+ ...criteria,
+ ...groups.reduce((list, group) => [...list, ...group.criteria], []),
+ ];
setProgress(0);
- validateCriteria(criteria)
+ validateCriteria(items)
.then((errors) => {
const indexes = uniq(
Object.keys(errors || {})
@@ -94,8 +103,15 @@ export default function FundRequestStepCriteria({
.map((errorKey) => parseInt(errorKey.split('.')[1])),
);
- if (indexes.length === 0) {
- criteria.forEach((item) => setCriterion(item.id, { errors: {} }));
+ const groupIndexes = uniq(
+ Object.keys(errors || {})
+ .filter((err) => err.startsWith('criteria_groups.'))
+ .map((errorKey) => parseInt(errorKey.split('.')[1])),
+ );
+
+ if (indexes.length === 0 && groupIndexes.length === 0) {
+ items.forEach((item) => setCriterion(item.id, { errors: {} }));
+ setErrors({});
return onNextStep();
}
@@ -114,35 +130,24 @@ export default function FundRequestStepCriteria({
};
}, {});
- return [...list, { id: criteria[index].id, errors: errorsList }];
+ return [...list, { id: items[index].id, errors: errorsList }];
}, []);
- criteria.forEach((item) => {
+ items.forEach((item) => {
setCriterion(item.id, {
errors: errorsList.find((errItem) => errItem.id == item.id)?.errors || {},
});
});
+
+ setErrors(errors);
})
.catch((err: ResponseError) => {
console.error(err);
+ setErrors({});
})
.finally(() => setProgress(100));
},
- [onNextStep, setProgress, setCriterion, validateCriteria],
- );
-
- const isLabelRequired = useCallback(
- (criteria: LocalCriterion) => {
- return !criteria.optional && fund.criteria_label_requirement_show !== 'optional';
- },
- [fund.criteria_label_requirement_show],
- );
-
- const isLabelOptional = useCallback(
- (criteria: LocalCriterion) => {
- return criteria.optional && fund.criteria_label_requirement_show !== 'required';
- },
- [fund.criteria_label_requirement_show],
+ [onNextStep, setProgress, setCriterion, validateCriteria, setErrors],
);
return (
@@ -153,198 +158,155 @@ export default function FundRequestStepCriteria({
className="sign_up-pane"
onSubmit={(e) => {
e.preventDefault();
- validateStepCriteria(criteria);
+ validateStepCriteria(criteria, groups);
}}>
{fileItems.length}
diff --git a/react/src/webshop/components/elements/file-uploader/FileUploaderItemView.tsx b/react/src/webshop/components/elements/file-uploader/FileUploaderItemView.tsx
index f10898d53..9bf169d4a 100644
--- a/react/src/webshop/components/elements/file-uploader/FileUploaderItemView.tsx
+++ b/react/src/webshop/components/elements/file-uploader/FileUploaderItemView.tsx
@@ -18,7 +18,7 @@ export default function FileUploaderItemView({
removeFile,
}: {
item: FileUploaderItem;
- template?: 'default' | 'compact' | 'inline';
+ template?: 'default' | 'compact' | 'inline' | 'group';
hidePreviewButton?: boolean;
hideDownloadButton?: boolean;
readOnly?: boolean;
@@ -65,6 +65,16 @@ export default function FileUploaderItemView({
[fileService],
);
+ const progressValue = useMemo(() => {
+ const value = Number(item.progress);
+
+ if (!Number.isFinite(value)) {
+ return 0;
+ }
+
+ return Math.max(0, Math.min(100, Math.round(value)));
+ }, [item.progress]);
+
return (
{name}
-
+
+ {template === 'group' && {progressValue}%
}
@@ -41,20 +52,22 @@ export default function FundRequestRecordsBlock({
className="fund-request-records"
aria-labelledby="fund-request-records-title"
aria-describedby="fund-request-records-subtitle">
- {fundRequest?.records.map((record) => (
-
+
+
+ );
+}
diff --git a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepCriteria.tsx b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepCriteria.tsx
index fe95e65a7..9268f4b45 100644
--- a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepCriteria.tsx
+++ b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepCriteria.tsx
@@ -1,25 +1,19 @@
-import React, { Fragment, useCallback, useMemo } from 'react';
+import React, { Fragment, useCallback, useMemo, useState } from 'react';
import Fund from '../../../../../props/models/Fund';
import useTranslate from '../../../../../../dashboard/hooks/useTranslate';
-import { LocalCriterion } from '../../FundRequest';
-import Markdown from '../../../../elements/markdown/Markdown';
-import SelectControl from '../../../../../../dashboard/components/elements/select-control/SelectControl';
-import UIControlCheckbox from '../../../../../../dashboard/components/elements/forms/ui-controls/UIControlCheckbox';
-import UIControlStep from '../../../../../../dashboard/components/elements/forms/ui-controls/UIControlStep';
-import UIControlDate from '../../../../../../dashboard/components/elements/forms/ui-controls/UIControlDate';
-import { dateFormat, dateParse } from '../../../../../../dashboard/helpers/dates';
-import UIControlNumber from '../../../../../../dashboard/components/elements/forms/ui-controls/UIControlNumber';
-import UIControlText from '../../../../../../dashboard/components/elements/forms/ui-controls/UIControlText';
-import FormError from '../../../../../../dashboard/components/elements/forms/errors/FormError';
-import FileUploader from '../../../../elements/file-uploader/FileUploader';
+import { LocalCriterion, Prefills } from '../../FundRequest';
import RecordType from '../../../../../../dashboard/props/models/RecordType';
import { ResponseError } from '../../../../../../dashboard/props/ApiResponses';
import { useFundRequestService } from '../../../../../services/FundRequestService';
import { uniq } from 'lodash';
import useSetProgress from '../../../../../../dashboard/hooks/useSetProgress';
import SignUpFooter from '../../../../elements/sign-up/SignUpFooter';
-import classNames from 'classnames';
-import FormLabel from '../../../../elements/forms/FormLabel';
+import FundRequestStepCriterion from './FundRequestStepCriterion';
+import FundCriteriaGroup from '../../../../../../dashboard/props/models/FundCriteriaGroup';
+import FormError from '../../../../../../dashboard/components/elements/forms/errors/FormError';
+import Markdown from '../../../../elements/markdown/Markdown';
+import FundRequestCriteriaPartner from './criteria/FundRequestCriteriaPartner';
+import FundRequestCriteriaChildren from './criteria/FundRequestCriteriaChildren';
export default function FundRequestStepCriteria({
fund,
@@ -31,12 +25,14 @@ export default function FundRequestStepCriteria({
progress,
bsnWarning,
criteria,
- recordTypes,
+ recordTypesByKey,
submitInProgress,
setSubmitInProgress,
uploaderTemplate,
formDataBuild,
setCriterion,
+ groups,
+ prefills,
}: {
fund: Fund;
step: number;
@@ -47,21 +43,30 @@ export default function FundRequestStepCriteria({
progress: React.ReactElement;
bsnWarning: React.ReactElement;
criteria: Array
+
+
+
+
+
+ + {translate(`fund_request.cards.${errorKey}.title`)} +
+
+
+ + {translate(`fund_request.cards.${errorKey}.heading`)} +
+
+
+ })
+
+
+ + {translate(`fund_request.cards.${errorKey}.contacts`, { + name: fund.organization.name, + })} +
+
+
+ {translate('fund_request.cards.back')}
+
+
+
+
+
+ +
{title}
- {criteria.map((criterion, index) => ( -
- {uploaderTemplate === 'inline' ? (
-
- {(criterion.title ||
- criterion.title_default ||
- (criterion.description && criterion.description !== '_')) && (
-
-
-
+
- {criterion.title || criterion.title_default}
-
-
+ {hasPrefills && (
+
+
+ )}
+
+ {groups.map((group, index) => (
+
+
+ {translate('fund_request.prefills.title')}
+
- {criterion.extra_description && criterion.extra_description !== '_' && (
-
-
- )}
+ {fund.help_enabled && (
+ {translate('fund_request.prefills.subtitle')}
+ )}
+
+ ) => void;
+ isGroup?: boolean;
+}) {
+ const translate = useTranslate();
+ const fileUploaderTemplate: 'default' | 'inline' | 'group' = isGroup ? 'group' : uploaderTemplate;
+
+ const isLabelRequired = useCallback(
+ (criteria: LocalCriterion) => {
+ return !criteria.optional && fund.criteria_label_requirement_show !== 'optional';
+ },
+ [fund.criteria_label_requirement_show],
+ );
+
+ const isLabelOptional = useCallback(
+ (criteria: LocalCriterion) => {
+ return criteria.optional && fund.criteria_label_requirement_show !== 'required';
+ },
+ [fund.criteria_label_requirement_show],
+ );
+
+ return (
+
+ {!(isGroup && criterion.control_type == 'ui_control_checkbox') && (
+
+ {uploaderTemplate === 'inline' ? (
+
+ {(criterion.title ||
+ criterion.title_default ||
+ (criterion.description && criterion.description !== '_')) && (
+
+ ) : (
+
+
+ )}
+
+ )}
+
+ {
+ setCriterion(criterion.id, {
+ files,
+ files_uid: files.map((file) => file.uid),
+ });
+ }}
+ />
+ )}
+
+ );
+}
diff --git a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestValuesOverview.tsx b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestValuesOverview.tsx
index fca0e285a..da6117476 100644
--- a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestValuesOverview.tsx
+++ b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestValuesOverview.tsx
@@ -1,11 +1,15 @@
-import React, { Fragment, useCallback } from 'react';
+import React, { Fragment, useCallback, useMemo } from 'react';
import FileUploader from '../../../../elements/file-uploader/FileUploader';
-import { LocalCriterion } from '../../FundRequest';
+import { FundCriteriaStepLocal, LocalCriterion, Prefills } from '../../FundRequest';
import useTranslate from '../../../../../../dashboard/hooks/useTranslate';
-import FundCriteriaStep from '../../../../../../dashboard/props/models/FundCriteriaStep';
import SignUpFooter from '../../../../elements/sign-up/SignUpFooter';
import FundRequestHelpBlock from '../FundRequestHelpBlock';
import Fund from '../../../../../props/models/Fund';
+import FileModel from '../../../../../../dashboard/props/models/File';
+import Markdown from '../../../../elements/markdown/Markdown';
+import FundRequestCriteriaPartner from './criteria/FundRequestCriteriaPartner';
+import FundRequestCriteriaChildren from './criteria/FundRequestCriteriaChildren';
+import RecordType from '../../../../../../dashboard/props/models/RecordType';
export default function FundRequestValuesOverview({
fund,
@@ -17,6 +21,8 @@ export default function FundRequestValuesOverview({
onPrevStep,
progress,
bsnWarning,
+ prefills,
+ recordTypesByKey,
}: {
fund: Fund;
address: {
@@ -29,25 +35,46 @@ export default function FundRequestValuesOverview({
onSubmitRequest: () => void;
contactInformation: string;
emailSetupShow: boolean;
- criteriaSteps: Array<
- FundCriteriaStep & { uid?: string; uploaderTemplate: 'inline' | 'default'; criteria: Array }
- >;
+ criteriaSteps: Array;
onPrevStep: () => void;
progress: React.ReactElement;
bsnWarning: React.ReactElement;
+ prefills: Prefills;
+ recordTypesByKey: { [_key: string]: RecordType };
}) {
const translate = useTranslate();
- const criterionValue = useCallback((criterion: LocalCriterion) => {
- if (criterion.record_type.type === 'select' || criterion.record_type.type === 'select_number') {
- return (
- criterion.record_type?.options?.find((item) => item?.value === criterion.input_value)?.name ||
- criterion.input_value
+ const groupFiles = useMemo<{ [key: number]: Array }>(() => {
+ return criteriaSteps
+ ?.reduce((acc, step) => [...acc, ...step.groups], [])
+ .reduce(
+ (acc, group) => ({
+ ...acc,
+ [group.id]: group.criteria
+ .filter((item) => item.requested)
+ .reduce((list, item) => [...list, ...item.files], []),
+ }),
+ {},
);
- }
+ }, [criteriaSteps]);
- return criterion.input_value;
- }, []);
+ const criterionValue = useCallback(
+ (criterion: LocalCriterion, inGroup: boolean = false) => {
+ if (criterion.record_type.type === 'select' || criterion.record_type.type === 'select_number') {
+ return (
+ criterion.record_type?.options?.find((item) => item?.value === criterion.input_value)?.name ||
+ criterion.input_value
+ );
+ }
+
+ if (inGroup && criterion.record_type.type === 'bool' && criterion.record_type.control_type === 'checkbox') {
+ return criterion.input_value || translate('fund_request.options.no');
+ }
+
+ return criterion.input_value;
+ },
+ [translate],
+ );
return (
@@ -77,45 +104,145 @@ export default function FundRequestValuesOverview({
- {group.title}
+ {group.description_html && (
+
- {criterion.description && criterion.description !== '_' && (
-
-
+ )}
+
+
)}
-
- ) : (
-
+
+ {translate('form.required')}
+
- {
- setCriterion(criterion.id, {
- files,
- files_uid: files.map((file) => file.uid),
- });
- }}
- />
- )}
-
- ))}
+ {criteria
+ .filter((criterion) => criterion.fill_type === 'manual')
+ .map((criterion, index) => (
+
- {criterion.description && criterion.description !== '_' && (
-
+
+
-
- )}
-
-
+ {group.criteria
+ .filter((criterion) => criterion.fill_type === 'prefill')
+ .map((criterion) => (
+
-
- {!criterion.description && criterion.description !== '_' && (
-
+
+ ))}
+ {criterion.title || criterion.title_default}
+
+
+ {criterion.input_value || '-'}
+
+ {criterion.title_default}
- )}
-
- {uploaderTemplate !== 'inline' && recordTypesByKey?.[criterion?.record_type?.key]?.name}
-
-
- {criterion.control_type == 'select_control' && (
- {
- setCriterion(criterion.id, { input_value: input_value });
- }}
- dusk="selectControl"
- placeholder={translate(
- 'fund_request.sign_up.fund_request_step_criteria.make_a_choice',
- )}
- multiline={true}
- />
- )}
-
- {criterion.control_type == 'ui_control_checkbox' && (
- {
- setCriterion(criterion.id, {
- is_checked: checked,
- input_value: checked ? criterion.value : null,
- });
- }}
- />
- )}
-
- {criterion.control_type == 'ui_control_step' && (
- {
- setCriterion(criterion.id, { input_value: value.toFixed() });
- }}
- name={criterion.record_type.key}
- min={0}
- max={32}
- dataDusk="controlStep"
- />
- )}
-
- {criterion.control_type == 'ui_control_date' && (
- {
- setCriterion(criterion.id, {
- input_value: date ? dateFormat(date, 'dd-MM-yyyy') : '',
- });
- }}
- id={`criterion_${criterion.id}`}
- dataDusk="controlDate"
- />
)}
- {criterion.control_type == 'ui_control_number' && (
- {
- setCriterion(criterion.id, { input_value: (value || '').toString() });
- }}
- />
- )}
+ {group.criteria
+ .filter((criterion) => criterion.fill_type === 'manual')
+ .map((criterion, index) => (
+
+ {criteria.filter((criterion) => criterion.fill_type === 'prefill').length > 0 && (
+
+ {criteria
+ .filter((criterion) => criterion.fill_type === 'prefill')
+ .filter((criterion) => criterion.record_type_key === 'partner_same_address_nth')
+ .length > 0 &&
+ prefills.partner.length > 0 && (
+ {
- setCriterion(criterion.id, { input_value: e.target.value });
- }}
- />
- )}
+ {criteria
+ .filter((criterion) => criterion.fill_type === 'prefill')
+ .filter(
+ (criterion) => criterion.record_type_key === 'children_same_address_nth',
+ ).length > 0 &&
+ prefills.children.length > 0 && (
+ {
- setCriterion(criterion.id, { input_value: (value || '').toString() });
- }}
- />
+ {criteria
+ .filter((criterion) => criterion.fill_type === 'prefill')
+ .filter(
+ (criterion) =>
+ !['children_same_address_nth', 'partner_same_address_nth'].includes(
+ criterion.record_type_key,
+ ),
+ ).length > 0 && (
+
)}
-
- {criterion.show_attachment && (
-
+
+ )}
+
+ {criteria
+ .filter((criterion) => criterion.fill_type === 'prefill')
+ .filter(
+ (criterion) =>
+ ![
+ 'children_same_address_nth',
+ 'partner_same_address_nth',
+ ].includes(criterion.record_type_key),
+ )
+ .map((criterion) => (
+
+
+
+ ))}
+
+ {criterion.title || criterion.title_default}
+
+
+ {criterion.input_value || '-'}
+
+
+
+ )}
+
+
+
+ {criterion.extra_description && criterion.extra_description !== '_' && (
+
+ {criterion.title || criterion.title_default}
+
+
+
+ )}
+
+
+ {criterion.description && criterion.description !== '_' && (
+
+
+
+
+ {criterion.description && criterion.description !== '_' && (
+
+
+ {!criterion.description && criterion.description !== '_' && (
+ {criterion.title_default}
+ )}
+
+ {!(isGroup && criterion.control_type == 'ui_control_checkbox') && (
+
+ {uploaderTemplate !== 'inline' && recordTypesByKey?.[criterion?.record_type?.key]?.name}
+
+ )}
+
+ {criterion.control_type == 'select_control' && (
+ {
+ setCriterion(criterion.id, { input_value: input_value });
+ }}
+ dusk="selectControl"
+ placeholder={translate('fund_request.sign_up.fund_request_step_criteria.make_a_choice')}
+ multiline={true}
+ />
+ )}
+
+ {criterion.control_type == 'ui_control_checkbox' && (
+ {
+ setCriterion(criterion.id, {
+ is_checked: checked,
+ input_value: checked ? criterion.value : null,
+ });
+ }}
+ />
+ )}
+
+ {criterion.control_type == 'ui_control_step' && (
+ {
+ setCriterion(criterion.id, { input_value: value.toFixed() });
+ }}
+ name={criterion.record_type.key}
+ min={0}
+ max={32}
+ dataDusk="controlStep"
+ />
+ )}
+
+ {criterion.control_type == 'ui_control_date' && (
+ {
+ setCriterion(criterion.id, {
+ input_value: date ? dateFormat(date, 'dd-MM-yyyy') : '',
+ });
+ }}
+ id={`criterion_${criterion.id}`}
+ dataDusk="controlDate"
+ />
+ )}
+
+ {criterion.control_type == 'ui_control_number' && (
+ {
+ setCriterion(criterion.id, { input_value: (value || '').toString() });
+ }}
+ />
+ )}
+
+ {criterion.control_type == 'ui_control_text' && (
+ {
+ setCriterion(criterion.id, { input_value: e.target.value });
+ }}
+ />
+ )}
+
+ {criterion.control_type == 'ui_control_currency' && (
+ {
+ setCriterion(criterion.id, { input_value: (value || '').toString() });
+ }}
+ />
+ )}
+
+
+ {criterion.show_attachment &&
+ (criterion.control_type !== 'ui_control_checkbox' || criterion.input_value === criterion.value) && (
+ {index + 1}
{step.title}
-
+
+ {step.groups.map((group) => (
+
+ {group.criteria.filter((item) => item.requested).length > 0 && (
+
+
+ )}
+
+ ))}
+
+ {step.criteria
+ .filter((criterion) => criterion.fill_type === 'prefill')
+ .filter((criterion) => criterion.record_type_key === 'partner_same_address_nth')
+ .length > 0 &&
+ prefills.partner.length > 0 && (
+
+
+ );
+}
diff --git a/react/src/webshop/components/pages/funds-request/elements/steps/criteria/FundRequestCriteriaPartner.tsx b/react/src/webshop/components/pages/funds-request/elements/steps/criteria/FundRequestCriteriaPartner.tsx
new file mode 100644
index 000000000..d160e7bdb
--- /dev/null
+++ b/react/src/webshop/components/pages/funds-request/elements/steps/criteria/FundRequestCriteriaPartner.tsx
@@ -0,0 +1,43 @@
+import React, { Fragment, useCallback } from 'react';
+import useTranslate from '../../../../../../../dashboard/hooks/useTranslate';
+import RecordType from '../../../../../../../dashboard/props/models/RecordType';
+import { Prefills } from '../../../FundRequest';
+import { upperFirst } from 'lodash';
+
+export default function FundRequestCriteriaPartner({
+ prefills,
+ recordTypesByKey,
+}: {
+ prefills: Prefills;
+ recordTypesByKey: { [_key: string]: RecordType };
+}) {
+ const translate = useTranslate();
+
+ const splitPartnerLabel = useCallback((text?: string) => {
+ const match = text ? text.match(/^(Partner)\s+(.+)$/) : null;
+ return match ? { partner: match[1], value: upperFirst(match[2]) } : null;
+ }, []);
+
+ return (
+
+
+ );
+}
diff --git a/react/src/webshop/i18n/nl/directives/fund-criterion.mjs b/react/src/webshop/i18n/nl/directives/fund-criterion.mjs
index b7c7f83a3..dfa548d11 100644
--- a/react/src/webshop/i18n/nl/directives/fund-criterion.mjs
+++ b/react/src/webshop/i18n/nl/directives/fund-criterion.mjs
@@ -1,5 +1,4 @@
export default {
- // CRITERIA FOR FUNDS = fund-criterion.pug
labels: {
general: {
location: 'Groningen',
diff --git a/react/src/webshop/i18n/nl/directives/google-map.mjs b/react/src/webshop/i18n/nl/directives/google-map.mjs
index 7cc643a3c..6be613475 100644
--- a/react/src/webshop/i18n/nl/directives/google-map.mjs
+++ b/react/src/webshop/i18n/nl/directives/google-map.mjs
@@ -1,5 +1,4 @@
export default {
- // GOOGLE MAPS = google-map.pug
cancel: 'Annuleren',
no_data: 'Geen data',
diff --git a/react/src/webshop/i18n/nl/modals/modal-auth.mjs b/react/src/webshop/i18n/nl/modals/modal-auth.mjs
index a84c01888..8d3c501c8 100644
--- a/react/src/webshop/i18n/nl/modals/modal-auth.mjs
+++ b/react/src/webshop/i18n/nl/modals/modal-auth.mjs
@@ -1,5 +1,4 @@
export default {
- // AUTHENTICATION POPUP = popup-auth.pug
header: {
title: 'E-mail verstuurd',
title_sr: 'Start aanmelden',
diff --git a/react/src/webshop/i18n/nl/pages/error-page.mjs b/react/src/webshop/i18n/nl/pages/error-page.mjs
index 84124b9de..0d819fb1c 100644
--- a/react/src/webshop/i18n/nl/pages/error-page.mjs
+++ b/react/src/webshop/i18n/nl/pages/error-page.mjs
@@ -1,5 +1,4 @@
export default {
- // error-page.pug
404: {
title: 'Pagina niet gevonden',
button: 'Terug naar home',
diff --git a/react/src/webshop/i18n/nl/pages/fund-activate.mjs b/react/src/webshop/i18n/nl/pages/fund-activate.mjs
index e62f06397..d3050154e 100644
--- a/react/src/webshop/i18n/nl/pages/fund-activate.mjs
+++ b/react/src/webshop/i18n/nl/pages/fund-activate.mjs
@@ -1,5 +1,4 @@
export default {
- // PAGE = fund-activate.pug
header: {
title: 'Bevestig uw inkomen',
vergoedingen: {
diff --git a/react/src/webshop/i18n/nl/pages/fund-request-clarification.mjs b/react/src/webshop/i18n/nl/pages/fund-request-clarification.mjs
index 61bdce21d..a6085a052 100644
--- a/react/src/webshop/i18n/nl/pages/fund-request-clarification.mjs
+++ b/react/src/webshop/i18n/nl/pages/fund-request-clarification.mjs
@@ -1,5 +1,4 @@
export default {
- // FUND REQUEST VALIDATION CLARIFICATION = fund-request-clarification.pug
block_title: '{{ fund_name }} aanvulverzoek',
labels: {
question: 'Vraag',
diff --git a/react/src/webshop/i18n/nl/pages/fund-request.mjs b/react/src/webshop/i18n/nl/pages/fund-request.mjs
index f3eca749b..aba64e7c9 100644
--- a/react/src/webshop/i18n/nl/pages/fund-request.mjs
+++ b/react/src/webshop/i18n/nl/pages/fund-request.mjs
@@ -87,7 +87,6 @@ export default {
send: 'Verzenden',
},
- // VALIDATION REQUEST FOR FUNDS = fund_request.pug
approved_request_exists: 'Er bestaat al een goedgekeurde aanvraag. Neem contact op met de beheerder.',
fund_not_active: 'Het fonds waar u voor zich probeert aan te melden is niet actief.',
bsn_record_is_mandatory: 'Een BSN is verplicht voor het doen van een aanvraag.',
@@ -232,4 +231,45 @@ export default {
kindpakket_2018_eligible: 'Ja, ik verklaar dat ik recht heb op kindpakket.',
},
},
+ options: {
+ no: 'Nee',
+ },
+ prefills: {
+ title: 'Controleer of de gegevens correct zijn.',
+ subtitle: 'Als uw informatie niet correct is, kunt u onderaan op de knop klikken.',
+ children: 'Kinderen',
+ child: 'Kind',
+ partner: 'Gegevens van uw partner',
+ },
+ cards: {
+ back: 'Terug',
+
+ taken_by_partner: {
+ title: 'Dit tegoed is al geactiveerd',
+ heading: 'Aanvraag mislukt',
+ description:
+ 'U krijgt deze melding omdat het tegoed is geactiveerd door een
familielid of voogd.
De tegoeden zijn beschikbaar in het account van de persoon die
deze als eerste heeft geactiveerd.', + contacts: 'Neem voor vragen contact op met {{name}}.', + }, + not_filled_required_criteria: { + title: 'Ontbrekende gegevens', + heading: 'Aanvraag mislukt', + description: + 'U krijgt deze melding omdat een aantal gegevens van u niet zijn gevonden in het externe systeem. Hierdoor kan uw aanvraag niet volledig beoordeeld worden.', + contacts: 'Neem voor vragen contact op met {{name}}.', + }, + connection_error: { + title: 'Technische storing', + heading: 'Aanvraag mislukt', + description: + 'U krijgt deze melding omdat er sprake is van een technische storing. U kunt het op een later moment opnieuw proberen.', + contacts: 'Neem voor vragen contact op met {{name}}.', + }, + not_found: { + title: 'Uw gegevens zijn niet gevonden', + heading: 'Aanvraag mislukt', + description: 'U krijgt deze melding omdat uw gegevens niet gevonden zijn in het externe systeem.', + contacts: 'Neem voor vragen contact op met {{name}}.', + }, + }, }; diff --git a/react/src/webshop/i18n/nl/pages/fund.mjs b/react/src/webshop/i18n/nl/pages/fund.mjs index dfd21f2ea..a1fcc4612 100644 --- a/react/src/webshop/i18n/nl/pages/fund.mjs +++ b/react/src/webshop/i18n/nl/pages/fund.mjs @@ -1,5 +1,4 @@ export default { - // APPLY FOR FUNDS = fund-apply.pug header: { title: '{{fund_name}} aanmelden', criteria: 'Voorwaarden ({{ nth }})', diff --git a/react/src/webshop/i18n/nl/pages/funds.mjs b/react/src/webshop/i18n/nl/pages/funds.mjs index a95c613ce..6a39b3f35 100644 --- a/react/src/webshop/i18n/nl/pages/funds.mjs +++ b/react/src/webshop/i18n/nl/pages/funds.mjs @@ -1,5 +1,4 @@ export default { - // FUNDS = funds.pug header: { title: 'Aanvragen', subtitle: '', diff --git a/react/src/webshop/i18n/nl/pages/home.mjs b/react/src/webshop/i18n/nl/pages/home.mjs index 89316f4ec..eb9981061 100644 --- a/react/src/webshop/i18n/nl/pages/home.mjs +++ b/react/src/webshop/i18n/nl/pages/home.mjs @@ -1,5 +1,4 @@ export default { - // HOME = home.pug header: { title: '{{implementation}}', subtitle: diff --git a/react/src/webshop/i18n/nl/pages/record-validations.mjs b/react/src/webshop/i18n/nl/pages/record-validations.mjs index 42039dd27..4348e064a 100644 --- a/react/src/webshop/i18n/nl/pages/record-validations.mjs +++ b/react/src/webshop/i18n/nl/pages/record-validations.mjs @@ -1,5 +1,4 @@ export default { - // VALIDATIONS OF THE RECORDS = record-validations.pug header: { title: 'Mijn persoonsgegevens', }, diff --git a/react/src/webshop/i18n/nl/pages/records-create.mjs b/react/src/webshop/i18n/nl/pages/records-create.mjs index 404af9496..2d22647ac 100644 --- a/react/src/webshop/i18n/nl/pages/records-create.mjs +++ b/react/src/webshop/i18n/nl/pages/records-create.mjs @@ -1,5 +1,4 @@ export default { - // CREATE A RECORD = record.create.pug header: { title: 'Persoonsgegevens aanmaken', }, diff --git a/react/src/webshop/i18n/nl/pages/records-validate.mjs b/react/src/webshop/i18n/nl/pages/records-validate.mjs index 60f631f4f..42d8d05f1 100644 --- a/react/src/webshop/i18n/nl/pages/records-validate.mjs +++ b/react/src/webshop/i18n/nl/pages/records-validate.mjs @@ -1,5 +1,4 @@ export default { - // VALIDATE A RECORD = record-validate.pug header: { title: 'Mijn persoonsgegevens', }, diff --git a/react/src/webshop/i18n/nl/pages/records.mjs b/react/src/webshop/i18n/nl/pages/records.mjs index ceb3694c7..53f77015d 100644 --- a/react/src/webshop/i18n/nl/pages/records.mjs +++ b/react/src/webshop/i18n/nl/pages/records.mjs @@ -1,5 +1,4 @@ export default { - // RECORDS = records.pug header: { title: 'Persoonsgegevens', }, diff --git a/react/src/webshop/i18n/nl/pages/signup.mjs b/react/src/webshop/i18n/nl/pages/signup.mjs index 69be0429f..d0d84b295 100644 --- a/react/src/webshop/i18n/nl/pages/signup.mjs +++ b/react/src/webshop/i18n/nl/pages/signup.mjs @@ -1,5 +1,4 @@ export default { - // SIGNUP = sign-up.pug items: { title: 'Inloggen', page_title: 'Inloggen{{pageTitleSuffix}}', diff --git a/react/src/webshop/i18n/translated/ar.json b/react/src/webshop/i18n/translated/ar.json index 756bdb2eb..238a0ecd1 100644 --- a/react/src/webshop/i18n/translated/ar.json +++ b/react/src/webshop/i18n/translated/ar.json @@ -1087,6 +1087,43 @@ "subtitle": "تحتوي هذه الصفحة على معلومات حول الطلب. يمكن الاطلاع على الحالة والبيانات المكتملة وأي أسئلة إضافية هنا.", "modal": { "title": "سؤال إضافي" + }, + "cards": { + "back": "رجوع", + "connection_error": { + "contacts": "للأسئلة، اتصل على {{name}}.", + "description": "تظهر لك هذه الرسالة بسبب وجود خطأ فني. يمكنك المحاولة مرة أخرى في وقت لاحق.", + "heading": "فشل الطلب", + "title": "عطل فني" + }, + "not_filled_required_criteria": { + "contacts": "للأسئلة، اتصل على {{name}}.", + "description": "تتلقى هذه الرسالة لأن بعض التفاصيل الخاصة بك لم يتم العثور عليها في النظام الخارجي. ونتيجة لذلك، لا يمكن تقييم طلبك بشكل كامل.", + "heading": "فشل الطلب", + "title": "البيانات المفقودة" + }, + "not_found": { + "contacts": "للأسئلة، اتصل على {{name}}.", + "description": "تظهر لك هذه الرسالة لأن بياناتك لم يتم العثور عليها في النظام الخارجي.", + "heading": "فشل الطلب", + "title": "لم يتم العثور على بياناتك" + }, + "taken_by_partner": { + "contacts": "للأسئلة، اتصل على {{name}}.", + "description": "ستصلك هذه الرسالة لأن الرصيد تم تفعيله من قبل أحد أفراد العائلة أو ولي الأمر
.
يتوفر الرصيد في حساب الشخص الذي قام
بتفعيله أولاً.", + "heading": "فشل الطلب", + "title": "تم تفعيل هذا الرصيد بالفعل" + } + }, + "options": { + "no": "لا يوجد" + }, + "prefills": { + "child": "الطفل", + "children": "الأطفال", + "partner": "تفاصيل شريكك", + "subtitle": "إذا كانت معلوماتك غير صحيحة، يمكنك النقر على الزر الموجود في الأسفل.", + "title": "تحقق من صحة البيانات." } }, "fund_requests": { diff --git a/react/src/webshop/i18n/translated/de.json b/react/src/webshop/i18n/translated/de.json index b08299dd0..9a80d9e87 100644 --- a/react/src/webshop/i18n/translated/de.json +++ b/react/src/webshop/i18n/translated/de.json @@ -664,6 +664,43 @@ "subtitle": "Diese Seite enthält Informationen über die Bewerbung. Der Status, die ausgefüllten Daten und eventuelle Zusatzfragen können hier eingesehen werden.", "modal": { "title": "Zusätzliche Frage" + }, + "cards": { + "back": "Zurück", + "connection_error": { + "contacts": "Bei Fragen wenden Sie sich bitte an {{name}}.", + "description": "Sie erhalten diese Meldung, weil ein technischer Fehler aufgetreten ist. Sie können es zu einem späteren Zeitpunkt erneut versuchen.", + "heading": "Anfrage fehlgeschlagen", + "title": "Technisches Versagen" + }, + "not_filled_required_criteria": { + "contacts": "Bei Fragen wenden Sie sich bitte an {{name}}.", + "description": "Sie erhalten diese Meldung, weil einige Ihrer Angaben im externen System nicht gefunden wurden. Aus diesem Grund kann Ihre Bewerbung nicht vollständig geprüft werden.", + "heading": "Anfrage fehlgeschlagen", + "title": "Fehlende Daten" + }, + "not_found": { + "contacts": "Bei Fragen wenden Sie sich bitte an {{name}}.", + "description": "Sie erhalten diese Meldung, weil Ihre Daten im externen System nicht gefunden wurden.", + "heading": "Anfrage fehlgeschlagen", + "title": "Ihre Angaben wurden nicht gefunden" + }, + "taken_by_partner": { + "contacts": "Bei Fragen wenden Sie sich bitte an {{name}}.", + "description": "Sie erhalten diese Meldung, weil das Guthaben von einem
Familienmitglied oder Erziehungsberechtigten aktiviert wurde.
Das Guthaben ist auf dem Konto der Person verfügbar, die
es zuerst aktiviert hat.", + "heading": "Anfrage fehlgeschlagen", + "title": "Dieser Kredit ist bereits aktiviert worden" + } + }, + "options": { + "no": "Nein" + }, + "prefills": { + "child": "Kind", + "children": "Kinder", + "partner": "Angaben zu Ihrem Partner", + "subtitle": "Wenn Ihre Angaben nicht korrekt sind, können Sie auf die Schaltfläche am unteren Rand klicken.", + "title": "Prüfen Sie, ob die Daten korrekt sind." } }, "fund_requests": { diff --git a/react/src/webshop/i18n/translated/en-US.json b/react/src/webshop/i18n/translated/en-US.json index 7dc508832..7b48340c8 100644 --- a/react/src/webshop/i18n/translated/en-US.json +++ b/react/src/webshop/i18n/translated/en-US.json @@ -842,6 +842,43 @@ "subtitle": "This page contains information about the application. The status, completed data and any additional questions can be viewed here.", "modal": { "title": "Additional question" + }, + "cards": { + "back": "Back", + "connection_error": { + "contacts": "For questions, contact {{name}}.", + "description": "You are receiving this message because there is a technical error. You can try again at a later time.", + "heading": "Application failed", + "title": "Technical failure" + }, + "not_filled_required_criteria": { + "contacts": "For questions, contact {{name}}.", + "description": "You are receiving this message because some of your information was not found in the external system. As a result, your application cannot be fully evaluated.", + "heading": "Application failed", + "title": "Missing data" + }, + "not_found": { + "contacts": "For questions, contact {{name}}.", + "description": "You get this message because your data was not found in the external system.", + "heading": "Application failed", + "title": "Your information was not found" + }, + "taken_by_partner": { + "contacts": "For questions, contact {{name}}.", + "description": "You get this message because the credit was activated by a
family member or guardian.
The credit is available in the account of the person who
activated it first.", + "heading": "Application failed", + "title": "This credit has already been activated" + } + }, + "options": { + "no": "No" + }, + "prefills": { + "child": "Child", + "children": "Children", + "partner": "Details of your partner", + "subtitle": "If your information is incorrect, you can click the button at the bottom.", + "title": "Check that the data is correct." } }, "fund_requests": { diff --git a/react/src/webshop/i18n/translated/fr.json b/react/src/webshop/i18n/translated/fr.json index 7cd2ee46b..0f1f38f90 100644 --- a/react/src/webshop/i18n/translated/fr.json +++ b/react/src/webshop/i18n/translated/fr.json @@ -664,6 +664,43 @@ "subtitle": "Cette page contient des informations sur la demande. L'état d'avancement, les données complétées et les éventuelles questions complémentaires peuvent être consultés ici.", "modal": { "title": "Question complémentaire" + }, + "cards": { + "back": "Retour", + "connection_error": { + "contacts": "Pour toute question, veuillez contacter {{name}}.", + "description": "Vous recevez ce message en raison d'une erreur technique. Vous pouvez réessayer ultérieurement.", + "heading": "Échec de la demande", + "title": "Défaillance technique" + }, + "not_filled_required_criteria": { + "contacts": "Pour toute question, veuillez contacter {{name}}.", + "description": "Vous recevez ce message parce que certaines de vos données n'ont pas été trouvées dans le système externe. Par conséquent, votre demande ne peut pas être évaluée dans son intégralité.", + "heading": "Échec de la demande", + "title": "Données manquantes" + }, + "not_found": { + "contacts": "Pour toute question, veuillez contacter {{name}}.", + "description": "Vous obtenez ce message parce que vos données n'ont pas été trouvées dans le système externe.", + "heading": "Échec de la demande", + "title": "Vos coordonnées n'ont pas été trouvées" + }, + "taken_by_partner": { + "contacts": "Pour toute question, veuillez contacter {{name}}.", + "description": "Vous recevez ce message parce que le crédit a été activé par un membre de la famille ou un tuteur
.
Le crédit est disponible sur le compte de la personne qui l'a activé en premier (
).", + "heading": "Échec de la demande", + "title": "Ce crédit a déjà été activé" + } + }, + "options": { + "no": "Non" + }, + "prefills": { + "child": "Enfant", + "children": "Les enfants", + "partner": "Coordonnées de votre partenaire", + "subtitle": "Si vos informations sont incorrectes, vous pouvez cliquer sur le bouton en bas de page.", + "title": "Vérifier que les données sont correctes." } }, "fund_requests": { diff --git a/react/src/webshop/i18n/translated/pl.json b/react/src/webshop/i18n/translated/pl.json index 1a8cc1cc7..6d823e992 100644 --- a/react/src/webshop/i18n/translated/pl.json +++ b/react/src/webshop/i18n/translated/pl.json @@ -664,6 +664,43 @@ "subtitle": "Ta strona zawiera informacje o aplikacji. Można tu sprawdzić status, wypełnione dane i wszelkie dodatkowe pytania.", "modal": { "title": "Pytanie dodatkowe" + }, + "cards": { + "back": "Powrót", + "connection_error": { + "contacts": "W razie pytań prosimy o kontakt pod adresem {{name}}.", + "description": "Otrzymujesz ten komunikat, ponieważ wystąpił błąd techniczny. Możesz spróbować ponownie w późniejszym czasie.", + "heading": "Żądanie nie powiodło się", + "title": "Awaria techniczna" + }, + "not_filled_required_criteria": { + "contacts": "W razie pytań prosimy o kontakt pod adresem {{name}}.", + "description": "Otrzymujesz tę wiadomość, ponieważ niektóre z Twoich danych nie zostały znalezione w systemie zewnętrznym. W rezultacie aplikacja nie może zostać w pełni oceniona.", + "heading": "Żądanie nie powiodło się", + "title": "Brakujące dane" + }, + "not_found": { + "contacts": "W razie pytań prosimy o kontakt pod adresem {{name}}.", + "description": "Ten komunikat pojawia się, ponieważ dane nie zostały znalezione w systemie zewnętrznym.", + "heading": "Żądanie nie powiodło się", + "title": "Twoje dane nie zostały znalezione" + }, + "taken_by_partner": { + "contacts": "W razie pytań prosimy o kontakt pod adresem {{name}}.", + "description": "Otrzymujesz tę wiadomość, ponieważ kredyt został aktywowany przez członka rodziny lub opiekuna
.
Kredyt jest dostępny na koncie osoby, która
aktywowała go jako pierwsza.", + "heading": "Żądanie nie powiodło się", + "title": "Ten kredyt został już aktywowany" + } + }, + "options": { + "no": "Nie" + }, + "prefills": { + "child": "Dziecko", + "children": "Dzieci", + "partner": "Szczegóły dotyczące partnera", + "subtitle": "Jeśli informacje są nieprawidłowe, możesz kliknąć przycisk na dole.", + "title": "Sprawdź, czy dane są prawidłowe." } }, "fund_requests": { diff --git a/react/src/webshop/i18n/translated/ru.json b/react/src/webshop/i18n/translated/ru.json index 4cd6c3ab6..b006a46ea 100644 --- a/react/src/webshop/i18n/translated/ru.json +++ b/react/src/webshop/i18n/translated/ru.json @@ -664,6 +664,43 @@ "subtitle": "Эта страница содержит информацию о заявке. Здесь можно просмотреть статус, заполненные данные и дополнительные вопросы.", "modal": { "title": "Дополнительный вопрос" + }, + "cards": { + "back": "Назад", + "connection_error": { + "contacts": "По вопросам обращайтесь по адресу {{name}}.", + "description": "Вы получили это сообщение из-за технической ошибки. Вы можете повторить попытку позже.", + "heading": "Запрос не прошел", + "title": "Технический сбой" + }, + "not_filled_required_criteria": { + "contacts": "По вопросам обращайтесь по адресу {{name}}.", + "description": "Вы получили это сообщение, потому что некоторые ваши данные не были найдены во внешней системе. В результате ваше заявление не может быть полностью рассмотрено.", + "heading": "Запрос не прошел", + "title": "Отсутствующие данные" + }, + "not_found": { + "contacts": "По вопросам обращайтесь по адресу {{name}}.", + "description": "Вы получаете это сообщение, потому что ваши данные не были найдены во внешней системе.", + "heading": "Запрос не прошел", + "title": "Ваши данные не найдены" + }, + "taken_by_partner": { + "contacts": "По вопросам обращайтесь по адресу {{name}}.", + "description": "Вы получаете это сообщение, потому что кредит был активирован членом семьи или опекуном
.
Кредит доступен на счете того, кто
активировал его первым.", + "heading": "Запрос не прошел", + "title": "Этот кредит уже активирован" + } + }, + "options": { + "no": "Нет" + }, + "prefills": { + "child": "Ребенок", + "children": "Дети", + "partner": "Подробная информация о вашем партнере", + "subtitle": "Если ваша информация неверна, вы можете нажать кнопку внизу.", + "title": "Проверьте правильность данных." } }, "fund_requests": { diff --git a/react/src/webshop/i18n/translated/tr.json b/react/src/webshop/i18n/translated/tr.json index b4796978b..fd1da64a4 100644 --- a/react/src/webshop/i18n/translated/tr.json +++ b/react/src/webshop/i18n/translated/tr.json @@ -1066,6 +1066,43 @@ "subtitle": "Bu sayfa başvuru hakkında bilgi içerir. Durum, tamamlanan veriler ve ek sorular buradan görüntülenebilir.", "modal": { "title": "Ek soru" + }, + "cards": { + "back": "Geri", + "connection_error": { + "contacts": "Sorularınız için {{name}} ile iletişime geçebilirsiniz.", + "description": "Teknik bir hata olduğu için bu mesajı alıyorsunuz. Daha sonra tekrar deneyebilirsiniz.", + "heading": "İstek başarısız oldu", + "title": "Teknik arıza" + }, + "not_filled_required_criteria": { + "contacts": "Sorularınız için {{name}} ile iletişime geçebilirsiniz.", + "description": "Bazı bilgileriniz harici sistemde bulunamadığı için bu mesajı alıyorsunuz. Sonuç olarak, başvurunuz tam olarak değerlendirilememektedir.", + "heading": "İstek başarısız oldu", + "title": "Eksik veri" + }, + "not_found": { + "contacts": "Sorularınız için {{name}} ile iletişime geçebilirsiniz.", + "description": "Verileriniz harici sistemde bulunamadığı için bu mesajı alırsınız.", + "heading": "İstek başarısız oldu", + "title": "Bilgileriniz bulunamadı" + }, + "taken_by_partner": { + "contacts": "Sorularınız için {{name}} ile iletişime geçebilirsiniz.", + "description": "Bu mesajı alıyorsunuz çünkü kredi bir
aile üyesi veya vasisi tarafından etkinleştirildi.
Kredi
ilk etkinleştiren kişinin hesabında kullanılabilir.", + "heading": "İstek başarısız oldu", + "title": "Bu kredi zaten etkinleştirildi" + } + }, + "options": { + "no": "Hayır" + }, + "prefills": { + "child": "Çocuk", + "children": "Çocuklar", + "partner": "Partnerinizin detayları", + "subtitle": "Bilgileriniz yanlışsa, alttaki düğmeye tıklayabilirsiniz.", + "title": "Verilerin doğru olup olmadığını kontrol edin." } }, "fund": { diff --git a/react/src/webshop/i18n/translated/uk.json b/react/src/webshop/i18n/translated/uk.json index 3ea8e8a17..91bb206c1 100644 --- a/react/src/webshop/i18n/translated/uk.json +++ b/react/src/webshop/i18n/translated/uk.json @@ -664,6 +664,43 @@ "subtitle": "Ця сторінка містить інформацію про заявку. Статус, заповнені дані та будь-які додаткові питання можна переглянути тут.", "modal": { "title": "Додаткове запитання" + }, + "cards": { + "back": "Назад", + "connection_error": { + "contacts": "З питаннями звертайтеся за адресою: {{name}}.", + "description": "Ви отримали це повідомлення через технічну помилку. Ви можете спробувати пізніше.", + "heading": "Запит не вдалося виконати", + "title": "Технічна несправність" + }, + "not_filled_required_criteria": { + "contacts": "З питаннями звертайтеся за адресою: {{name}}.", + "description": "Ви отримали це повідомлення, тому що деякі з ваших даних не були знайдені в зовнішній системі. Внаслідок цього ваша заявка не може бути оцінена в повному обсязі.", + "heading": "Запит не вдалося виконати", + "title": "Відсутні дані" + }, + "not_found": { + "contacts": "З питаннями звертайтеся за адресою: {{name}}.", + "description": "Ви отримуєте це повідомлення, тому що ваші дані не були знайдені в зовнішній системі.", + "heading": "Запит не вдалося виконати", + "title": "Ваші дані не знайдено" + }, + "taken_by_partner": { + "contacts": "З питаннями звертайтеся за адресою: {{name}}.", + "description": "Ви отримали це повідомлення, тому що кредит був активований
членом сім'ї або опікуном.
Кредит доступний в акаунті особи, яка
активувала його першою.", + "heading": "Запит не вдалося виконати", + "title": "Цей кредит вже активовано" + } + }, + "options": { + "no": "Ні." + }, + "prefills": { + "child": "Дитинко.", + "children": "Діти", + "partner": "Інформація про вашого партнера", + "subtitle": "Якщо ваша інформація невірна, ви можете натиснути кнопку внизу.", + "title": "Перевірте правильність даних." } }, "fund_requests": { diff --git a/react/src/webshop/props/models/Fund.ts b/react/src/webshop/props/models/Fund.ts index a0662edf6..d6bc9c986 100644 --- a/react/src/webshop/props/models/Fund.ts +++ b/react/src/webshop/props/models/Fund.ts @@ -1,5 +1,6 @@ import FundBase from '../../../dashboard/props/models/Fund'; import FundCriteriaStep from '../../../dashboard/props/models/FundCriteriaStep'; +import FundCriteriaGroup from '../../../dashboard/props/models/FundCriteriaGroup'; export default interface Fund extends FundBase { received?: boolean; @@ -11,6 +12,7 @@ export default interface Fund extends FundBase { auto_validation?: boolean; bsn_confirmation_time?: number; criteria_steps?: Array;
+ criteria_groups?: Array;
email_required?: boolean;
contact_info_enabled?: boolean;
contact_info_required?: boolean;
diff --git a/react/src/webshop/services/FundService.ts b/react/src/webshop/services/FundService.ts
index dff3efcde..4cb7a9918 100644
--- a/react/src/webshop/services/FundService.ts
+++ b/react/src/webshop/services/FundService.ts
@@ -5,6 +5,7 @@ import { format } from 'date-fns';
import Fund from '../props/models/Fund';
import Voucher from '../../dashboard/props/models/Voucher';
import RecordType from '../../dashboard/props/models/RecordType';
+import { Prefills } from '../components/pages/funds-request/FundRequest';
export class FundService {
/**
@@ -58,7 +59,7 @@ export class FundService {
return this.apiRequest.post(`${this.prefix}/redeem`, { code });
}
- public getPersonPrefills(id: number): Promise>> {
+ public getPersonPrefills(id: number): Promise> {
return this.apiRequest.get(`${this.prefix}/${id}/prefills`);
}
diff --git a/translations/cache/cache.json b/translations/cache/cache.json
index 3b363afec..ff5286ac1 100644
--- a/translations/cache/cache.json
+++ b/translations/cache/cache.json
@@ -1267,6 +1267,74 @@
"fund_request.buttons.send",
"Verzenden"
],
+ [
+ "fund_request.cards.back",
+ "Terug"
+ ],
+ [
+ "fund_request.cards.connection_error.contacts",
+ "Neem voor vragen contact op met {{name}}."
+ ],
+ [
+ "fund_request.cards.connection_error.description",
+ "U krijgt deze melding omdat er sprake is van een technische storing. U kunt het op een later moment opnieuw proberen."
+ ],
+ [
+ "fund_request.cards.connection_error.heading",
+ "Aanvraag mislukt"
+ ],
+ [
+ "fund_request.cards.connection_error.title",
+ "Technische storing"
+ ],
+ [
+ "fund_request.cards.not_filled_required_criteria.contacts",
+ "Neem voor vragen contact op met {{name}}."
+ ],
+ [
+ "fund_request.cards.not_filled_required_criteria.description",
+ "U krijgt deze melding omdat een aantal gegevens van u niet zijn gevonden in het externe systeem. Hierdoor kan uw aanvraag niet volledig beoordeeld worden."
+ ],
+ [
+ "fund_request.cards.not_filled_required_criteria.heading",
+ "Aanvraag mislukt"
+ ],
+ [
+ "fund_request.cards.not_filled_required_criteria.title",
+ "Ontbrekende gegevens"
+ ],
+ [
+ "fund_request.cards.not_found.contacts",
+ "Neem voor vragen contact op met {{name}}."
+ ],
+ [
+ "fund_request.cards.not_found.description",
+ "U krijgt deze melding omdat uw gegevens niet gevonden zijn in het externe systeem."
+ ],
+ [
+ "fund_request.cards.not_found.heading",
+ "Aanvraag mislukt"
+ ],
+ [
+ "fund_request.cards.not_found.title",
+ "Uw gegevens zijn niet gevonden"
+ ],
+ [
+ "fund_request.cards.taken_by_partner.contacts",
+ "Neem voor vragen contact op met {{name}}."
+ ],
+ [
+ "fund_request.cards.taken_by_partner.description",
+ "U krijgt deze melding omdat het tegoed is geactiveerd door een
familielid of voogd.
De tegoeden zijn beschikbaar in het account van de persoon die
deze als eerste heeft geactiveerd." + ], + [ + "fund_request.cards.taken_by_partner.heading", + "Aanvraag mislukt" + ], + [ + "fund_request.cards.taken_by_partner.title", + "Dit tegoed is al geactiveerd" + ], [ "fund_request.clarifications.info_requested", "Extra vraag gesteld" @@ -1351,6 +1419,30 @@ "fund_request.not_requester", "U bent niet de eigenaar van deze aanvraag." ], + [ + "fund_request.options.no", + "Nee" + ], + [ + "fund_request.prefills.child", + "Kind" + ], + [ + "fund_request.prefills.children", + "Kinderen" + ], + [ + "fund_request.prefills.partner", + "Gegevens van uw partner" + ], + [ + "fund_request.prefills.subtitle", + "Als uw informatie niet correct is, kunt u onderaan op de knop klikken." + ], + [ + "fund_request.prefills.title", + "Controleer of de gegevens correct zijn." + ], [ "fund_request.received.title", "Ontvangen"
+
+
+ {group.title}
+ {group.description_html && (
+
+
+
+ {group.criteria
+ .filter((item) => item.requested)
+ .map((criterion) => (
+
+
+ {groupFiles?.[group.id].length > 0 && (
+
+
+ ))}
+
+ {criterion.title || criterion.title_default}
+
+
+ {criterionValue(criterion, true)}
+
+
+
+ )}
+
+ Attachments
+
+
+ {groupFiles[group.id].length}
+
+
+
))}
diff --git a/react/src/webshop/components/pages/funds-request/elements/steps/criteria/FundRequestCriteriaChildren.tsx b/react/src/webshop/components/pages/funds-request/elements/steps/criteria/FundRequestCriteriaChildren.tsx
new file mode 100644
index 000000000..2f8fc7a17
--- /dev/null
+++ b/react/src/webshop/components/pages/funds-request/elements/steps/criteria/FundRequestCriteriaChildren.tsx
@@ -0,0 +1,55 @@
+import React, { Fragment, useCallback } from 'react';
+import useTranslate from '../../../../../../../dashboard/hooks/useTranslate';
+import RecordType from '../../../../../../../dashboard/props/models/RecordType';
+import { Prefills } from '../../../FundRequest';
+import { upperFirst } from 'lodash';
+
+export default function FundRequestCriteriaChildren({
+ prefills,
+ recordTypesByKey,
+}: {
+ prefills: Prefills;
+ recordTypesByKey: { [_key: string]: RecordType };
+}) {
+ const translate = useTranslate();
+
+ const splitChildLabel = useCallback((text?: string) => {
+ const match = text ? text.match(/^(Kind\s+\d+)\s+(.+)$/) : null;
+ return match ? { child: match[1], value: upperFirst(match[2]) } : null;
+ }, []);
+
+ return (
+
+ {step.criteria
+ .filter((item) => item.requested)
+ .filter(
+ (criterion) =>
+ !(
+ criterion.fill_type === 'prefill' &&
+ [
+ 'children_same_address_nth',
+ 'partner_same_address_nth',
+ ].includes(criterion.record_type_key)
+ ),
+ )
+ .map((criterion) => (
+
+
{step.criteria
.filter((item) => item.requested)
- .map((criterion) => (
-
+
+ ))}
+
+ {criterion.title || criterion.title_default}
+
+
+ {criterionValue(criterion)}
+
+
-
+ )}
- {criterion.title || criterion.title_default}
-
-
- {criterionValue(criterion)}
+ .reduce((list, item) => [...list, ...item.files], []).length > 0 && (
+
+ )}
+
+
- {step.criteria
- .filter((item) => item.requested)
- .reduce((list, item) => [...list, ...item.files], []).length > 0 && (
-
+ Attachments
+
- ))}
-
+ {
+ step.criteria
+ .filter((item) => item.requested)
+ .reduce((list, item) => [...list, ...item.files], [])
+ .length
+ }
- item.requested)
- .reduce((list, item) => [...list, ...item.files], [])}
- readOnly={true}
- />
-
- )}
-
- Attachments
- item.requested)
+ .reduce((list, item) => [...list, ...item.files], [])}
+ readOnly={true}
+ />
-
- {
- step.criteria
- .filter((item) => item.requested)
- .reduce((list, item) => [...list, ...item.files], []).length
- }
-
+
+
+
+ {prefills.children.map((childObject, index) => (
+ {translate('fund_request.prefills.children')}
+
+
+ ))}
+
+ {childObject
+ .filter((child) => !child.record_type_key.endsWith('_bsn'))
+ .map((child, index) => (
+
+ {index === 0 && (
+
+ ))}
+
+
+
+ )}
+
+
+ {splitChildLabel(recordTypesByKey[child.record_type_key]?.name)?.child}
+
+
+
+
+ {splitChildLabel(recordTypesByKey[child.record_type_key]?.name)?.value}
+
+ {child.value || '-'}
+
+
+
+ {translate('fund_request.prefills.partner')}
+
+
+
+ {prefills.partner
+ .filter((partner) => !partner.record_type_key.endsWith('_bsn'))
+ .map((partner, index) => (
+
+
+
+ ))}
+
+ {splitPartnerLabel(recordTypesByKey[partner.record_type_key]?.name)?.value}
+
+ {partner.value || '-'}
+ familielid of voogd.
De tegoeden zijn beschikbaar in het account van de persoon die
deze als eerste heeft geactiveerd.', + contacts: 'Neem voor vragen contact op met {{name}}.', + }, + not_filled_required_criteria: { + title: 'Ontbrekende gegevens', + heading: 'Aanvraag mislukt', + description: + 'U krijgt deze melding omdat een aantal gegevens van u niet zijn gevonden in het externe systeem. Hierdoor kan uw aanvraag niet volledig beoordeeld worden.', + contacts: 'Neem voor vragen contact op met {{name}}.', + }, + connection_error: { + title: 'Technische storing', + heading: 'Aanvraag mislukt', + description: + 'U krijgt deze melding omdat er sprake is van een technische storing. U kunt het op een later moment opnieuw proberen.', + contacts: 'Neem voor vragen contact op met {{name}}.', + }, + not_found: { + title: 'Uw gegevens zijn niet gevonden', + heading: 'Aanvraag mislukt', + description: 'U krijgt deze melding omdat uw gegevens niet gevonden zijn in het externe systeem.', + contacts: 'Neem voor vragen contact op met {{name}}.', + }, + }, }; diff --git a/react/src/webshop/i18n/nl/pages/fund.mjs b/react/src/webshop/i18n/nl/pages/fund.mjs index dfd21f2ea..a1fcc4612 100644 --- a/react/src/webshop/i18n/nl/pages/fund.mjs +++ b/react/src/webshop/i18n/nl/pages/fund.mjs @@ -1,5 +1,4 @@ export default { - // APPLY FOR FUNDS = fund-apply.pug header: { title: '{{fund_name}} aanmelden', criteria: 'Voorwaarden ({{ nth }})', diff --git a/react/src/webshop/i18n/nl/pages/funds.mjs b/react/src/webshop/i18n/nl/pages/funds.mjs index a95c613ce..6a39b3f35 100644 --- a/react/src/webshop/i18n/nl/pages/funds.mjs +++ b/react/src/webshop/i18n/nl/pages/funds.mjs @@ -1,5 +1,4 @@ export default { - // FUNDS = funds.pug header: { title: 'Aanvragen', subtitle: '', diff --git a/react/src/webshop/i18n/nl/pages/home.mjs b/react/src/webshop/i18n/nl/pages/home.mjs index 89316f4ec..eb9981061 100644 --- a/react/src/webshop/i18n/nl/pages/home.mjs +++ b/react/src/webshop/i18n/nl/pages/home.mjs @@ -1,5 +1,4 @@ export default { - // HOME = home.pug header: { title: '{{implementation}}', subtitle: diff --git a/react/src/webshop/i18n/nl/pages/record-validations.mjs b/react/src/webshop/i18n/nl/pages/record-validations.mjs index 42039dd27..4348e064a 100644 --- a/react/src/webshop/i18n/nl/pages/record-validations.mjs +++ b/react/src/webshop/i18n/nl/pages/record-validations.mjs @@ -1,5 +1,4 @@ export default { - // VALIDATIONS OF THE RECORDS = record-validations.pug header: { title: 'Mijn persoonsgegevens', }, diff --git a/react/src/webshop/i18n/nl/pages/records-create.mjs b/react/src/webshop/i18n/nl/pages/records-create.mjs index 404af9496..2d22647ac 100644 --- a/react/src/webshop/i18n/nl/pages/records-create.mjs +++ b/react/src/webshop/i18n/nl/pages/records-create.mjs @@ -1,5 +1,4 @@ export default { - // CREATE A RECORD = record.create.pug header: { title: 'Persoonsgegevens aanmaken', }, diff --git a/react/src/webshop/i18n/nl/pages/records-validate.mjs b/react/src/webshop/i18n/nl/pages/records-validate.mjs index 60f631f4f..42d8d05f1 100644 --- a/react/src/webshop/i18n/nl/pages/records-validate.mjs +++ b/react/src/webshop/i18n/nl/pages/records-validate.mjs @@ -1,5 +1,4 @@ export default { - // VALIDATE A RECORD = record-validate.pug header: { title: 'Mijn persoonsgegevens', }, diff --git a/react/src/webshop/i18n/nl/pages/records.mjs b/react/src/webshop/i18n/nl/pages/records.mjs index ceb3694c7..53f77015d 100644 --- a/react/src/webshop/i18n/nl/pages/records.mjs +++ b/react/src/webshop/i18n/nl/pages/records.mjs @@ -1,5 +1,4 @@ export default { - // RECORDS = records.pug header: { title: 'Persoonsgegevens', }, diff --git a/react/src/webshop/i18n/nl/pages/signup.mjs b/react/src/webshop/i18n/nl/pages/signup.mjs index 69be0429f..d0d84b295 100644 --- a/react/src/webshop/i18n/nl/pages/signup.mjs +++ b/react/src/webshop/i18n/nl/pages/signup.mjs @@ -1,5 +1,4 @@ export default { - // SIGNUP = sign-up.pug items: { title: 'Inloggen', page_title: 'Inloggen{{pageTitleSuffix}}', diff --git a/react/src/webshop/i18n/translated/ar.json b/react/src/webshop/i18n/translated/ar.json index 756bdb2eb..238a0ecd1 100644 --- a/react/src/webshop/i18n/translated/ar.json +++ b/react/src/webshop/i18n/translated/ar.json @@ -1087,6 +1087,43 @@ "subtitle": "تحتوي هذه الصفحة على معلومات حول الطلب. يمكن الاطلاع على الحالة والبيانات المكتملة وأي أسئلة إضافية هنا.", "modal": { "title": "سؤال إضافي" + }, + "cards": { + "back": "رجوع", + "connection_error": { + "contacts": "للأسئلة، اتصل على {{name}}.", + "description": "تظهر لك هذه الرسالة بسبب وجود خطأ فني. يمكنك المحاولة مرة أخرى في وقت لاحق.", + "heading": "فشل الطلب", + "title": "عطل فني" + }, + "not_filled_required_criteria": { + "contacts": "للأسئلة، اتصل على {{name}}.", + "description": "تتلقى هذه الرسالة لأن بعض التفاصيل الخاصة بك لم يتم العثور عليها في النظام الخارجي. ونتيجة لذلك، لا يمكن تقييم طلبك بشكل كامل.", + "heading": "فشل الطلب", + "title": "البيانات المفقودة" + }, + "not_found": { + "contacts": "للأسئلة، اتصل على {{name}}.", + "description": "تظهر لك هذه الرسالة لأن بياناتك لم يتم العثور عليها في النظام الخارجي.", + "heading": "فشل الطلب", + "title": "لم يتم العثور على بياناتك" + }, + "taken_by_partner": { + "contacts": "للأسئلة، اتصل على {{name}}.", + "description": "ستصلك هذه الرسالة لأن الرصيد تم تفعيله من قبل أحد أفراد العائلة أو ولي الأمر
.
يتوفر الرصيد في حساب الشخص الذي قام
بتفعيله أولاً.", + "heading": "فشل الطلب", + "title": "تم تفعيل هذا الرصيد بالفعل" + } + }, + "options": { + "no": "لا يوجد" + }, + "prefills": { + "child": "الطفل", + "children": "الأطفال", + "partner": "تفاصيل شريكك", + "subtitle": "إذا كانت معلوماتك غير صحيحة، يمكنك النقر على الزر الموجود في الأسفل.", + "title": "تحقق من صحة البيانات." } }, "fund_requests": { diff --git a/react/src/webshop/i18n/translated/de.json b/react/src/webshop/i18n/translated/de.json index b08299dd0..9a80d9e87 100644 --- a/react/src/webshop/i18n/translated/de.json +++ b/react/src/webshop/i18n/translated/de.json @@ -664,6 +664,43 @@ "subtitle": "Diese Seite enthält Informationen über die Bewerbung. Der Status, die ausgefüllten Daten und eventuelle Zusatzfragen können hier eingesehen werden.", "modal": { "title": "Zusätzliche Frage" + }, + "cards": { + "back": "Zurück", + "connection_error": { + "contacts": "Bei Fragen wenden Sie sich bitte an {{name}}.", + "description": "Sie erhalten diese Meldung, weil ein technischer Fehler aufgetreten ist. Sie können es zu einem späteren Zeitpunkt erneut versuchen.", + "heading": "Anfrage fehlgeschlagen", + "title": "Technisches Versagen" + }, + "not_filled_required_criteria": { + "contacts": "Bei Fragen wenden Sie sich bitte an {{name}}.", + "description": "Sie erhalten diese Meldung, weil einige Ihrer Angaben im externen System nicht gefunden wurden. Aus diesem Grund kann Ihre Bewerbung nicht vollständig geprüft werden.", + "heading": "Anfrage fehlgeschlagen", + "title": "Fehlende Daten" + }, + "not_found": { + "contacts": "Bei Fragen wenden Sie sich bitte an {{name}}.", + "description": "Sie erhalten diese Meldung, weil Ihre Daten im externen System nicht gefunden wurden.", + "heading": "Anfrage fehlgeschlagen", + "title": "Ihre Angaben wurden nicht gefunden" + }, + "taken_by_partner": { + "contacts": "Bei Fragen wenden Sie sich bitte an {{name}}.", + "description": "Sie erhalten diese Meldung, weil das Guthaben von einem
Familienmitglied oder Erziehungsberechtigten aktiviert wurde.
Das Guthaben ist auf dem Konto der Person verfügbar, die
es zuerst aktiviert hat.", + "heading": "Anfrage fehlgeschlagen", + "title": "Dieser Kredit ist bereits aktiviert worden" + } + }, + "options": { + "no": "Nein" + }, + "prefills": { + "child": "Kind", + "children": "Kinder", + "partner": "Angaben zu Ihrem Partner", + "subtitle": "Wenn Ihre Angaben nicht korrekt sind, können Sie auf die Schaltfläche am unteren Rand klicken.", + "title": "Prüfen Sie, ob die Daten korrekt sind." } }, "fund_requests": { diff --git a/react/src/webshop/i18n/translated/en-US.json b/react/src/webshop/i18n/translated/en-US.json index 7dc508832..7b48340c8 100644 --- a/react/src/webshop/i18n/translated/en-US.json +++ b/react/src/webshop/i18n/translated/en-US.json @@ -842,6 +842,43 @@ "subtitle": "This page contains information about the application. The status, completed data and any additional questions can be viewed here.", "modal": { "title": "Additional question" + }, + "cards": { + "back": "Back", + "connection_error": { + "contacts": "For questions, contact {{name}}.", + "description": "You are receiving this message because there is a technical error. You can try again at a later time.", + "heading": "Application failed", + "title": "Technical failure" + }, + "not_filled_required_criteria": { + "contacts": "For questions, contact {{name}}.", + "description": "You are receiving this message because some of your information was not found in the external system. As a result, your application cannot be fully evaluated.", + "heading": "Application failed", + "title": "Missing data" + }, + "not_found": { + "contacts": "For questions, contact {{name}}.", + "description": "You get this message because your data was not found in the external system.", + "heading": "Application failed", + "title": "Your information was not found" + }, + "taken_by_partner": { + "contacts": "For questions, contact {{name}}.", + "description": "You get this message because the credit was activated by a
family member or guardian.
The credit is available in the account of the person who
activated it first.", + "heading": "Application failed", + "title": "This credit has already been activated" + } + }, + "options": { + "no": "No" + }, + "prefills": { + "child": "Child", + "children": "Children", + "partner": "Details of your partner", + "subtitle": "If your information is incorrect, you can click the button at the bottom.", + "title": "Check that the data is correct." } }, "fund_requests": { diff --git a/react/src/webshop/i18n/translated/fr.json b/react/src/webshop/i18n/translated/fr.json index 7cd2ee46b..0f1f38f90 100644 --- a/react/src/webshop/i18n/translated/fr.json +++ b/react/src/webshop/i18n/translated/fr.json @@ -664,6 +664,43 @@ "subtitle": "Cette page contient des informations sur la demande. L'état d'avancement, les données complétées et les éventuelles questions complémentaires peuvent être consultés ici.", "modal": { "title": "Question complémentaire" + }, + "cards": { + "back": "Retour", + "connection_error": { + "contacts": "Pour toute question, veuillez contacter {{name}}.", + "description": "Vous recevez ce message en raison d'une erreur technique. Vous pouvez réessayer ultérieurement.", + "heading": "Échec de la demande", + "title": "Défaillance technique" + }, + "not_filled_required_criteria": { + "contacts": "Pour toute question, veuillez contacter {{name}}.", + "description": "Vous recevez ce message parce que certaines de vos données n'ont pas été trouvées dans le système externe. Par conséquent, votre demande ne peut pas être évaluée dans son intégralité.", + "heading": "Échec de la demande", + "title": "Données manquantes" + }, + "not_found": { + "contacts": "Pour toute question, veuillez contacter {{name}}.", + "description": "Vous obtenez ce message parce que vos données n'ont pas été trouvées dans le système externe.", + "heading": "Échec de la demande", + "title": "Vos coordonnées n'ont pas été trouvées" + }, + "taken_by_partner": { + "contacts": "Pour toute question, veuillez contacter {{name}}.", + "description": "Vous recevez ce message parce que le crédit a été activé par un membre de la famille ou un tuteur
.
Le crédit est disponible sur le compte de la personne qui l'a activé en premier (
).", + "heading": "Échec de la demande", + "title": "Ce crédit a déjà été activé" + } + }, + "options": { + "no": "Non" + }, + "prefills": { + "child": "Enfant", + "children": "Les enfants", + "partner": "Coordonnées de votre partenaire", + "subtitle": "Si vos informations sont incorrectes, vous pouvez cliquer sur le bouton en bas de page.", + "title": "Vérifier que les données sont correctes." } }, "fund_requests": { diff --git a/react/src/webshop/i18n/translated/pl.json b/react/src/webshop/i18n/translated/pl.json index 1a8cc1cc7..6d823e992 100644 --- a/react/src/webshop/i18n/translated/pl.json +++ b/react/src/webshop/i18n/translated/pl.json @@ -664,6 +664,43 @@ "subtitle": "Ta strona zawiera informacje o aplikacji. Można tu sprawdzić status, wypełnione dane i wszelkie dodatkowe pytania.", "modal": { "title": "Pytanie dodatkowe" + }, + "cards": { + "back": "Powrót", + "connection_error": { + "contacts": "W razie pytań prosimy o kontakt pod adresem {{name}}.", + "description": "Otrzymujesz ten komunikat, ponieważ wystąpił błąd techniczny. Możesz spróbować ponownie w późniejszym czasie.", + "heading": "Żądanie nie powiodło się", + "title": "Awaria techniczna" + }, + "not_filled_required_criteria": { + "contacts": "W razie pytań prosimy o kontakt pod adresem {{name}}.", + "description": "Otrzymujesz tę wiadomość, ponieważ niektóre z Twoich danych nie zostały znalezione w systemie zewnętrznym. W rezultacie aplikacja nie może zostać w pełni oceniona.", + "heading": "Żądanie nie powiodło się", + "title": "Brakujące dane" + }, + "not_found": { + "contacts": "W razie pytań prosimy o kontakt pod adresem {{name}}.", + "description": "Ten komunikat pojawia się, ponieważ dane nie zostały znalezione w systemie zewnętrznym.", + "heading": "Żądanie nie powiodło się", + "title": "Twoje dane nie zostały znalezione" + }, + "taken_by_partner": { + "contacts": "W razie pytań prosimy o kontakt pod adresem {{name}}.", + "description": "Otrzymujesz tę wiadomość, ponieważ kredyt został aktywowany przez członka rodziny lub opiekuna
.
Kredyt jest dostępny na koncie osoby, która
aktywowała go jako pierwsza.", + "heading": "Żądanie nie powiodło się", + "title": "Ten kredyt został już aktywowany" + } + }, + "options": { + "no": "Nie" + }, + "prefills": { + "child": "Dziecko", + "children": "Dzieci", + "partner": "Szczegóły dotyczące partnera", + "subtitle": "Jeśli informacje są nieprawidłowe, możesz kliknąć przycisk na dole.", + "title": "Sprawdź, czy dane są prawidłowe." } }, "fund_requests": { diff --git a/react/src/webshop/i18n/translated/ru.json b/react/src/webshop/i18n/translated/ru.json index 4cd6c3ab6..b006a46ea 100644 --- a/react/src/webshop/i18n/translated/ru.json +++ b/react/src/webshop/i18n/translated/ru.json @@ -664,6 +664,43 @@ "subtitle": "Эта страница содержит информацию о заявке. Здесь можно просмотреть статус, заполненные данные и дополнительные вопросы.", "modal": { "title": "Дополнительный вопрос" + }, + "cards": { + "back": "Назад", + "connection_error": { + "contacts": "По вопросам обращайтесь по адресу {{name}}.", + "description": "Вы получили это сообщение из-за технической ошибки. Вы можете повторить попытку позже.", + "heading": "Запрос не прошел", + "title": "Технический сбой" + }, + "not_filled_required_criteria": { + "contacts": "По вопросам обращайтесь по адресу {{name}}.", + "description": "Вы получили это сообщение, потому что некоторые ваши данные не были найдены во внешней системе. В результате ваше заявление не может быть полностью рассмотрено.", + "heading": "Запрос не прошел", + "title": "Отсутствующие данные" + }, + "not_found": { + "contacts": "По вопросам обращайтесь по адресу {{name}}.", + "description": "Вы получаете это сообщение, потому что ваши данные не были найдены во внешней системе.", + "heading": "Запрос не прошел", + "title": "Ваши данные не найдены" + }, + "taken_by_partner": { + "contacts": "По вопросам обращайтесь по адресу {{name}}.", + "description": "Вы получаете это сообщение, потому что кредит был активирован членом семьи или опекуном
.
Кредит доступен на счете того, кто
активировал его первым.", + "heading": "Запрос не прошел", + "title": "Этот кредит уже активирован" + } + }, + "options": { + "no": "Нет" + }, + "prefills": { + "child": "Ребенок", + "children": "Дети", + "partner": "Подробная информация о вашем партнере", + "subtitle": "Если ваша информация неверна, вы можете нажать кнопку внизу.", + "title": "Проверьте правильность данных." } }, "fund_requests": { diff --git a/react/src/webshop/i18n/translated/tr.json b/react/src/webshop/i18n/translated/tr.json index b4796978b..fd1da64a4 100644 --- a/react/src/webshop/i18n/translated/tr.json +++ b/react/src/webshop/i18n/translated/tr.json @@ -1066,6 +1066,43 @@ "subtitle": "Bu sayfa başvuru hakkında bilgi içerir. Durum, tamamlanan veriler ve ek sorular buradan görüntülenebilir.", "modal": { "title": "Ek soru" + }, + "cards": { + "back": "Geri", + "connection_error": { + "contacts": "Sorularınız için {{name}} ile iletişime geçebilirsiniz.", + "description": "Teknik bir hata olduğu için bu mesajı alıyorsunuz. Daha sonra tekrar deneyebilirsiniz.", + "heading": "İstek başarısız oldu", + "title": "Teknik arıza" + }, + "not_filled_required_criteria": { + "contacts": "Sorularınız için {{name}} ile iletişime geçebilirsiniz.", + "description": "Bazı bilgileriniz harici sistemde bulunamadığı için bu mesajı alıyorsunuz. Sonuç olarak, başvurunuz tam olarak değerlendirilememektedir.", + "heading": "İstek başarısız oldu", + "title": "Eksik veri" + }, + "not_found": { + "contacts": "Sorularınız için {{name}} ile iletişime geçebilirsiniz.", + "description": "Verileriniz harici sistemde bulunamadığı için bu mesajı alırsınız.", + "heading": "İstek başarısız oldu", + "title": "Bilgileriniz bulunamadı" + }, + "taken_by_partner": { + "contacts": "Sorularınız için {{name}} ile iletişime geçebilirsiniz.", + "description": "Bu mesajı alıyorsunuz çünkü kredi bir
aile üyesi veya vasisi tarafından etkinleştirildi.
Kredi
ilk etkinleştiren kişinin hesabında kullanılabilir.", + "heading": "İstek başarısız oldu", + "title": "Bu kredi zaten etkinleştirildi" + } + }, + "options": { + "no": "Hayır" + }, + "prefills": { + "child": "Çocuk", + "children": "Çocuklar", + "partner": "Partnerinizin detayları", + "subtitle": "Bilgileriniz yanlışsa, alttaki düğmeye tıklayabilirsiniz.", + "title": "Verilerin doğru olup olmadığını kontrol edin." } }, "fund": { diff --git a/react/src/webshop/i18n/translated/uk.json b/react/src/webshop/i18n/translated/uk.json index 3ea8e8a17..91bb206c1 100644 --- a/react/src/webshop/i18n/translated/uk.json +++ b/react/src/webshop/i18n/translated/uk.json @@ -664,6 +664,43 @@ "subtitle": "Ця сторінка містить інформацію про заявку. Статус, заповнені дані та будь-які додаткові питання можна переглянути тут.", "modal": { "title": "Додаткове запитання" + }, + "cards": { + "back": "Назад", + "connection_error": { + "contacts": "З питаннями звертайтеся за адресою: {{name}}.", + "description": "Ви отримали це повідомлення через технічну помилку. Ви можете спробувати пізніше.", + "heading": "Запит не вдалося виконати", + "title": "Технічна несправність" + }, + "not_filled_required_criteria": { + "contacts": "З питаннями звертайтеся за адресою: {{name}}.", + "description": "Ви отримали це повідомлення, тому що деякі з ваших даних не були знайдені в зовнішній системі. Внаслідок цього ваша заявка не може бути оцінена в повному обсязі.", + "heading": "Запит не вдалося виконати", + "title": "Відсутні дані" + }, + "not_found": { + "contacts": "З питаннями звертайтеся за адресою: {{name}}.", + "description": "Ви отримуєте це повідомлення, тому що ваші дані не були знайдені в зовнішній системі.", + "heading": "Запит не вдалося виконати", + "title": "Ваші дані не знайдено" + }, + "taken_by_partner": { + "contacts": "З питаннями звертайтеся за адресою: {{name}}.", + "description": "Ви отримали це повідомлення, тому що кредит був активований
членом сім'ї або опікуном.
Кредит доступний в акаунті особи, яка
активувала його першою.", + "heading": "Запит не вдалося виконати", + "title": "Цей кредит вже активовано" + } + }, + "options": { + "no": "Ні." + }, + "prefills": { + "child": "Дитинко.", + "children": "Діти", + "partner": "Інформація про вашого партнера", + "subtitle": "Якщо ваша інформація невірна, ви можете натиснути кнопку внизу.", + "title": "Перевірте правильність даних." } }, "fund_requests": { diff --git a/react/src/webshop/props/models/Fund.ts b/react/src/webshop/props/models/Fund.ts index a0662edf6..d6bc9c986 100644 --- a/react/src/webshop/props/models/Fund.ts +++ b/react/src/webshop/props/models/Fund.ts @@ -1,5 +1,6 @@ import FundBase from '../../../dashboard/props/models/Fund'; import FundCriteriaStep from '../../../dashboard/props/models/FundCriteriaStep'; +import FundCriteriaGroup from '../../../dashboard/props/models/FundCriteriaGroup'; export default interface Fund extends FundBase { received?: boolean; @@ -11,6 +12,7 @@ export default interface Fund extends FundBase { auto_validation?: boolean; bsn_confirmation_time?: number; criteria_steps?: Array
familielid of voogd.
De tegoeden zijn beschikbaar in het account van de persoon die
deze als eerste heeft geactiveerd." + ], + [ + "fund_request.cards.taken_by_partner.heading", + "Aanvraag mislukt" + ], + [ + "fund_request.cards.taken_by_partner.title", + "Dit tegoed is al geactiveerd" + ], [ "fund_request.clarifications.info_requested", "Extra vraag gesteld" @@ -1351,6 +1419,30 @@ "fund_request.not_requester", "U bent niet de eigenaar van deze aanvraag." ], + [ + "fund_request.options.no", + "Nee" + ], + [ + "fund_request.prefills.child", + "Kind" + ], + [ + "fund_request.prefills.children", + "Kinderen" + ], + [ + "fund_request.prefills.partner", + "Gegevens van uw partner" + ], + [ + "fund_request.prefills.subtitle", + "Als uw informatie niet correct is, kunt u onderaan op de knop klikken." + ], + [ + "fund_request.prefills.title", + "Controleer of de gegevens correct zijn." + ], [ "fund_request.received.title", "Ontvangen"