@stamhoofd/backend 2.62.0 → 2.64.0

package/index.ts

@@ -1,7 +1,7 @@
 import backendEnv from '@stamhoofd/backend-env';
 backendEnv.load();
 
-import { Column, Database, Migration, Model } from '@simonbackx/simple-database';
+import { Column, Database, Migration } from '@simonbackx/simple-database';
 import { CORSPreflightEndpoint, Router, RouterServer } from '@simonbackx/simple-endpoints';
 import { I18n } from '@stamhoofd/backend-i18n';
 import { CORSMiddleware, LogMiddleware, VersionMiddleware } from '@stamhoofd/backend-middleware';
@@ -10,14 +10,14 @@ import { loadLogger } from '@stamhoofd/logging';
 import { Version } from '@stamhoofd/structures';
 import { sleep } from '@stamhoofd/utility';
 
-import { stopCrons, startCrons, waitForCrons } from '@stamhoofd/crons';
+import { startCrons, stopCrons, waitForCrons } from '@stamhoofd/crons';
+import { Platform } from '@stamhoofd/models';
 import { resumeEmails } from './src/helpers/EmailResumer';
+import { SetupStepUpdater } from './src/helpers/SetupStepUpdater';
 import { ContextMiddleware } from './src/middleware/ContextMiddleware';
-import { Platform } from '@stamhoofd/models';
 import { AuditLogService } from './src/services/AuditLogService';
-import { PlatformMembershipService } from './src/services/PlatformMembershipService';
 import { DocumentService } from './src/services/DocumentService';
