@stamhoofd/backend 2.120.5 → 2.121.0

package/src/helpers/RecordAnswerHelper.ts

@@ -0,0 +1,116 @@
+import type { AutoEncoderPatchType, Encodeable, Identifiable, Patchable, PatchableArray } from '@simonbackx/simple-encoding';
+import { isPatchableArray } from '@simonbackx/simple-encoding';
+import { SimpleError } from '@simonbackx/simple-errors';
+import type { RecordCategory, RecordSettings, RecordType } from '@stamhoofd/structures';
+import { RecordAnswerDecoder } from '@stamhoofd/structures';
+
+export class RecordAnswerHelper {
+    static throwIfPatchOrPutIsInvalid(original: RecordCategory[], patchOrPut: RecordCategory[] | PatchableArray<string, RecordCategory, AutoEncoderPatchType<RecordCategory>>) {
+        if (original.length === 0) {
+            return;
+        }
+        
+        const updatedRecordSettings = this.getAllRecords(patchOrPut)
+            // only check if the types changed
+            .filter(p => p.type !== undefined || p.fileType !== undefined);
+
+        if (updatedRecordSettings.length === 0) {
+            return;
+        }
+
+        const updatRecordSettingsMap = new Map<string, RecordSettings | AutoEncoderPatchType<RecordSettings>>(updatedRecordSettings.map(p => [p.id, p]));
+
+        for (const category of original) {
+            for (const originalRecord of category.getAllRecords()) {
+                const updatedSettings = updatRecordSettingsMap.get(originalRecord.id);
+                if (updatedSettings) {
+                    this.throwIfInvalidRecordSettingsUpdate(originalRecord, updatedSettings);
+
+                    // remove from map
+                    updatRecordSettingsMap.delete(originalRecord.id);
+
+                    // stop looping if all updated records are checked
+                    if (updatRecordSettingsMap.size === 0) {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    static throwIfPatchOrPutsAreInvalid<
+        Key extends string & keyof Put,
+        Id extends string | number,
+        Put extends (Identifiable<Id> & Encodeable & Patchable<Patch> & Record<Key, RecordCategory[]>),
+        Patch extends (Identifiable<Id> & Encodeable) | Put
+    >(originals: Put[], patchOrPuts: Put[] | Patch[] | PatchableArray<Id, Put, Patch>, key: string) {
+        if (isPatchableArray(patchOrPuts)) {
+            const puts = patchOrPuts.getPuts().map(p => p.put);
+            this.throwIfPatchOrPutsAreInvalid<Key, Id, Put, Patch>(originals, puts, key);
+            const patches = patchOrPuts.getPatches();
+            this.throwIfPatchOrPutsAreInvalid<Key, Id, Put, Patch>(originals, patches, key);
+        } else {
+            for (const patchOrPut of patchOrPuts) {
+                const original = originals.find(o => o.id === patchOrPut.id);
+                if (original) {
+                    const originalRecordCategories: RecordCategory[] = original[key];
+                    const newRecordCategories: RecordCategory[] | PatchableArray<string, RecordCategory, AutoEncoderPatchType<RecordCategory>> = patchOrPut[key];
+                    if (originalRecordCategories && newRecordCategories) {
+                        this.throwIfPatchOrPutIsInvalid(originalRecordCategories, newRecordCategories);
+                    }
+                }
+            }
+        }
+    }
+
+    private static throwIfInvalidRecordSettingsUpdate(original: RecordSettings, updated: RecordSettings | AutoEncoderPatchType<RecordSettings>) {
+        if (updated.type !== undefined
+            && original.type !== updated.type
+            // changing between types with the same class should be allowed
+            && !this.haveTypesSameClass(original.type, updated.type)) {
+            throw new SimpleError({
+                code: 'invalid_record_type',
+                message: `Cannot change record type from ${original.type} to ${updated.type}`,
+                human: $t(`%1Qn`, {name: original.name}),
+            })
+        }
+
+        if (updated.fileType !== undefined && ((original.fileType ?? null) !== (updated.fileType ?? null))) {
+            throw new SimpleError({
+                code: 'invalid_record_type',
+                message: `Cannot change record file type from ${original.fileType} to ${updated.fileType}`,
+                human: $t(`%1SP`, {name: original.name}),
+            })
+        }
+    }
+
+    static haveTypesSameClass(a: RecordType, b: RecordType) {
+        return RecordAnswerDecoder.getClassForType(a) === RecordAnswerDecoder.getClassForType(b);
+    }
+
+    private static getAllRecords(patchOrPut: RecordCategory[] | PatchableArray<string, RecordCategory, AutoEncoderPatchType<RecordCategory>>): (RecordSettings | AutoEncoderPatchType<RecordSettings>)[] {
+        if (isPatchableArray(patchOrPut)) {
+            const patches = patchOrPut.getPatches().flatMap(p => this.getAllRecordsFromRecordCategoryPatch(p));
+            const puts = patchOrPut.getPuts().flatMap(p => p.put.getAllRecords());
+            return [...patches, ...puts];
+        }
+        return patchOrPut.flatMap(c => c.getAllRecords());
+    }
+
+    private static getAllRecordsFromRecordCategoryPatch(category: AutoEncoderPatchType<RecordCategory>) {
+        const results: (RecordSettings | AutoEncoderPatchType<RecordSettings>)[] = [
+            ...category.records.getPatches(),
+            ...category.records.getPuts().map(p => p.put)
+        ];
+
+        if (category.childCategories) {
+            const childCategoryPatches = category.childCategories.getPatches().flatMap(p => this.getAllRecordsFromRecordCategoryPatch(p));
+            results.push(...childCategoryPatches);
+
+            const childCategoryPuts = category.childCategories.getPuts().flatMap(p => p.put.getAllRecords());
+            results.push(...childCategoryPuts);
+        }
+
+        return results;
+    }
+}

package/src/helpers/StripeHelper.ts

@@ -207,7 +207,7 @@ export class StripeHelper {
     }
 
     static async createPayment(
-        { payment, stripeAccount, redirectUrl, cancelUrl, customer, statementDescriptor, i18n, metadata, organization, lineItems }: {
+        { payment, stripeAccount, redirectUrl, cancelUrl, customer, statementDescriptor, i18n, metadata, organization }: {
             payment: Payment;
             stripeAccount: StripeAccount | null;
             redirectUrl: string;
@@ -218,9 +218,8 @@ export class StripeHelper {
             };
             statementDescriptor: string;
             i18n: I18n;
-            metadata: { [key: string]: string };
+            metadata: { [key: string]: string | undefined};
             organization: Organization;
-            lineItems: (BalanceItemPayment & { balanceItem: BalanceItem })[];
         },
     ): Promise<{ paymentUrl: string }> {
         if (!stripeAccount) {

package/src/helpers/ViesHelper.ts

@@ -128,13 +128,17 @@ export class ViesHelperStatic {
         if (!result.isValid) {
             throw new SimpleError({
                 code: 'invalid_field',
-                message: 'Ongeldig BTW-nummer: ' + vatNumber,
+                message: $t('%1To', {'number': vatNumber}),
                 field: 'VATNumber',
             });
         }
 
         const formatted = result.value ?? vatNumber;
 
+        if (STAMHOOFD.environment === 'development' && formatted === 'NL301828519B01') {
+            return formatted
+        }
+
         try {
             const cleaned = formatted.substring(2).replace(/(?:\.-\s)+/g, '');
             const response = await this.request('POST', 'https://ec.europa.eu/taxation_customs/vies/rest-api/check-vat-number', {
@@ -150,7 +154,7 @@ export class ViesHelperStatic {
             if (!response.valid) {
                 throw new SimpleError({
                     code: 'invalid_field',
-                    message: 'Het opgegeven BTW-nummer is ongeldig of niet BTW-plichtig: ' + formatted,
+                    message: $t('%1TG', {'vat-number': formatted}),
                     field: 'VATNumber',
                 });
             }
@@ -164,7 +168,7 @@ export class ViesHelperStatic {
 
             throw new SimpleError({
                 code: 'service_unavailable',
-                message: 'De BTW-nummer validatie service (VIES) is tijdelijk niet beschikbaar. Probeer het later opnieuw.',
+                message: $t('%1Sf'),
                 field: 'VATNumber',
             });
         }

package/src/seeds/1750090030-records-configuration.ts

@@ -1,11 +1,76 @@
-import { Migration } from '@simonbackx/simple-database';
+import { column, Migration } from '@simonbackx/simple-database';
+import { AutoEncoder, field } from '@simonbackx/simple-encoding';
 import { Organization, Webshop } from '@stamhoofd/models';
+import { QueryableModel, SQL } from '@stamhoofd/sql';
+import { DataPermissionsSettings, FinancialSupportSettings, Version } from '@stamhoofd/structures';
+import { v4 as uuidv4 } from 'uuid';
+
+class OldOrganizationRecordsConfiguration extends AutoEncoder {
+    /**
+     * If the organizations provides support for families in financial difficulties
+     */
+    @field({ decoder: FinancialSupportSettings, nullable: true, version: 117 })
+    financialSupport: FinancialSupportSettings | null = null;
+
+    /**
+     * Ask permissions to collect data
+     */
+    @field({ decoder: DataPermissionsSettings, nullable: true, version: 117 })
+    dataPermission: DataPermissionsSettings | null = null;
+}
+
+class OldOrganizationMetaData extends AutoEncoder {
+    @field({ 
+        decoder: OldOrganizationRecordsConfiguration, 
+        version: 53,
+        defaultValue: () => OldOrganizationRecordsConfiguration.create({})
+    })
+    recordsConfiguration: OldOrganizationRecordsConfiguration = OldOrganizationRecordsConfiguration.create({});
+}
+
+// get data like it was in V1
+export class OldOrganization extends QueryableModel {
+    static table = 'organizations';
+
+    @column({
+    primary: true, type: 'string', beforeSave(value) {
+        return value ?? uuidv4();
+    }
+    })
+    id!: string;
+
+    /**
+     * Public meta data
+     */
+    @column({ type: 'json', decoder: OldOrganizationMetaData })
+    meta: OldOrganizationMetaData = OldOrganizationMetaData.create({});
+}
 
 export async function startRecordsConfigurationMigration() {
-    for await (const organization of Organization.select().all()) {
-        await organization.save();
+
+    // migrate recordsConfiguration of organizations
+    for await (const oldOrganization of OldOrganization.select()
+        // prevent migrating same organizations twice if something goes wrong
+        .where(SQL.jsonValue(SQL.column('meta'), '$.version'), '<', Version)
+        .all()) {
+        const oldFinancialSupport = oldOrganization.meta.recordsConfiguration.financialSupport;
+        const oldDataPermission = oldOrganization.meta.recordsConfiguration.dataPermission;
+
+        if (oldFinancialSupport || oldDataPermission) {
+            const newOrganization = await Organization.getByID(oldOrganization.id);
+
+            if (!newOrganization) {
+                throw new Error('Organization with id ' + oldOrganization.id + ' not found');
+            }
+
+            newOrganization.meta.financialSupport = oldFinancialSupport;
+            newOrganization.meta.dataPermission = oldDataPermission;
+
+            await newOrganization.save();
+        }
     }
 
+    // migrate recordsConfiguration of webshops
     for await (const webshop of Webshop.select().all()) {
         await webshop.save();
     }

package/src/seeds/1752848561-groups-registration-periods.ts

@@ -1,6 +1,6 @@
 import { Migration } from '@simonbackx/simple-database';
-import { Group, Organization, OrganizationRegistrationPeriod, Registration, RegistrationPeriod } from '@stamhoofd/models';
-import type { CycleInformation} from '@stamhoofd/structures';
+import { Group, Organization, OrganizationRegistrationPeriod, Registration, RegistrationInvitation, RegistrationPeriod } from '@stamhoofd/models';
+import type { CycleInformation } from '@stamhoofd/structures';
 import { GroupCategory, GroupCategorySettings, GroupPrivateSettings, GroupSettings, GroupStatus, GroupType, RegistrationPeriodSettings, TranslatedString } from '@stamhoofd/structures';
 
 export default new Migration(async () => {
@@ -419,6 +419,8 @@ async function migrateRegistrations({ organization, period, originalGroup, newGr
         .fetch();
 
     for (const registration of registrations) {
+        let invitation: RegistrationInvitation | null = null;
+
         if (registration.waitingList) {
             const waitingList = await getOrCreateWaitingList();
             if (newGroup.waitingListId !== waitingList.id) {
@@ -430,6 +432,18 @@ async function migrateRegistrations({ organization, period, originalGroup, newGr
             }
 
             registration.groupId = waitingList.id;
+
+            if (registration.canRegister) {
+                // we should create an invitation
+                invitation = new RegistrationInvitation();
+                invitation.groupId = newGroup.id;
+                invitation.memberId = registration.memberId;
+                invitation.organizationId = organization.id;
+                invitation.createdAt = registration.createdAt;
+
+                // deprecated -> set to false
+                registration.canRegister = false;
+            }
         }
         else {
             registration.groupId = newGroup.id;
@@ -440,6 +454,16 @@ async function migrateRegistrations({ organization, period, originalGroup, newGr
 
         if (!dryRun) {
             await registration.save();
+            if (invitation) {
+                try {
+                    await invitation.save();
+                } catch (e) {
+                    // do not throw if duplicate
+                    if (e.code !== 'ER_DUP_ENTRY') {
+                        throw e;
+                    }
+                }
+            }
         }
     }
 }

package/src/seeds/1779121239-default-invoice-email-template.sql

@@ -0,0 +1,3 @@
+INSERT INTO `email_templates` (`id`, `subject`, `groupId`, `webshopId`, `organizationId`, `type`, `text`, `html`, `json`, `updatedAt`, `createdAt`) VALUES
+('5d97e1d3-3f5c-415b-813a-0669b724f716', 'Fout bij het automatisch aanmaken van facturen', NULL, NULL, NULL, 'InvoiceGenerationErrors', '{{greeting}}\n\nBij het automatisch aanmaken van facturen in naam van {{organizationName}} ging er iets mis. Hieronder kan je een lijst terugvinden van alle foutmeldingen. Kijk ze na en maak indien nodig de juiste correcties in het systeem.\n\n{{errors}}', '<!DOCTYPE html>\n<html>\n\n<head>\n<meta charset=\"utf-8\" />\n<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\" />\n<meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\" />\n<title>Fout bij het automatisch aanmaken van facturen</title>\n<style type=\"text/css\">body {\n  color: #000716;\n  color: var(--color-dark, #000716);\n  font-family: -apple-system-body, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, Helvetica, Arial, sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\";\n  font-size: 12pt;\n  line-height: 1.4;\n}\n\np {\n  margin: 0;\n  padding: 0;\n  line-height: 1.4;\n}\n\np.description {\n  color: var(--color-gray-4, #5e5e5e);\n}\np.description a, p.description a:link, p.description a:visited, p.description a:active, p.description a:hover {\n  text-decoration: underline;\n  color: var(--color-gray-4, #5e5e5e);\n}\n\nstrong {\n  font-weight: bold;\n}\n\nem {\n  font-style: italic;\n}\n\nh1 {\n  font-size: 30px;\n  font-weight: bold;\n  line-height: 1.2;\n  margin: 0;\n  padding: 0;\n}\n@media (max-width: 350px) {\n  h1 {\n    font-size: 24px;\n  }\n}\n\nh2 {\n  font-size: 20px;\n  line-height: 1.2;\n  font-weight: bold;\n  margin: 0;\n  padding: 0;\n}\n\nh3 {\n  font-size: 16px;\n  line-height: 1.2;\n  font-weight: bold;\n  margin: 0;\n  padding: 0;\n}\n\nh4 {\n  line-height: 1.2;\n  font-weight: 500;\n  margin: 0;\n  padding: 0;\n}\n\nol, ul {\n  list-style-position: outside;\n  padding-left: 30px;\n}\n\nhr {\n  height: 1px;\n  background: var(--color-border, var(--color-gray-2, #dcdcdc));\n  border-radius: 1px;\n  padding: 0;\n  margin: 20px 0;\n  outline: none;\n  border: 0;\n}\n\n.button {\n  touch-action: inherit;\n  user-select: auto;\n  cursor: pointer;\n  display: inline-block !important;\n  line-height: 42px;\n  font-size: 16px;\n  font-weight: bold;\n  text-box-trim: none;\n}\n.button:active {\n  transform: none;\n}\n\nimg {\n  max-width: 100%;\n  height: auto;\n}\n\na, a:link, a:visited, a:active, a:hover {\n  text-decoration: underline;\n  color: blue;\n}\n\n.email-data-table {\n  width: 100%;\n  border-collapse: collapse;\n}\n.email-data-table th, .email-data-table td {\n  text-align: left;\n  padding: 10px 10px 10px 0;\n  border-bottom: 1px solid var(--color-border, var(--color-gray-2, #dcdcdc));\n  vertical-align: middle;\n}\n.email-data-table th:last-child, .email-data-table td:last-child {\n  text-align: right;\n  padding-right: 0;\n}\n.email-data-table td.price {\n  white-space: nowrap;\n}\n.email-data-table thead {\n  font-weight: bold;\n}\n.email-data-table thead th {\n  font-size: 10pt;\n}\n.email-data-table h4 ~ p {\n  padding-top: 3px;\n  opacity: 0.8;\n  font-size: 11pt;\n}\n\n.email-style-inline-code {\n  font-family: monospace;\n  white-space: pre-wrap;\n  display: inline-block;\n}\n\n.email-style-description-small {\n  font-size: 14px;\n  line-height: 1.5;\n  font-weight: normal;\n  color: var(--color-gray-4, #5e5e5e);\n  font-variation-settings: \"opsz\" 19;\n}\n\n.email-style-title-list {\n  font-size: 16px;\n  line-height: 1.3;\n  font-weight: 500;\n}\n.email-style-title-list + p {\n  padding-top: 3px;\n}\n\n.email-style-title-prefix-list {\n  font-size: 11px;\n  line-height: 1.5;\n  font-weight: bold;\n  color: {{primaryColor}};\n  text-transform: uppercase;\n  margin-bottom: 3px;\n}\n.email-style-title-prefix-list.error {\n  color: #f0153d;\n}\n\n.email-style-price-base, .email-style-discount-price, .email-style-discount-old-price, .email-style-price {\n  font-size: 15px;\n  line-height: 1.4;\n  font-weight: 500;\n  font-variant-numeric: tabular-nums;\n}\n.email-style-price-base.disabled, .disabled.email-style-discount-price, .disabled.email-style-discount-old-price, .disabled.email-style-price {\n  opacity: 0.6;\n}\n.email-style-price-base.negative, .negative.email-style-discount-price, .negative.email-style-discount-old-price, .negative.email-style-price {\n  color: #f0153d;\n}\n\n.email-style-price {\n  font-weight: bold;\n  color: {{primaryColor}};\n}\n\n.email-style-discount-old-price {\n  text-decoration: line-through;\n  color: var(--color-gray-4, #5e5e5e);\n}\n\n.email-style-discount-price {\n  font-weight: bold;\n  color: #ff4747;\n  margin-left: 5px;\n}\n\n.pre-wrap {\n  white-space: pre-wrap;\n} hr {height: 2px;background: #e7e7e7; border-radius: 1px; padding: 0; margin: 20px 0; outline: none; border: 0;} .button.primary { margin: 0; text-decoration: none; font-size: 16px; font-weight: bold; color: {{primaryColorContrast}}; padding: 0 27px; line-height: 42px; background: {{primaryColor}}; text-align: center; border-radius: 7px; touch-action: manipulation; display: inline-block; transition: 0.2s transform, 0.2s opacity; } .button.primary:active { transform: scale(0.95, 0.95); }  .inline-link, .inline-link:link, .inline-link:visited, .inline-link:active, .inline-link:hover { margin: 0; text-decoration: underline; font-size: inherit; font-weight: inherit; color: inherit; touch-action: manipulation; } .inline-link:active { opacity: 0.5; }  .description { color: #5e5e5e; } </style>\n</head>\n\n<body>\n<p style=\"margin: 0; padding: 0; line-height: 1.4;\">{{greeting}}</p><p style=\"margin: 0; padding: 0; line-height: 1.4;\"><br></p><p style=\"margin: 0; padding: 0; line-height: 1.4;\">Bij het automatisch aanmaken van facturen in naam van {{organizationName}} ging er iets mis. Hieronder kan je een lijst terugvinden van alle foutmeldingen. Kijk ze na en maak indien nodig de juiste correcties in het systeem.</p><p style=\"margin: 0; padding: 0; line-height: 1.4;\"><br></p><p style=\"margin: 0; padding: 0; line-height: 1.4;\">{{errors}}</p>\n</body>\n\n</html>', '{\"value\": {\"type\": \"doc\", \"content\": [{\"type\": \"paragraph\", \"content\": [{\"type\": \"smartVariable\", \"attrs\": {\"id\": \"greeting\"}}]}, {\"type\": \"paragraph\"}, {\"type\": \"paragraph\", \"content\": [{\"text\": \"Bij het automatisch aanmaken van facturen in naam van \", \"type\": \"text\"}, {\"type\": \"smartVariable\", \"attrs\": {\"id\": \"organizationName\"}}, {\"text\": \" ging er iets mis. Hieronder kan je een lijst terugvinden van alle foutmeldingen. Kijk ze na en maak indien nodig de juiste correcties in het systeem.\", \"type\": \"text\"}]}, {\"type\": \"paragraph\"}, {\"type\": \"paragraph\", \"content\": [{\"type\": \"smartVariable\", \"attrs\": {\"id\": \"errors\"}}]}]}, \"version\": 397}', '2026-05-18 14:52:07', '2026-05-18 14:52:07') 
+ON DUPLICATE KEY UPDATE id=id;

package/src/services/BalanceItemService.ts

@@ -1,7 +1,8 @@
 import { Model } from '@simonbackx/simple-database';
-import type { Organization, Payment} from '@stamhoofd/models';
+import type { Organization, Payment } from '@stamhoofd/models';
 import { BalanceItem, CachedBalance, Document, MemberUser, Order, Webshop } from '@stamhoofd/models';
 import { AuditLogSource, BalanceItemStatus, BalanceItemType, OrderStatus, PaymentStatus, ReceivableBalanceType } from '@stamhoofd/structures';
+import { Formatter } from '@stamhoofd/utility';
 import { GroupedThrottledQueue } from '../helpers/GroupedThrottledQueue.js';
 import { ThrottledQueue } from '../helpers/ThrottledQueue.js';
 import { AuditLogService } from './AuditLogService.js';
@@ -108,10 +109,19 @@ export const BalanceItemService = {
      */
     async updatePaidAndPending(items: BalanceItem[]) {
         console.log('updatePaidAndPending for', items.length, 'items');
-        await BalanceItem.updatePricePaid(items.map(i => i.id));
+        await BalanceItem.updatePricePaid(Formatter.uniqueArray(items.map(i => i.id)));
         await this.scheduleUpdates(items);
     },
 
+    /**
+     * Call this when a payment or payment balance items have changed.
+     * It will also call updateOutstanding automatically, so no need to call that separately again
+     */
+    async updateInvoiced(items: (BalanceItem | string)[]) {
+        console.log('updateInvoiced for', items.length, 'items');
+        await BalanceItem.updateInvoiced(Formatter.uniqueArray(items.map(i => typeof i === 'string' ? i : i.id)));
+    },
+
     /**
      * In some situations we need immediate updates
      */
@@ -275,13 +285,6 @@ export const BalanceItemService = {
                 await order.undoPaid(payment, organization);
             }
         }
-
-        // If a rounded payment was canceled, make sure the balance item is hidden again (will become visible again when marking paid)
-        if (this.type === BalanceItemType.Rounding && balanceItem.status !== BalanceItemStatus.Hidden) {
-            // Mark undue
-            balanceItem.status = BalanceItemStatus.Hidden;
-            await balanceItem.save();
-        }
     },
 
     async markFailed(balanceItem: BalanceItem, payment: Payment, organization: Organization) {
@@ -297,13 +300,6 @@ export const BalanceItemService = {
                 }
             }
         }
-
-        // If a rounded payment was canceled, make sure the balance item is hidden again (will become visible again when marking paid)
-        if (this.type === BalanceItemType.Rounding && balanceItem.status !== BalanceItemStatus.Hidden) {
-            // Mark undue
-            balanceItem.status = BalanceItemStatus.Hidden;
-            await balanceItem.save();
-        }
     },
 
     async undoFailed(balanceItem: BalanceItem, payment: Payment, organization: Organization) {