-import { SetupStepUpdater } from './src/helpers/SetupStepUpdater';
+import { PlatformMembershipService } from './src/services/PlatformMembershipService';
 
 process.on('unhandledRejection', (error: Error) => {
     console.error('unhandledRejection');
@@ -39,7 +39,9 @@ if (new Date().getTimezoneOffset() !== 0) {
 const seeds = async () => {
     try {
         // Internal
-        await Migration.runAll(__dirname + '/src/seeds');
+        await AuditLogService.disable(async () => {
+            await Migration.runAll(__dirname + '/src/seeds');
+        });
     }
     catch (e) {
         console.error('Failed to run seeds:');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.62.0",
+    "version": "2.64.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -34,17 +34,17 @@
         "@bwip-js/node": "^4.5.1",
         "@mollie/api-client": "3.7.0",
         "@simonbackx/simple-database": "1.27.0",
-        "@simonbackx/simple-encoding": "2.18.0",
+        "@simonbackx/simple-encoding": "2.19.0",
         "@simonbackx/simple-endpoints": "1.15.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.62.0",
-        "@stamhoofd/backend-middleware": "2.62.0",
-        "@stamhoofd/email": "2.62.0",
-        "@stamhoofd/models": "2.62.0",
-        "@stamhoofd/queues": "2.62.0",
-        "@stamhoofd/sql": "2.62.0",
-        "@stamhoofd/structures": "2.62.0",
-        "@stamhoofd/utility": "2.62.0",
+        "@stamhoofd/backend-i18n": "2.64.0",
+        "@stamhoofd/backend-middleware": "2.64.0",
+        "@stamhoofd/email": "2.64.0",
+        "@stamhoofd/models": "2.64.0",
+        "@stamhoofd/queues": "2.64.0",
+        "@stamhoofd/sql": "2.64.0",
+        "@stamhoofd/structures": "2.64.0",
+        "@stamhoofd/utility": "2.64.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -64,5 +64,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "e3d5890ed7cbd9774a2b917b758e2ff1a0613b6a"
+    "gitHead": "80eebbb0b4fb84ac979041c3f8c7762863622367"
 }

package/src/audit-logs/PaymentLogger.ts

@@ -26,7 +26,7 @@ export const PaymentLogger = new ModelLogger(Payment, {
     },
 
     createReplacements(model, options) {
-        let name = `${PaymentMethodHelper.getPaymentName(model.method)}`;
+        let name = `${PaymentMethodHelper.getPaymentName(model.method, model.type)}`;
 
         if (model.customer?.dynamicName) {
             name += ` van ${model.customer.dynamicName}`;

package/src/crons/index.ts

@@ -2,3 +2,4 @@ import './amazon-ses.js';
 import './clearExcelCache.js';
 import './endFunctionsOfUsersWithoutRegistration.js';
 import './postmark.js';
+import './update-cached-balances.js';

package/src/crons/update-cached-balances.ts

@@ -0,0 +1,39 @@
+import { CachedBalance } from '@stamhoofd/models';
+import { registerCron } from '@stamhoofd/crons';
+
+registerCron('updateCachedBalances', updateCachedBalances);
+
+async function updateCachedBalances() {
+    // Check if between 3 - 6 AM
+    if ((new Date().getHours() > 6 || new Date().getHours() < 3) && STAMHOOFD.environment !== 'development') {
+        console.log('Not between 3 and 6 AM, skipping.');
+        return;
+    }
+
+    const balances = await CachedBalance.select().where(
+        CachedBalance.whereNeedsUpdate(),
+    ).limit(100).fetch();
+
+    // Group by object type and by organization id
+    const grouped = new Map<string, CachedBalance[]>();
+
+    for (const balance of balances) {
+        const key = balance.objectType + '-' + balance.organizationId;
+        const arr = grouped.get(key);
+
+        if (!arr) {
+            grouped.set(key, [balance]);
+            continue;
+        }
+
+        arr.push(balance);
+    }
+
+    for (const [_, balances] of grouped) {
+        const balance = balances[0];
+
+        const ids = balances.map(b => b.objectId);
+        console.log('Updating', ids.length, balance.objectType, 'for', balance.organizationId);
+        await CachedBalance.updateForObjects(balance.organizationId, ids, balance.objectType);
+    }
+}

package/src/email-recipient-loaders/receivable-balances.ts

@@ -18,6 +18,11 @@ async function fetch(query: LimitedFilteredRequest, subfilter: StamhoofdFilter |
                     email,
                     replacements: [
                         Replacement.create({
+                            token: 'objectName',
+                            value: balance.object.name,
+                        }),
+                        Replacement.create({
+                            // Deprecated: for backwards compatibility
                             token: 'organizationName',
                             value: balance.object.name,
                         }),

package/src/endpoints/global/members/PatchOrganizationMembersEndpoint.ts

@@ -2,7 +2,7 @@ import { OneToManyRelation } from '@simonbackx/simple-database';
 import { ConvertArrayToPatchableArray, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { BalanceItem, Document, Group, Member, MemberFactory, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, mergeTwoMembers, Organization, Platform, RateLimiter, Registration, User } from '@stamhoofd/models';
+import { BalanceItem, Document, Group, Member, MemberFactory, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, mergeTwoMembers, Organization, Platform, RateLimiter, Registration, RegistrationPeriod, User } from '@stamhoofd/models';
 import { GroupType, MembersBlob, MemberWithRegistrationsBlob, PermissionLevel } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
@@ -218,7 +218,6 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                     });
                 }
 
-                const platform = await Platform.getShared();
                 const responsibility = platform.config.responsibilities.find(r => r.id === patchResponsibility.responsibilityId);
 
                 if (responsibility && !responsibility.organizationBased && !Context.auth.hasPlatformFullAccess()) {
@@ -261,7 +260,6 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                     throw Context.auth.error('Je hebt niet voldoende rechten om functies van leden aan te passen');
                 }
 
-                const platform = await Platform.getShared();
                 const platformResponsibility = platform.config.responsibilities.find(r => r.id === put.responsibilityId);
                 const org = organization ?? (put.organizationId ? await Organization.getByID(put.organizationId) : null);
 
@@ -414,12 +412,25 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
             // Add platform memberships
             for (const { put } of patch.platformMemberships.getPuts()) {
                 if (put.periodId !== platform.periodId) {
-                    throw new SimpleError({
-                        code: 'invalid_field',
-                        message: 'Invalid period',
-                        human: 'Je kan geen aansluitingen maken voor een andere werkjaar dan het actieve werkjaar',
-                        field: 'periodId',
-                    });
+                    const period = await RegistrationPeriod.getByID(put.periodId);
+
+                    if (!period) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'Invalid period',
+                            human: Context.i18n.$t(`Je kan geen aansluitingen meer toevoegen in dit werkjaar`),
+                            field: 'periodId',
+                        });
+                    }
+
+                    if (period?.locked) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'Invalid period',
+                            human: Context.i18n.$t(`Je kan geen aansluitingen meer toevoegen in {period} (vergrendeld)`, { period: period?.getBaseStructure().name }),
+                            field: 'periodId',
+                        });
+                    }
                 }
 
                 if (organization && put.organizationId !== organization.id) {
@@ -449,6 +460,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                     .where('memberId', member.id)
                     .where('membershipTypeId', put.membershipTypeId)
                     .where('periodId', put.periodId)
+                    .where('deletedAt', null)
                     .where(
                         SQL.where(
                             SQL.where('startDate', SQLWhereSign.LessEqual, put.startDate)
@@ -481,7 +493,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                 membership.organizationId = put.organizationId;
                 membership.periodId = put.periodId;
 
-                membership.startDate = put.startDate;
+                membership.startDate = new Date(Math.max(Date.now(), put.startDate.getTime()));
                 membership.endDate = put.endDate;
                 membership.expireDate = put.expireDate;
 
@@ -509,12 +521,25 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                 }
 
                 if (membership.periodId !== platform.periodId) {
-                    throw new SimpleError({
-                        code: 'invalid_field',
-                        message: 'Invalid period',
-                        human: 'Je kan geen aansluitingen meer verwijderen voor een ander werkjaar dan het actieve werkjaar',
-                        field: 'periodId',
-                    });
+                    const period = await RegistrationPeriod.getByID(membership.periodId);
+
+                    if (!period) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'Invalid period',
+                            human: Context.i18n.$t(`Je kan geen aansluitingen meer verwijderen in dit werkjaar`),
+                            field: 'periodId',
+                        });
+                    }
+
+                    if (period?.locked) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'Invalid period',
+                            human: Context.i18n.$t(`Je kan geen aansluitingen meer verwijderen in {period} (vergrendeld)`, { period: period?.getBaseStructure().name }),
+                            field: 'periodId',
+                        });
+                    }
                 }
 
                 if (!membership.canDelete() && !Context.auth.hasPlatformFullAccess()) {

package/src/endpoints/global/platform/PatchPlatformEnpoint.ts

@@ -157,6 +157,8 @@ export class PatchPlatformEndpoint extends Endpoint<
             platform.periodId = period.id;
             shouldUpdateSetupSteps = true;
             shouldMoveToPeriod = period;
+
+            await platform.setPreviousPeriodId();
         }
 
         if (request.body.membershipOrganizationId !== undefined) {

package/src/endpoints/global/registration/GetUserPayableBalanceEndpoint.ts

@@ -62,18 +62,21 @@ export class GetUserPayableBalanceEndpoint extends Endpoint<Params, Query, Body,
         for (const organization of authenticatedOrganizations) {
             const items = receivableBalances.filter(b => b.organizationId === organization.id);
 
-            let amount = 0;
+            let amountOpen = 0;
             let amountPending = 0;
+            let amountPaid = 0;
 
             for (const item of items) {
-                amount += item.amount;
+                amountOpen += item.amountOpen;
                 amountPending += item.amountPending;
+                amountPaid += item.amountPaid;
             }
 
             billingStatus.organizations.push(PayableBalance.create({
                 organization,
-                amount,
+                amountOpen,
                 amountPending,
+                amountPaid,
             }));
         }
 

package/src/endpoints/global/registration/RegisterMembersEndpoint.ts

@@ -5,7 +5,7 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Email } from '@stamhoofd/email';
 import { BalanceItem, BalanceItemPayment, Group, Member, MemberWithRegistrations, MolliePayment, MollieToken, Organization, PayconiqPayment, Payment, Platform, RateLimiter, Registration, User } from '@stamhoofd/models';
-import { BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, BalanceItemWithPayments, IDRegisterCheckout, PaymentCustomer, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Payment as PaymentStruct, PermissionLevel, PlatformFamily, PlatformMember, RegisterItem, RegisterResponse, Version } from '@stamhoofd/structures';
+import { BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, BalanceItem as BalanceItemStruct, IDRegisterCheckout, PaymentCustomer, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Payment as PaymentStruct, PermissionLevel, PlatformFamily, PlatformMember, RegisterItem, RegisterResponse, Version, PaymentType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
@@ -104,7 +104,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
 
         // Validate balance items (can only happen serverside)
         const balanceItemIds = request.body.cart.balanceItems.map(i => i.item.id);
-        let memberBalanceItemsStructs: BalanceItemWithPayments[] = [];
+        let memberBalanceItemsStructs: BalanceItemStruct[] = [];
         let balanceItemsModels: BalanceItem[] = [];
         if (balanceItemIds.length > 0) {
             balanceItemsModels = await BalanceItem.where({ id: { sign: 'IN', value: balanceItemIds }, organizationId: organization.id });
@@ -114,7 +114,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                     message: 'Oeps, één of meerdere openstaande bedragen in jouw winkelmandje zijn aangepast. Herlaad de pagina en probeer opnieuw.',
                 });
             }
-            memberBalanceItemsStructs = await BalanceItem.getStructureWithPayments(balanceItemsModels);
+            memberBalanceItemsStructs = balanceItemsModels.map(i => i.getStructure());
         }
 
         const memberIds = Formatter.uniqueArray(
@@ -242,7 +242,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             }
 
             // Check if this member is already registered in this group?
-            const existingRegistrations = await Registration.where({ memberId: member.id, groupId: item.groupId, cycle: group.cycle });
+            const existingRegistrations = await Registration.where({ memberId: member.id, groupId: item.groupId, cycle: group.cycle, periodId: group.periodId, registeredAt: { sign: '!=', value: null } });
 
             for (const existingRegistration of existingRegistrations) {
                 if (item.replaceRegistrations.some(r => r.id === existingRegistration.id)) {
@@ -263,7 +263,25 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 }
             }
 
-            const registration = new Registration()
+            let reuseRegistration: Registration | null = null;
+
+            if (item.replaceRegistrations.length === 1) {
+                // Try to reuse this specific one
+                reuseRegistration = (await Registration.getByID(item.replaceRegistrations[0].id)) ?? null;
+            }
+
+            let startDate = item.calculatedStartDate;
+
+            if (!reuseRegistration) {
+                // Otherwise try to reuse a registration in the same period, for the same group that has been deactived for less than 7 days since the start of the new registration
+                reuseRegistration = existingRegistrations.find(r => r.deactivatedAt !== null && r.deactivatedAt.getTime() > startDate.getTime() - 7 * 24 * 60 * 60 * 1000) ?? null;
+
+                if (reuseRegistration && reuseRegistration.startDate && reuseRegistration.startDate < startDate && reuseRegistration.startDate >= group.settings.startDate && !item.trial) {
+                    startDate = reuseRegistration.startDate;
+                }
+            }
+
+            const registration = (reuseRegistration ?? new Registration())
                 .setRelation(registrationMemberRelation, member as Member)
                 .setRelation(Registration.group, group);
             registration.organizationId = organization.id;
@@ -275,6 +293,20 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             registration.groupPrice = item.groupPrice;
             registration.options = item.options;
             registration.recordAnswers = item.recordAnswers;
+            registration.startDate = startDate;
+
+            // Clear if we are reusing an existing registration
+            registration.trialUntil = null;
+            registration.pricePaid = 0;
+            registration.payingOrganizationId = null;
+
+            // NOTE: we don't reset deactivatedAt - registeredAt, because those will get reset when markValid is called later on (while keeping the original registeredAt date)
+            // registration.deactivatedAt = null;
+            // registration.registeredAt = null; // this is required to trigger platform membership updates
+
+            if (item.trial) {
+                registration.trialUntil = item.calculatedTrialUntil;
+            }
 
             if (whoWillPayNow === 'organization' && request.body.asOrganizationId) {
                 registration.payingOrganizationId = request.body.asOrganizationId;
@@ -428,8 +460,12 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 // Who is responsible for payment?
                 balanceItem2.memberId = registration.memberId;
 
+                if (registration.trialUntil) {
+                    balanceItem2.dueAt = registration.trialUntil;
+                }
+
                 // If the paying organization hasn't paid yet, this should be hidden and move to pending as soon as the paying organization has paid
-                balanceItem2.status = BalanceItemStatus.Hidden; // shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden;
+                balanceItem2.status = BalanceItemStatus.Hidden;
                 await balanceItem2.save();
 
                 // do not add to createdBalanceItems array because we don't want to add this to the payment if we create a payment
@@ -440,12 +476,16 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 balanceItem.userId = user.id;
             }
 
-            balanceItem.status = BalanceItemStatus.Hidden; // shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden;
+            balanceItem.status = BalanceItemStatus.Hidden;
             balanceItem.pricePaid = 0;
 
             // Connect the 'pay back' balance item to this balance item. As soon as this balance item is paid, we'll mark the other one as pending so the outstanding balance for the member increases
             balanceItem.dependingBalanceItemId = balanceItem2?.id ?? null;
 
+            if (registration.trialUntil) {
+                balanceItem.dueAt = registration.trialUntil;
+            }
+
             await balanceItem.save();
             createdBalanceItems.push(balanceItem);
         }
@@ -554,7 +594,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             if (oldestMember) {
                 balanceItem.memberId = oldestMember.id;
             }
-            balanceItem.status = BalanceItemStatus.Hidden; // shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden;
+            balanceItem.status = BalanceItemStatus.Hidden;
             await balanceItem.save();
             createdBalanceItems.push(balanceItem);
         }
@@ -579,7 +619,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 }
             }
 
-            balanceItem.status = BalanceItemStatus.Hidden; // shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden;
+            balanceItem.status = BalanceItemStatus.Hidden;
             await balanceItem.save();
 
             createdBalanceItems.push(balanceItem);
@@ -613,7 +653,9 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             const mappedBalanceItems = new Map<BalanceItem, number>();
 
             for (const item of createdBalanceItems) {
-                mappedBalanceItems.set(item, item.price);
+                if (item.dueAt === null) {
+                    mappedBalanceItems.set(item, item.price);
+                }
             }
 
             for (const item of checkout.cart.balanceItems) {
@@ -652,6 +694,9 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             await BalanceItem.updateOutstanding([...createdBalanceItems, ...unrelatedCreatedBalanceItems]);
         }
 
+        // Reallocate
+        await BalanceItemService.reallocate([...createdBalanceItems, ...unrelatedCreatedBalanceItems], organization.id);
+
         // Update occupancy
         for (const group of groups) {
             if (registrations.some(r => r.groupId === group.id) || deactivatedRegistrationGroupIds.some(id => id === group.id)) {
@@ -674,6 +719,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
         // Calculate total price to pay
         let totalPrice = 0;
         const payMembers: MemberWithRegistrations[] = [];
+        let hasNegative = false;
 
         for (const [balanceItem, price] of balanceItems) {
             if (organization.id !== balanceItem.organizationId) {
@@ -694,6 +740,10 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 });
             }
 
+            if (price < 0) {
+                hasNegative = true;
+            }
+
             totalPrice += price;
 
             if (price > 0 && balanceItem.memberId) {
@@ -709,27 +759,33 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
         }
 
         if (totalPrice < 0) {
-            // No payment needed: the outstanding balance will be negative and can be used in the future
-            return;
-            // throw new SimpleError({
-            //     code: "empty_data",
-            //     message: "Oeps! De totaalprijs is negatief."
-            // })
+            // todo: try to make it non-negative by reducing some balance items
+            throw new SimpleError({
+                code: 'empty_data',
+                message: 'Oeps! De totaalprijs is negatief.',
+            });
         }
+        const payment = new Payment();
+        payment.method = checkout.paymentMethod ?? PaymentMethod.Unknown;
 
         if (totalPrice === 0) {
-            return;
-        }
+            if (balanceItems.size === 0) {
+                return;
+            }
+            // Create an egalizing payment
+            payment.method = PaymentMethod.Unknown;
 
-        if (!checkout.paymentMethod || checkout.paymentMethod === PaymentMethod.Unknown) {
+            if (hasNegative) {
+                payment.type = PaymentType.Reallocation;
+            }
+        }
+        else if (payment.method === PaymentMethod.Unknown) {
             throw new SimpleError({
                 code: 'invalid_data',
                 message: 'Oeps, je hebt geen betaalmethode geselecteerd. Selecteer een betaalmethode en probeer opnieuw.',
             });
         }
 
-        const payment = new Payment();
-
         // Who will receive this money?
         payment.organizationId = organization.id;
 
@@ -793,11 +849,16 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             }
         }
 
-        payment.method = checkout.paymentMethod;
         payment.status = PaymentStatus.Created;
+        payment.paidAt = null;
         payment.price = totalPrice;
 
-        if (payment.method == PaymentMethod.Transfer) {
+        if (totalPrice === 0) {
+            payment.status = PaymentStatus.Succeeded;
+            payment.paidAt = new Date();
+        }
+
+        if (payment.method === PaymentMethod.Transfer) {
             // remark: we cannot add the lastnames, these will get added in the frontend when it is decrypted
             payment.transferSettings = organization.mappedTransferSettings;
 
@@ -821,7 +882,6 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 },
             );
         }
-        payment.paidAt = null;
 
         // Determine the payment provider
         // Throws if invalid
@@ -861,7 +921,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 console.error(e);
             }
         }
-        else if (payment.method !== PaymentMethod.PointOfSale) {
+        else if (payment.method !== PaymentMethod.PointOfSale && payment.method !== PaymentMethod.Unknown) {
             if (!checkout.redirectUrl || !checkout.cancelUrl) {
                 throw new Error('Should have been caught earlier');
             }

package/src/endpoints/global/registration-periods/PatchRegistrationPeriodsEndpoint.ts

@@ -1,6 +1,6 @@
 import { ConvertArrayToPatchableArray, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder, patchObject } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { AuditLogType, RegistrationPeriod as RegistrationPeriodStruct } from '@stamhoofd/structures';
+import { AuditLogSource, AuditLogType, RegistrationPeriod as RegistrationPeriodStruct } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Platform, RegistrationPeriod } from '@stamhoofd/models';
@@ -60,6 +60,7 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
             period.locked = put.locked;
             period.settings = put.settings;
             period.organizationId = organization?.id ?? null;
+            await period.setPreviousPeriodId();
 
             await period.save();
             periods.push(period);
@@ -91,6 +92,7 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
                 model.settings = patchObject(model.settings, patch.settings);
             }
 
+            await model.setPreviousPeriodId();
             await model.save();
 
             // Schedule patch of all groups in this period
@@ -108,7 +110,19 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
                 });
             }
 
+            // Get before deleting the model
+            const updateWhere = await RegistrationPeriod.where({ previousPeriodId: model.id });
+
+            // Now delete the model
             await model.delete();
+
+            // Update all previous period ids
+            await AuditLogService.setContext({ source: AuditLogSource.System }, async () => {
+                for (const period of updateWhere) {
+                    await period.setPreviousPeriodId();
+                    await period.save();
+                }
+            });
         }
 
         // Clear platform cache